#55: mouse handlers added to spacers

antroids · Sep 27, 2024 · 9f4d83a · 9f4d83a
1 parent 2a8226f
commit 9f4d83a
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 43 deletions.
diff --git a/package/contents/ui/MouseHandlers.qml b/package/contents/ui/MouseHandlers.qml
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Anton Kharuzhy <[email protected]>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import QtQuick
+
+Item {
+    id: handlers
+    anchors.fill: parent
+
+    signal invokeKWinShortcut(string shortcut)
+
+    WidgetDragHandler {
+        Component.onCompleted: {
+            invokeKWinShortcut.connect(handlers.invokeKWinShortcut);
+        }
+    }
+
+    WidgetTapHandler {
+        Component.onCompleted: {
+            invokeKWinShortcut.connect(handlers.invokeKWinShortcut);
+        }
+    }
+
+    WidgetWheelHandler {
+        orientation: Qt.Vertical
+        Component.onCompleted: {
+            invokeKWinShortcut.connect(handlers.invokeKWinShortcut);
+        }
+    }
+
+    WidgetWheelHandler {
+        orientation: Qt.Horizontal
+        Component.onCompleted: {
+            invokeKWinShortcut.connect(handlers.invokeKWinShortcut);
+        }
+    }
+}
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
@@ -134,27 +134,7 @@ PlasmoidItem {
             source: tasksModel.activeWindow.icon || "window"
             enabled: tasksModel.hasActiveWindow && !!tasksModel.activeWindow.icon
 
-            WidgetDragHandler {
-                Component.onCompleted: {
-                    invokeKWinShortcut.connect(root.invokeKWinShortcut);
-                }
-            }
-
-            WidgetTapHandler {
-                Component.onCompleted: {
-                    invokeKWinShortcut.connect(root.invokeKWinShortcut);
-                }
-            }
-
-            WidgetWheelHandler {
-                orientation: Qt.Vertical
-                Component.onCompleted: {
-                    invokeKWinShortcut.connect(root.invokeKWinShortcut);
-                }
-            }
-
-            WidgetWheelHandler {
-                orientation: Qt.Horizontal
+            MouseHandlers {
                 Component.onCompleted: {
                     invokeKWinShortcut.connect(root.invokeKWinShortcut);
                 }
@@ -174,6 +154,12 @@ PlasmoidItem {
             Layout.preferredWidth: width
             color: "transparent"
             enabled: tasksModel.hasActiveWindow
+
+            MouseHandlers {
+                Component.onCompleted: {
+                    invokeKWinShortcut.connect(root.invokeKWinShortcut);
+                }
+            }
         }
     }
 
@@ -241,27 +227,7 @@ PlasmoidItem {
 
             Component.onCompleted: updateTitleTextReplacements()
 
-            WidgetDragHandler {
-                Component.onCompleted: {
-                    invokeKWinShortcut.connect(root.invokeKWinShortcut);
-                }
-            }
-
-            WidgetTapHandler {
-                Component.onCompleted: {
-                    invokeKWinShortcut.connect(root.invokeKWinShortcut);
-                }
-            }
-
-            WidgetWheelHandler {
-                orientation: Qt.Vertical
-                Component.onCompleted: {
-                    invokeKWinShortcut.connect(root.invokeKWinShortcut);
-                }
-            }
-
-            WidgetWheelHandler {
-                orientation: Qt.Horizontal
+            MouseHandlers {
                 Component.onCompleted: {
                     invokeKWinShortcut.connect(root.invokeKWinShortcut);
                 }

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.3",
+        "Version": "0.7.4",
         "Website": "https://github.com/antroids/application-title-bar",
         "FormFactors": [
             "desktop"