dtourolle/pyPhotoAlbum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan with two finger scroll
All checks were successful
Python CI / test (push) Successful in 1m31s
Details
Lint / lint (push) Successful in 1m8s
Details
Tests / test (3.11) (push) Successful in 1m42s
Details
Tests / test (3.12) (push) Successful in 1m43s
Details
Tests / test (3.13) (push) Successful in 1m37s
Details
Tests / test (3.14) (push) Successful in 1m16s
Details

Browse Source
This commit is contained in:
Duncan Tourolle 2025-12-02 20:57:37 +01:00
parent 8f1e906884
commit a7f32e73b9
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pyPhotoAlbum/mixins/mouse_interaction.py
View File

@ -310,10 +310,18 @@ class MouseInteractionMixin:
if hasattr(main_window, "update_scrollbars"): if hasattr(main_window, "update_scrollbars"):
main_window.update_scrollbars() main_window.update_scrollbars()
else: else:
# Regular wheel: Vertical scroll # Regular wheel: Two-finger scroll (vertical and horizontal)
scroll_amount = delta * 0.5 delta_x = event.angleDelta().x()
delta_y = event.angleDelta().y()
scroll_amount_x = delta_x * 0.5
scroll_amount_y = delta_y * 0.5
old_pan_x = self.pan_offset[0]
old_pan_y = self.pan_offset[1] old_pan_y = self.pan_offset[1]
self.pan_offset[1] += scroll_amount
self.pan_offset[0] += scroll_amount_x
self.pan_offset[1] += scroll_amount_y
# Clamp pan offset to content bounds # Clamp pan offset to content bounds
if hasattr(self, "clamp_pan_offset"): if hasattr(self, "clamp_pan_offset"):
@ -321,8 +329,9 @@ class MouseInteractionMixin:
# If dragging, adjust drag_start_pos to account for pan_offset change # If dragging, adjust drag_start_pos to account for pan_offset change
if self.is_dragging and self.drag_start_pos: if self.is_dragging and self.drag_start_pos:
pan_delta_x = self.pan_offset[0] - old_pan_x
pan_delta_y = self.pan_offset[1] - old_pan_y pan_delta_y = self.pan_offset[1] - old_pan_y
self.drag_start_pos = (self.drag_start_pos[0], self.drag_start_pos[1] + pan_delta_y) self.drag_start_pos = (self.drag_start_pos[0] + pan_delta_x, self.drag_start_pos[1] + pan_delta_y)
self.update() self.update()

8
tests/test_mouse_interaction_mixin.py
View File

@ -448,7 +448,7 @@ class TestWheelEvent:
initial_pan = widget.pan_offset[1] initial_pan = widget.pan_offset[1]
event = Mock() event = Mock()
event.angleDelta = Mock(return_value=Mock(y=Mock(return_value=-120))) # Scroll down event.angleDelta = Mock(return_value=Mock(x=Mock(return_value=0), y=Mock(return_value=-120))) # Scroll down
event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier) event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier)
widget.wheelEvent(event) widget.wheelEvent(event)
@ -489,7 +489,7 @@ class TestWheelEvent:
initial_pan = widget.pan_offset[1] initial_pan = widget.pan_offset[1]
event = Mock() event = Mock()
event.angleDelta = Mock(return_value=Mock(y=Mock(return_value=120))) # Scroll up event.angleDelta = Mock(return_value=Mock(x=Mock(return_value=0), y=Mock(return_value=120))) # Scroll up
event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier) event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier)
widget.wheelEvent(event) widget.wheelEvent(event)
@ -510,7 +510,7 @@ class TestWheelEvent:
initial_pan = widget.pan_offset[1] initial_pan = widget.pan_offset[1]
event = Mock() event = Mock()
event.angleDelta = Mock(return_value=Mock(y=Mock(return_value=-120))) # Scroll down event.angleDelta = Mock(return_value=Mock(x=Mock(return_value=0), y=Mock(return_value=-120))) # Scroll down
event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier) event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier)
widget.wheelEvent(event) widget.wheelEvent(event)
@ -890,7 +890,7 @@ class TestWheelEventWhileDragging:
initial_drag_y = widget.drag_start_pos[1] initial_drag_y = widget.drag_start_pos[1]
event = Mock() event = Mock()
event.angleDelta = Mock(return_value=Mock(y=Mock(return_value=120))) # Scroll up event.angleDelta = Mock(return_value=Mock(x=Mock(return_value=0), y=Mock(return_value=120))) # Scroll up
event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier) event.modifiers = Mock(return_value=Qt.KeyboardModifier.NoModifier)
widget.wheelEvent(event) widget.wheelEvent(event)