kaxe 1.8.1.dev4__tar.gz → 1.8.1.dev6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.8.1.dev4
+Version: 1.8.1.dev6
 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
@@ -87,7 +87,9 @@ When the viewer is open, `.show()` instantly streams plots to cards on your canv
 **Canvas & Card Controls:**
 * **Click & Drag on a Card**: Move that card freely across the canvas
 * **Click & Drag on Empty Space**: Pan the camera across the workspace
-* **Mouse Scroll**: Smooth zoom anchored to cursor
+* **Two-Finger Scroll / Trackpad**: Pan canvas side-to-side and up/down without zooming
+* **`[Shift]` + Scroll**: Pan horizontally (for 1D mouse wheels)
+* **`[Cmd]` / `[Ctrl]` + Scroll**: Smooth zoom anchored to cursor
 * **`[A]`**: Auto-arrange all cards in a neat row
 * **`[Space]` or `[R]`**: Fit all cards on the canvas into view
 * **`[1]`**: View canvas at 100% native pixel scale

{kaxe-1.8.1.dev4 → kaxe-1.8.1.dev6}/README.md

@@ -54,7 +54,9 @@ When the viewer is open, `.show()` instantly streams plots to cards on your canv
 **Canvas & Card Controls:**
 * **Click & Drag on a Card**: Move that card freely across the canvas
 * **Click & Drag on Empty Space**: Pan the camera across the workspace
-* **Mouse Scroll**: Smooth zoom anchored to cursor
+* **Two-Finger Scroll / Trackpad**: Pan canvas side-to-side and up/down without zooming
+* **`[Shift]` + Scroll**: Pan horizontally (for 1D mouse wheels)
+* **`[Cmd]` / `[Ctrl]` + Scroll**: Smooth zoom anchored to cursor
 * **`[A]`**: Auto-arrange all cards in a neat row
 * **`[Space]` or `[R]`**: Fit all cards on the canvas into view
 * **`[1]`**: View canvas at 100% native pixel scale

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

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

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

@@ -268,7 +268,19 @@ 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
+
+        # Key state handler for live modifier tracking (Cmd, Ctrl, Shift)
+        self.keys = key.KeyStateHandler()
+        self.push_handlers(self.keys)
+        self.current_modifiers: int = 0
 
         self.show_hud: bool = True
         self.notification_text: str = ""
