From 16960e2900b0bf495cdb3d32ed25e76efc1048ca Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Fri, 9 Jun 2023 02:40:50 +0200
Subject: [PATCH] Fix scrolling in image dialog
---
resources/qml/dialogs/ImageOverlay.qml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/resources/qml/dialogs/ImageOverlay.qml b/resources/qml/dialogs/ImageOverlay.qml
index fa8745291..b914829e8 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
}
--
GitLab