Use input handlers to move windows

We don't need to customize ShellSurfaceItem to do this anymore. Closes: #196
lirios · Dec 23, 2020 · 28d918f · 28d918f
1 parent 2d22770
commit 28d918f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 178 deletions.
diff --git a/src/compositor/qml/ShellSettings.qml b/src/compositor/qml/ShellSettings.qml
@@ -37,6 +37,7 @@ FluidCore.Object {
     readonly property alias lockScreen: lockSettings
     readonly property alias shell: shellSettings
     readonly property alias session: sessionSettings
+    readonly property alias input: inputSettings
     readonly property int numWorkspaces: 4
 
     /*
@@ -79,6 +80,8 @@ FluidCore.Object {
      */
 
     P.InputSettings {
+        id: inputSettings
+
         compositor: liriCompositor
     }
 

diff --git a/src/compositor/qml/windows/MoveItem.qml b/src/compositor/qml/windows/MoveItem.qml
@@ -22,10 +22,17 @@
  ***************************************************************************/
 
 import QtQuick 2.0
+import Liri.WaylandServer 1.0 as WS
 
 Item {
     id: moveItem
 
+    property bool moving: false
+
+    onMovingChanged: {
+        shellHelper.grabCursor(moving ? WS.LiriShell.MoveGrabCursor : WS.LiriShell.ArrowGrabCursor);
+    }
+
     ParallelAnimation {
         id: moveAnimation
 

diff --git a/src/compositor/qml/windows/WaylandChrome.qml b/src/compositor/qml/windows/WaylandChrome.qml
@@ -21,8 +21,8 @@
  * $END_LICENSE$
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtWayland.Compositor 1.0
+import QtQuick 2.15
+import QtWayland.Compositor 1.15
 import Fluid.Effects 1.0 as FluidEffects
 import Liri.WaylandServer 1.0 as WS
 import Liri.private.shell 1.0 as P
@@ -146,7 +146,7 @@ P.ChromeItem {
         visible: chrome.window.mapped && enabled
     }
 
-    P.ShellSurfaceItem {
+    ShellSurfaceItem {
         id: shellSurfaceItem
 
         x: chrome.window.borderSize
@@ -159,20 +159,24 @@ P.ChromeItem {
 
         focusOnClick: chrome.window.focusable
 
-        onMoveStarted: {
-            // Move initiated with Meta+LeftMouseButton has started
-            shellHelper.grabCursor(WS.LiriShell.MoveGrabCursor);
-        }
-        onMoveStopped: {
-            // Move initiated with Meta+LeftMouseButton has stopped
-            shellHelper.grabCursor(WS.LiriShell.ArrowGrabCursor);
-        }
-
         onSurfaceDestroyed: {
             bufferLocked = true;
             destroyAnimation.start();
         }
 
+        // Drag windows with Meta
+        DragHandler {
+            id: dragHandler
+
+            acceptedModifiers: liriCompositor.settings.input.windowActionKey
+            target: shellSurfaceItem.moveItem
+            property var movingBinding: Binding {
+                target: shellSurfaceItem.moveItem
+                property: "moving"
+                value: dragHandler.active
+            }
+        }
+
         /*
          * Animations
          */

diff --git a/src/imports/shell-private/CMakeLists.txt b/src/imports/shell-private/CMakeLists.txt
@@ -43,8 +43,6 @@ liri_add_qml_plugin(shell-private
         screencast.h
         screenmodel.cpp
         screenmodel.h
-        shellsurfaceitem.cpp
-        shellsurfaceitem.h
         waylandwindow.cpp
         waylandwindow.h
         windowmousetracker.cpp

diff --git a/src/imports/shell-private/plugin.cpp b/src/imports/shell-private/plugin.cpp
@@ -38,7 +38,6 @@
 #include "quickoutput.h"
 #include "screencast.h"
 #include "screenmodel.h"
-#include "shellsurfaceitem.h"
 #include "waylandwindow.h"
 #include "windowmousetracker.h"
 
@@ -110,7 +109,6 @@ class ShellPrivatePlugin : public QQmlExtensionPlugin
                                                QStringLiteral("Cannot create instance of ScreenMode"));
         qmlRegisterUncreatableType<ScreenItem>(uri, versionMajor, versionMinor, "ScreenItem",
                                                QStringLiteral("Cannot create instance of ScreenItem"));
-        qmlRegisterType<ShellSurfaceItem>(uri, versionMajor, versionMinor, "ShellSurfaceItem");
         qmlRegisterType<WaylandWindowQuickParent>(uri, versionMajor, versionMinor, "WaylandWindow");
         qmlRegisterType<WindowMouseTracker>(uri, versionMajor, versionMinor, "WindowMouseTracker");
 

diff --git a/src/imports/shell-private/shellsurfaceitem.cpp b/src/imports/shell-private/shellsurfaceitem.cpp
diff --git a/src/imports/shell-private/shellsurfaceitem.h b/src/imports/shell-private/shellsurfaceitem.h