summary refs log tree commit diff
path: root/resources/qml
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2023-06-09 02:40:50 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2023-06-09 02:40:50 +0200
commit16960e2900b0bf495cdb3d32ed25e76efc1048ca (patch)
tree72bc468c8eb064afeefeddd333a628e47b1609c2 /resources/qml
parentUse qt6 prefix to build macos packages (diff)
downloadnheko-16960e2900b0bf495cdb3d32ed25e76efc1048ca.tar.xz
Fix scrolling in image dialog
Diffstat (limited to 'resources/qml')
-rw-r--r--resources/qml/dialogs/ImageOverlay.qml8
1 files changed, 6 insertions, 2 deletions
diff --git a/resources/qml/dialogs/ImageOverlay.qml b/resources/qml/dialogs/ImageOverlay.qml
index fa874529..b914829e 100644
--- a/resources/qml/dialogs/ImageOverlay.qml
+++ b/resources/qml/dialogs/ImageOverlay.qml
@@ -25,12 +25,12 @@ Window {
     Component.onCompleted: Nheko.setWindowRole(imageOverlay, "imageoverlay")
 
     Shortcut {
-        sequence: StandardKey.Cancel
+        sequences: [StandardKey.Cancel]
         onActivated: imageOverlay.close()
     }
 
     Shortcut {
-        sequence: StandardKey.Copy
+        sequences: [StandardKey.Copy]
         onActivated: {
             if (room) {
                 room.copyMedia(eventId);
@@ -98,6 +98,10 @@ Window {
 
         WheelHandler {
             property: "scale"
+            // workaround for QTBUG-87646 / QTBUG-112394 / QTBUG-112432:
+            // Magic Mouse pretends to be a trackpad but doesn't work with PinchHandler
+            // and we don't yet distinguish mice and trackpads on Wayland either
+            acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad
             target: imgContainer
         }