Remove inverting move in current index cubit

LinwoodDev · Feb 9, 2024 · 890af6d · 890af6d
1 parent dfada58
commit 890af6d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/app/lib/cubits/current_index.dart b/app/lib/cubits/current_index.dart
@@ -774,7 +774,7 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
     if (delta.dx == 0 && delta.dy == 0) {
       return;
     }
-    state.transformCubit.move(-delta);
+    state.transformCubit.move(delta);
   }
 
   void zoom(double delta, [Offset cursor = Offset.zero, bool force = false]) {

diff --git a/app/lib/handlers/laser.dart b/app/lib/handlers/laser.dart
@@ -162,7 +162,7 @@ class LaserHandler extends Handler<LaserTool> with ColoredHandler {
   void onPointerMove(PointerMoveEvent event, EventContext context) {
     if (kSecondaryMouseButton == event.buttons) {
       final transform = context.getCameraTransform();
-      context.getTransformCubit().move(event.localDelta / transform.size);
+      context.getCurrentIndexCubit().move(event.localDelta / transform.size);
       return;
     }
     addPoint(context.buildContext, event.pointer, event.localPosition,

diff --git a/app/lib/handlers/select.dart b/app/lib/handlers/select.dart
@@ -595,7 +595,7 @@ class SelectHandler extends Handler<SelectTool> {
     }
     context
         .getCurrentIndexCubit()
-        .move(details.focalPointDelta / context.getCameraTransform().size);
+        .move(-details.focalPointDelta / context.getCameraTransform().size);
   }
 
   @override

diff --git a/app/lib/views/view.dart b/app/lib/views/view.dart
@@ -226,7 +226,7 @@ class _MainViewViewportState extends State<MainViewViewport>
                                 .state
                                 .touchSensitivity;
                             if (details.scale == 1) {
-                              cubit.move(details.focalPointDelta /
+                              cubit.move(-details.focalPointDelta /
                                   sensitivity /
                                   cubit.state.transformCubit.state.size);
                             } else {
@@ -289,8 +289,8 @@ class _MainViewViewportState extends State<MainViewViewport>
                                 } else {
                                   cubit
                                     ..move((_mouseState == _MouseState.inverse
-                                            ? Offset(-dy, -dx)
-                                            : Offset(-dx, -dy)) /
+                                            ? Offset(dy, dx)
+                                            : Offset(dx, dy)) /
                                         transform.size)
                                     ..zoom(scale, pointerSignal.localPosition);
                                 }
@@ -347,7 +347,7 @@ class _MainViewViewportState extends State<MainViewViewport>
                                       context.read<TransformCubit>().state;
                                   final cubit =
                                       context.read<CurrentIndexCubit>();
-                                  cubit.move(event.delta / transform.size);
+                                  cubit.move(-event.delta / transform.size);
                                   delayBake();
                                 }
                                 if (_isScalingDisabled ?? true) {

diff --git a/fastlane/metadata/android/en-US/changelogs/92.txt b/fastlane/metadata/android/en-US/changelogs/92.txt
@@ -1,4 +1,5 @@
 * Invert current inverted position to be normal
 * Fix file sharing on android ([#585](https://github.com/LinwoodDev/Butterfly/issues/585))
+* Fix laser movement is not locked
 
 Read more here: https://linwood.dev/butterfly/2.0.3-rc.1