kaxe 1.8.1.dev4__tar.gz → 1.8.1.dev5__tar.gz

{kaxe-1.8.1.dev4/src/kaxe.egg-info → kaxe-1.8.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.8.1.dev4
+Version: 1.8.1.dev5
 Summary: A small graphing tool for functions, points, equations and more
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 Project-URL: Homepage, https://github.com/valteryde/kaxe

{kaxe-1.8.1.dev4 → kaxe-1.8.1.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kaxe"
-version = "1.8.1.dev4"
+version = "1.8.1.dev5"
 authors = [
   { name="Valter Yde Daugberg", email="valteryde@hotmail.com" },
 ]

{kaxe-1.8.1.dev4 → kaxe-1.8.1.dev5}/src/kaxe/viewer/window.py

@@ -268,7 +268,14 @@ class KaxeViewerWindow(pyglet.window.Window):
 
         # Mouse interaction state
         self.dragging_card: Optional[PlotCard] = None
+        self.drag_offset_x: float = 0.0
+        self.drag_offset_y: float = 0.0
+
         self.is_panning_camera: bool = False
+        self.pan_start_x: float = 0.0
+        self.pan_start_y: float = 0.0
+        self.pan_camera_start_x: float = 0.0
+        self.pan_camera_start_y: float = 0.0
 
         self.show_hud: bool = True
         self.notification_text: str = ""
@@ -455,20 +462,28 @@ class KaxeViewerWindow(pyglet.window.Window):
                 self.cards.append(hit_card)
                 self.select_card(hit_card)
                 self.dragging_card = hit_card
+                # Anchor grab offset so dragging sticks directly to the cursor
+                self.drag_offset_x = wx - hit_card.world_x
+                self.drag_offset_y = wy - hit_card.world_y
         else:
             # Clicked empty canvas -> pan
             self.select_card(None)
             self.is_panning_camera = True
+            self.pan_start_x = x
+            self.pan_start_y = y
+            self.pan_camera_start_x = self.camera_x
+            self.pan_camera_start_y = self.camera_y
 
     def on_mouse_drag(self, x: int, y: int, dx: int, dy: int, buttons: int, modifiers: int):
         if self.dragging_card:
-            # Move card in world space
-            self.dragging_card.world_x += dx / self.zoom
-            self.dragging_card.world_y += dy / self.zoom
+            # Absolute position tracking: card sticks precisely to the cursor
+            wx, wy = self.screen_to_world(x, y)
+            self.dragging_card.world_x = wx - self.drag_offset_x
+            self.dragging_card.world_y = wy - self.drag_offset_y
         elif self.is_panning_camera:
-            # Move camera in world space
-            self.camera_x -= dx / self.zoom
-            self.camera_y -= dy / self.zoom
+            # Absolute canvas panning: workspace follows the mouse 1:1
+            self.camera_x = self.pan_camera_start_x - (x - self.pan_start_x) / self.zoom
+            self.camera_y = self.pan_camera_start_y - (y - self.pan_start_y) / self.zoom
 
     def on_mouse_release(self, x: int, y: int, button: int, modifiers: int):
         self.dragging_card = None

{kaxe-1.8.1.dev4 → kaxe-1.8.1.dev5/src/kaxe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.8.1.dev4
+Version: 1.8.1.dev5
 Summary: A small graphing tool for functions, points, equations and more
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 Project-URL: Homepage, https://github.com/valteryde/kaxe

{kaxe-1.8.1.dev4 → kaxe-1.8.1.dev5}/tests/test_viewer.py

@@ -282,11 +282,13 @@ def test_canvas_multi_card_and_versioning():
     assert window.cards[0].card_id == "graph_1"
     assert window.cards[1].card_id == "graph_2"
 
-    # 4. Moving card changes its coordinates
-    orig_x = window.cards[1].world_x
-    window.dragging_card = window.cards[1]
-    window.on_mouse_drag(x=100, y=100, dx=30, dy=15, buttons=1, modifiers=0)
-    assert window.cards[1].world_x > orig_x
+    # 4. Moving card changes its coordinates via press and drag
+    card = window.cards[1]
+    sx, sy = window.world_to_screen(card.world_x + 20, card.world_y + 20)
+    window.on_mouse_press(int(sx), int(sy), button=1, modifiers=0)
+    orig_x = card.world_x
+    window.on_mouse_drag(int(sx + 50), int(sy + 20), dx=50, dy=20, buttons=1, modifiers=0)
+    assert card.world_x > orig_x
 
     window.close()