#64: workaround for long-press tap handler

antroids · Dec 9, 2024 · 556ddaa · 556ddaa
1 parent 0c638f2
commit 556ddaa
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 9 deletions.
diff --git a/package/contents/ui/MouseHandlers.qml b/package/contents/ui/MouseHandlers.qml
@@ -13,15 +13,19 @@ Item {
     signal invokeKWinShortcut(string shortcut)
 
     WidgetDragHandler {
+        id: dragHandler
         Component.onCompleted: {
             invokeKWinShortcut.connect(handlers.invokeKWinShortcut);
         }
+        onInvokeKWinShortcut: tapHandler.stopLongPressTimer()
     }
 
     WidgetTapHandler {
+        id: tapHandler
         Component.onCompleted: {
             invokeKWinShortcut.connect(handlers.invokeKWinShortcut);
         }
+        onInvokeKWinShortcut: dragHandler.stopDrag()
     }
 
     WidgetWheelHandler {

diff --git a/package/contents/ui/WidgetDragHandler.qml b/package/contents/ui/WidgetDragHandler.qml
@@ -7,6 +7,9 @@
 import QtQuick
 import org.kde.plasma.plasmoid
 
+/*
+* Drag handler implemented in that strange way as workaround for cases, when window layout changed during the drag interaction.
+*/
 PointHandler {
     property bool dragInProgress: false
     property var cfg: plasmoid.configuration
@@ -19,19 +22,23 @@ PointHandler {
         return Math.sqrt(dx * dx + dy * dy);
     }
 
+    function stopDrag() {
+        dragInProgress = false;
+    }
+
     enabled: cfg.windowTitleDragEnabled
     dragThreshold: cfg.windowTitleDragThreshold
     acceptedButtons: Qt.LeftButton | Qt.MiddleButton
     onActiveChanged: function () {
-        if (active && (!cfg.windowTitleDragOnlyMaximized || tasksModel.activeWindow.maximized) && tasksModel.activeWindow.movable)
+        if (active && (!cfg.windowTitleDragOnlyMaximized || tasksModel.activeWindow.maximized))
             dragInProgress = true;
         else
-            dragInProgress = false;
+            stopDrag();
     }
     onPointChanged: function () {
         if (active && dragInProgress && point && point.pressPosition && point.position) {
             if (distance(point.pressPosition, point.position) > dragThreshold) {
-                dragInProgress = false;
+                stopDrag();
                 if (point.pressedButtons & Qt.LeftButton && cfg.widgetMouseAreaLeftDragAction != "")
                     invokeKWinShortcut(cfg.widgetMouseAreaLeftDragAction);
                 else if (point.pressedButtons & Qt.MiddleButton && cfg.widgetMouseAreaMiddleDragAction != "")

diff --git a/package/contents/ui/WidgetTapHandler.qml b/package/contents/ui/WidgetTapHandler.qml
@@ -6,13 +6,30 @@
 
 import QtQuick
 
+/*
+* Tap handler implemented in that strange way as workaround for cases, when window layout changed during the long press interaction.
+*/
 TapHandler {
+    id: tapHandler
+
     property var cfg: plasmoid.configuration
+    property Timer longPressTimer: Timer {
+        property int pressedButtons: 0
+        interval: Qt.styleHints.mousePressAndHoldInterval
+        onTriggered: function () {
+            if (pressedButtons & Qt.LeftButton && cfg.widgetMouseAreaLeftLongPressAction != "")
+                invokeKWinShortcut(cfg.widgetMouseAreaLeftLongPressAction);
+            else if (pressedButtons & Qt.MiddleButton && cfg.widgetMouseAreaMiddleLongPressAction != "")
+                invokeKWinShortcut(cfg.widgetMouseAreaMiddleLongPressAction);
+        }
+    }
 
     signal invokeKWinShortcut(string shortcut)
 
     enabled: cfg.widgetMouseAreaClickEnabled
     acceptedButtons: Qt.LeftButton | Qt.MiddleButton
+    longPressThreshold: 0
+    exclusiveSignals: TapHandler.SingleTap | TapHandler.DoubleTap
     onSingleTapped: function (eventPoint, button) {
         if (button === Qt.LeftButton && cfg.widgetMouseAreaLeftClickAction != "")
             invokeKWinShortcut(cfg.widgetMouseAreaLeftClickAction);
@@ -25,10 +42,21 @@ TapHandler {
         else if (button === Qt.MiddleButton && cfg.widgetMouseAreaMiddleDoubleClickAction != "")
             invokeKWinShortcut(cfg.widgetMouseAreaMiddleDoubleClickAction);
     }
-    onLongPressed: function () {
-        if (point.pressedButtons & Qt.LeftButton && cfg.widgetMouseAreaLeftLongPressAction != "")
-            invokeKWinShortcut(cfg.widgetMouseAreaLeftLongPressAction);
-        else if (point.pressedButtons & Qt.MiddleButton && cfg.widgetMouseAreaMiddleLongPressAction != "")
-            invokeKWinShortcut(cfg.widgetMouseAreaMiddleLongPressAction);
+
+    onPointChanged: function () {
+        if (point.pressedButtons & acceptedButtons) {
+            restartLongPressTimer(point.pressedButtons);
+        } else {
+            stopLongPressTimer();
+        }
+    }
+
+    function restartLongPressTimer(pressedButtons) {
+        longPressTimer.restart();
+        longPressTimer.pressedButtons = pressedButtons;
+    }
+
+    function stopLongPressTimer() {
+        longPressTimer.stop();
     }
 }
diff --git a/package/metadata.json b/package/metadata.json
@@ -12,7 +12,7 @@
         "Id": "com.github.antroids.application-title-bar",
         "Name": "Application Title Bar",
         "License": "GPL-3.0+",
-        "Version": "0.7.6",
+        "Version": "0.7.7",
         "Website": "https://github.com/antroids/application-title-bar",
         "FormFactors": [
             "desktop"