@@ -300,7 +312,7 @@ class KaxeViewerWindow(pyglet.window.Window):
         )
 
         self.hud_right = pyglet.text.Label(
-            "[Drag] Move card / Pan  [Scroll] Zoom  [A] Arrange  [←/→] Version  [C] Copy  [Space] Fit",
+            "[Drag] Move card / Pan  [Cmd+Scroll] Zoom  [Scroll] Pan  [A] Arrange  [Space] Fit",
             font_size=11,
             x=self.width - 15,
             y=15,
@@ -455,38 +467,117 @@ 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
         self.is_panning_camera = False
 
+    def is_zoom_modifier_pressed(self) -> bool:
+        """Return True if Meta (Command) or Control key is held down."""
+        if sys.platform == "darwin":
+            try:
+                from pyglet.libs.darwin import cocoapy
+                flags = cocoapy.NSEvent.modifierFlags()
+                if flags & (cocoapy.NSCommandKeyMask | cocoapy.NSControlKeyMask):
+                    return True
+            except Exception:
+                pass
+
+        if hasattr(self, "keys") and self.keys is not None:
+            if (
+                self.keys[key.LCOMMAND]
+                or self.keys[key.RCOMMAND]
+                or self.keys[key.LCTRL]
+                or self.keys[key.RCTRL]
+            ):
+                return True
+
+        if getattr(self, "current_modifiers", 0) & (key.MOD_COMMAND | key.MOD_CTRL):
+            return True
+
+        return False
+
+    def is_shift_pressed(self) -> bool:
+        """Return True if Shift key is held down."""
+        if sys.platform == "darwin":
+            try:
+                from pyglet.libs.darwin import cocoapy
+                flags = cocoapy.NSEvent.modifierFlags()
+                if flags & cocoapy.NSShiftKeyMask:
+                    return True
+            except Exception:
+                pass
+
+        if hasattr(self, "keys") and self.keys is not None:
+            if self.keys[key.LSHIFT] or self.keys[key.RSHIFT]:
+                return True
+
+        if getattr(self, "current_modifiers", 0) & key.MOD_SHIFT:
+            return True
+
+        return False
+
     def on_mouse_scroll(self, x: int, y: int, scroll_x: float, scroll_y: float):
-        """Cursor-anchored zooming on the canvas."""
-        zoom_factor = 1.05 ** (-scroll_y)
-        new_zoom = max(0.04, min(self.zoom * zoom_factor, 20.0))
+        """Scroll handler:
 
-        if hasattr(self, "width"):
-            wx, wy = self.screen_to_world(x, y)
-            self.camera_x = wx - (x - self.width / 2.0) / new_zoom
-            self.camera_y = wy - (y - self.height / 2.0) / new_zoom
+        - If Meta (Cmd) or Control is held: ZOOM anchored at cursor.
+        - Otherwise: PAN canvas side-to-side and up/down without zooming.
+        """
+        if hasattr(self, "keys") and self.keys is not None:
+            should_zoom = self.is_zoom_modifier_pressed()
+        else:
+            # Fallback for mock unit test instances
+            should_zoom = True
 
-        self.zoom = new_zoom
+        if should_zoom:
+            zoom_factor = 1.05 ** (-scroll_y)
+            new_zoom = max(0.04, min(self.zoom * zoom_factor, 25.0))
+
+            if hasattr(self, "width"):
+                wx, wy = self.screen_to_world(x, y)
+                self.camera_x = wx - (x - self.width / 2.0) / new_zoom
+                self.camera_y = wy - (y - self.height / 2.0) / new_zoom
+
+            self.zoom = new_zoom
+        else:
+            # Pan without zooming
+            dx = scroll_x
+            dy = scroll_y
+
+            # Holding Shift converts vertical wheel into horizontal pan
+            if self.is_shift_pressed() and dy != 0.0 and dx == 0.0:
+                dx = dy
+                dy = 0.0
+
+            pan_speed = 20.0
+            self.camera_x -= (dx * pan_speed) / self.zoom
+            self.camera_y += (dy * pan_speed) / self.zoom
 
     def on_key_press(self, symbol: int, modifiers: int):
+        self.current_modifiers = modifiers
+
         # Fit all
         if symbol in (key.R, key.SPACE):
             self.fit_all_cards()
@@ -522,6 +613,9 @@ class KaxeViewerWindow(pyglet.window.Window):
         elif symbol == key.S:
             self.save_selected_card()
 
+    def on_key_release(self, symbol: int, modifiers: int):
+        self.current_modifiers = modifiers
+
     def copy_selected_card(self):
         if not self.selected_card or not self.selected_card.current_version:
             return

{kaxe-1.8.1.dev4 → kaxe-1.8.1.dev6/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.dev6
 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
@@ -87,7 +87,9 @@ When the viewer is open, `.show()` instantly streams plots to cards on your canv
 **Canvas & Card Controls:**
 * **Click & Drag on a Card**: Move that card freely across the canvas
 * **Click & Drag on Empty Space**: Pan the camera across the workspace
-* **Mouse Scroll**: Smooth zoom anchored to cursor
+* **Two-Finger Scroll / Trackpad**: Pan canvas side-to-side and up/down without zooming
+* **`[Shift]` + Scroll**: Pan horizontally (for 1D mouse wheels)
+* **`[Cmd]` / `[Ctrl]` + Scroll**: Smooth zoom anchored to cursor
 * **`[A]`**: Auto-arrange all cards in a neat row
 * **`[Space]` or `[R]`**: Fit all cards on the canvas into view
 * **`[1]`**: View canvas at 100% native pixel scale

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

@@ -220,6 +220,36 @@ def test_viewer_zoom_reversed_and_less_sensitive():
     assert abs(window.zoom - 1.05) < 1e-6
 
 
+def test_scroll_pans_side_to_side_without_zoom_modifier():
+    from unittest.mock import MagicMock
+    from kaxe.viewer.window import KaxeViewerWindow
+    from pyglet.window import key
+
+    window = object.__new__(KaxeViewerWindow)
+    window.keys = {key.LCOMMAND: False, key.RCOMMAND: False, key.LCTRL: False, key.RCTRL: False, key.LSHIFT: False, key.RSHIFT: False}
+    window.current_modifiers = 0
+    window.camera_x = 0.0
+    window.camera_y = 0.0
+    window.zoom = 1.0
+
+    # Horizontal scroll without Cmd/Ctrl -> pans horizontally, zoom stays unchanged!
+    window.on_mouse_scroll(x=400, y=300, scroll_x=2.0, scroll_y=0.0)
+    assert window.zoom == 1.0
+    assert window.camera_x < 0.0  # Camera moved left
+
+    # Vertical scroll without Cmd/Ctrl -> pans vertically, zoom stays unchanged!
+    orig_cam_x = window.camera_x
+    window.on_mouse_scroll(x=400, y=300, scroll_x=0.0, scroll_y=3.0)
+    assert window.zoom == 1.0
+    assert window.camera_x == orig_cam_x
+    assert window.camera_y > 0.0
+
+    # With Cmd key pressed -> zooms!
+    window.keys[key.LCOMMAND] = True
+    window.on_mouse_scroll(x=400, y=300, scroll_x=0.0, scroll_y=-1.0)
+    assert window.zoom > 1.0
+
+
 def test_plot_id_chaining_and_streaming(monkeypatch):
     import kaxe
 
@@ -282,11 +312,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()