fix: solve the problem of the dock jumping when the height changes (l…

…inuxdeepin#246) 1.makes the change height data smooth without jumps 2.let the mouse close to the window by grabbing mouse Log: solve the problem of the dock jumping when the height changes Influence: adjust dock size effect
FeiWang1119 · Jul 5, 2024 · cb39ddd · cb39ddd
1 parent 94f4c66
commit cb39ddd
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 14 deletions.
diff --git a/panels/dock/dockpanel.cpp b/panels/dock/dockpanel.cpp
@@ -21,6 +21,7 @@
 #include <QQuickWindow>
 #include <QLoggingCategory>
 #include <QGuiApplication>
+#include <QQuickItem>
 #include <DGuiApplicationHelper>
 
 #define SETTINGS DockSettings::instance()
@@ -313,6 +314,16 @@ void DockPanel::loadDockPlugins()
     }
 }
 
+void DockPanel::setMouseGrabEnabled(QQuickItem *item, bool enabled)
+{
+    if (!item) return;
+
+    auto window = item->window();
+    if (!window) return;
+
+    window->setMouseGrabEnabled(enabled);
+}
+
 D_APPLET_CLASS(DockPanel)
 
 }

diff --git a/panels/dock/dockpanel.h b/panels/dock/dockpanel.h
@@ -75,6 +75,7 @@ class DockPanel : public DS_NAMESPACE::DPanel, public QDBusContext
     bool debugMode() const;
 
     Q_INVOKABLE void openDockSettings() const;
+    Q_INVOKABLE void setMouseGrabEnabled(QQuickItem *item, bool enabled);
 
 private Q_SLOTS:
     void onWindowGeometryChanged();

diff --git a/panels/dock/package/main.qml b/panels/dock/package/main.qml
@@ -355,8 +355,10 @@ Window {
 
     MouseArea {
         id: dragArea
-        property int oldMouseY: 0;
-        property int oldMouseX: 0;
+        property point oldMousePos: Qt.point(0, 0)
+        property int oldDockSize: 0
+        property list<int> recentDeltas: []
+        property int averageCount: 5
 
         cursorShape: {
             if (Panel.position == Dock.Top || Panel.position == Dock.Bottom) {
@@ -366,27 +368,47 @@ Window {
         }
 
         onPressed: function(mouse) {
-            var launcheritem = DS.applet("org.deepin.ds.launchpad")
-            if (!launcheritem) {
-                return
+            var launcherItem = DS.applet("org.deepin.ds.launchpad")
+            if (launcherItem) {
+                launcherItem.rootObject.hide()
             }
-            launcheritem.rootObject.hide()
             dock.isDragging = true
-            oldMouseY = mouse.y
-            oldMouseX = mouse.x
+            oldMousePos = mapToGlobal(mouse.x, mouse.y)
+            oldDockSize = dockSize
+            recentDeltas = []
+            Panel.setMouseGrabEnabled(dragArea, true);
         }
 
         onPositionChanged: function(mouse) {
-            var yChange = mouse.y - oldMouseY
-            var xChange = mouse.x - oldMouseX
+            var newPos = mapToGlobal(mouse.x, mouse.y)
+            var xChange = newPos.x - oldMousePos.x
+            var yChange = newPos.y - oldMousePos.y
+
+            if (Panel.position === Dock.Bottom || Panel.position === Dock.Top) {
+                recentDeltas.push(yChange)
+            } else {
+                recentDeltas.push(xChange)
+            }
+
+            if (recentDeltas.length > averageCount) {
+                recentDeltas.shift()
+            }
+            // Taking the average makes the data smooth without jumps
+            var changeAverage = recentDeltas.reduce(function(acc, val) { return acc + val; }, 0) / recentDeltas.length;
+
+            var newDockSize = 0
             if (Panel.position == Dock.Bottom) {
-                dockSize = Math.min(Math.max(dockSize - yChange, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
+                newDockSize = Math.min(Math.max(oldDockSize - changeAverage, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
             } else if (Panel.position == Dock.Top) {
-                dockSize = Math.min(Math.max(dockSize + yChange, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
+                newDockSize = Math.min(Math.max(oldDockSize + changeAverage, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
             } else if (Panel.position == Dock.Left) {
-                dockSize = Math.min(Math.max(dockSize + xChange, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
+                newDockSize = Math.min(Math.max(oldDockSize + changeAverage, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
             } else {
-                dockSize = Math.min(Math.max(dockSize - xChange, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
+                newDockSize = Math.min(Math.max(oldDockSize - changeAverage, Dock.MIN_DOCK_SIZE), Dock.MAX_DOCK_SIZE)
+            }
+
+            if (newDockSize !== dockSize) {
+                dockSize = newDockSize
             }
 
             pressedAndDragging(true)
@@ -397,6 +419,7 @@ Window {
             Applet.dockSize = dockSize
             itemIconSizeBase = dockItemMaxSize
             pressedAndDragging(false)
+            Panel.setMouseGrabEnabled(dragArea, false);
         }
 
         function anchorToTop() {