Merge branch 'main' into remote-download-improvements

Gold872 · Dec 31, 2024 · 349031f · 349031f
2 parents f4d4d63 + 50c2881
commit 349031f
Show file tree

Hide file tree

Showing 7 changed files with 312 additions and 205 deletions.
diff --git a/lib/services/field_images.dart b/lib/services/field_images.dart
@@ -58,13 +58,22 @@ class Field {
   int? fieldImageWidth;
   int? fieldImageHeight;
 
+  Size? get fieldImageSize =>
+      (fieldImageWidth != null && fieldImageHeight != null)
+          ? Size(fieldImageWidth!.toDouble(), fieldImageHeight!.toDouble())
+          : null;
+
   late double fieldWidthMeters;
   late double fieldHeightMeters;
 
   late Offset topLeftCorner;
   late Offset bottomRightCorner;
 
-  late Offset fieldCenter;
+  Offset get center => (fieldImageLoaded)
+      ? Offset(bottomRightCorner.dx - topLeftCorner.dx,
+              bottomRightCorner.dy - topLeftCorner.dy) /
+          2
+      : const Offset(0, 0);
 
   late Image fieldImage;
 

diff --git a/lib/services/nt_widget_builder.dart b/lib/services/nt_widget_builder.dart
@@ -216,9 +216,9 @@ class NTWidgetBuilder {
         model: FieldWidgetModel.new,
         widget: FieldWidget.new,
         fromJson: FieldWidgetModel.fromJson,
-        minWidth: _normalSize * 3,
+        minWidth: _normalSize * 2,
         minHeight: _normalSize * 2,
-        defaultWidth: 3,
+        defaultWidth: 2,
         defaultHeight: 2);
 
     register(