images: only move with select tool

Fixes #183
saber-notes · Feb 22, 2023 · 1fa573e · 1fa573e
1 parent 6be4552
commit 1fa573e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/lib/components/canvas/canvas.dart b/lib/components/canvas/canvas.dart
@@ -18,6 +18,7 @@ class Canvas extends StatelessWidget {
     required this.currentStroke,
     required this.currentSelection,
     required this.setAsBackground,
+    required this.currentToolIsSelect,
     this.placeholder = false,
   });
 
@@ -32,6 +33,8 @@ class Canvas extends StatelessWidget {
 
   final void Function(EditorImage image)? setAsBackground;
 
+  final bool currentToolIsSelect;
+
   final bool placeholder;
 
   @override
@@ -62,6 +65,7 @@ class Canvas extends StatelessWidget {
                   currentStroke: currentStroke,
                   currentSelection: currentSelection,
                   setAsBackground: setAsBackground,
+                  currentToolIsSelect: currentToolIsSelect,
                 ),
               ),
             ),

diff --git a/lib/components/canvas/canvas_image.dart b/lib/components/canvas/canvas_image.dart
@@ -123,6 +123,14 @@ class _CanvasImageState extends State<CanvasImage> {
     });
   }
 
+  @override
+  void didUpdateWidget(covariant CanvasImage oldWidget) {
+    if (widget.readOnly && active) {
+      active = false;
+    }
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;

diff --git a/lib/components/canvas/canvas_preview.dart b/lib/components/canvas/canvas_preview.dart
@@ -41,6 +41,7 @@ class CanvasPreview extends StatelessWidget {
             currentStroke: null,
             currentSelection: null,
             hideBackground: Prefs.hideHomeBackgrounds.value,
+            currentToolIsSelect: false,
           ),
         ),
       ),

diff --git a/lib/components/canvas/inner_canvas.dart b/lib/components/canvas/inner_canvas.dart
@@ -28,6 +28,7 @@ class InnerCanvas extends StatefulWidget {
     this.setAsBackground,
     this.onRenderObjectChange,
     this.hideBackground = false,
+    required this.currentToolIsSelect,
   });
 
   final int pageIndex;
@@ -44,6 +45,7 @@ class InnerCanvas extends StatefulWidget {
   final ValueChanged<RenderObject>? onRenderObjectChange;
 
   final bool hideBackground;
+  final bool currentToolIsSelect;
 
   static const Color defaultBackgroundColor = Color(0xFFFCFCFC);
 
@@ -165,8 +167,9 @@ class _InnerCanvasState extends State<InnerCanvas> {
                     filePath: widget.coreInfo.filePath,
                     image: editorImage,
                     pageSize: Size(widget.width, widget.height),
-                    readOnly: widget.coreInfo.readOnly,
                     setAsBackground: widget.setAsBackground,
+                    readOnly: widget.coreInfo.readOnly
+                        || !widget.currentToolIsSelect,
                   ),
               ],
             ),

diff --git a/lib/data/editor/editor_exporter.dart b/lib/data/editor/editor_exporter.dart
@@ -77,6 +77,7 @@ abstract class EditorExporter {
             coreInfo: coreInfo,
             currentStroke: null,
             currentSelection: null,
+            currentToolIsSelect: false,
           ),
         ),
       ),

diff --git a/lib/pages/editor/editor.dart b/lib/pages/editor/editor.dart
@@ -842,6 +842,7 @@ class EditorState extends State<Editor> {
             autosaveAfterDelay();
             setState(() {});
           },
+          currentToolIsSelect: currentTool is Select,
         );
       },
       placeholderPageBuilder: (BuildContext context, int pageIndex) {
@@ -855,6 +856,7 @@ class EditorState extends State<Editor> {
           currentSelection: null,
           placeholder: true,
           setAsBackground: null,
+          currentToolIsSelect: currentTool is Select,
         );
       },
     );