fix: not set window icon gemeotry for window

add setWindowIconGeometry for set window_icon_gemeotry property log: as title issue: linuxdeepin/developer-center#7887
linuxdeepin · Apr 18, 2024 · 0d4a037 · 0d4a037
1 parent 189d964
commit 0d4a037
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 2 deletions.
diff --git a/panels/dock/taskmanager/abstractwindow.h b/panels/dock/taskmanager/abstractwindow.h
@@ -6,6 +6,7 @@
 
 #include "dsglobal.h"
 
+#include <QWindow>
 #include <QString>
 #include <QObject>
 #include <QPointer>
@@ -41,6 +42,7 @@ class AbstractWindow : public QObject
     virtual void maxmize() = 0;
     virtual void minimize() = 0;
     virtual void killClient() = 0;
+    virtual void setWindowIconGeometry(const QWindow* baseWindow, const QRect& gemeotry) = 0;
 
     void setAppItem(QPointer<AppItem> item) {m_appitem = item;}
     QPointer<AppItem> getAppItem() {return m_appitem;}

diff --git a/panels/dock/taskmanager/itemmodel.h b/panels/dock/taskmanager/itemmodel.h
@@ -7,7 +7,6 @@
 #include "dsglobal.h"
 
 #include <QAbstractListModel>
-#include <qjsonarray.h>
 
 namespace dock {
 class AbstractItem;

diff --git a/panels/dock/taskmanager/package/AppItem.qml b/panels/dock/taskmanager/package/AppItem.qml
@@ -35,6 +35,18 @@ Item {
     property int statusIndicatorSize: root.width * 0.8
     property int iconSize: Panel.rootObject.itemIconSizeBase * 0.64
 
+    property var iconGlobalPoint: {
+        var a = icon
+        var x = 0, y = 0
+        while(a.parent) {
+            x += a.x
+            y += a.y
+            a = a.parent
+        }
+
+        return Qt.point(x, y)
+    }
+
     Item {
         anchors.fill: parent
         id: appItem
@@ -122,6 +134,7 @@ Item {
         Connections {
             function onPositionChanged() {
                 windowIndicator.updateIndicatorAnchors()
+                updateWindowIconGeometryTimer.start()
             }
             target: Panel
         }
@@ -163,6 +176,17 @@ Item {
         }
     }
 
+    Timer {
+        id: updateWindowIconGeometryTimer
+        interval: 500
+        running: false
+        repeat: false
+        onTriggered: {
+            taskmanager.Applet.setAppItemWindowIconGeometry(root.itemId, Panel.rootObject, iconGlobalPoint.x, iconGlobalPoint.y,
+                iconGlobalPoint.x + icon.width, iconGlobalPoint.y + icon.height)
+        }
+    }
+
     MouseArea {
         id: mouseArea
         anchors.fill: parent
@@ -206,4 +230,12 @@ Item {
             taskmanager.Applet.hideItemPreview()
         }
     }
+
+    onWindowsChanged: {
+        updateWindowIconGeometryTimer.start()
+    }
+
+    onIconGlobalPointChanged: {
+        updateWindowIconGeometryTimer.start()
+    }
 }
diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp
@@ -143,6 +143,16 @@ void TaskManager::hideItemPreview()
     m_windowMonitor->hideItemPreview();
 }
 
+void TaskManager::setAppItemWindowIconGeometry(const QString& appid, QObject* relativePositionItem, const int& x1, const int& y1, const int& x2, const int& y2)
+{
+    QPointer<AppItem> item = static_cast<AppItem*>(ItemModel::instance()->getItemById(appid).get());
+    if (item.isNull()) return;
+
+    for (auto window : item->getAppendWindows()) {
+        window->setWindowIconGeometry(qobject_cast<QWindow*>(relativePositionItem), QRect(QPoint(x1, y1),QPoint(x2, y2)));
+    }
+}
+
 void TaskManager::loadDockedAppItems()
 {
     // TODO: add support for group and dir type

diff --git a/panels/dock/taskmanager/taskmanager.h b/panels/dock/taskmanager/taskmanager.h
@@ -44,6 +44,8 @@ class TaskManager : public DS_NAMESPACE::DContainment
     Q_INVOKABLE void showItemPreview(const QString& itemId, QObject* relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction);
     Q_INVOKABLE void hideItemPreview();
 
+    Q_INVOKABLE void setAppItemWindowIconGeometry(const QString& appid, QObject* relativePositionItem, const int& x1, const int& y1, const int& x2, const int& y2);
+
 Q_SIGNALS:
     void itemsChanged();
     void windowSplitChanged();

diff --git a/panels/dock/taskmanager/waylandwindow.cpp b/panels/dock/taskmanager/waylandwindow.cpp
@@ -191,6 +191,11 @@ void WaylandWindow::killClient()
     m_foreignToplevelHandle->close();
 }
 
+void WaylandWindow::setWindowIconGeometry(const QWindow* baseWindow, const QRect& gemeotry)
+{
+
+}
+
 void WaylandWindow::updatePid()
 {
 

diff --git a/panels/dock/taskmanager/waylandwindow.h b/panels/dock/taskmanager/waylandwindow.h
@@ -87,6 +87,7 @@ class WaylandWindow : public AbstractWindow
     void maxmize() override;
     void minimize() override;
     void killClient() override;
+    void setWindowIconGeometry(const QWindow* baseWindow, const QRect& gemeotry) override;
 
 private:
     void updatePid() override;

diff --git a/panels/dock/taskmanager/x11utils.cpp b/panels/dock/taskmanager/x11utils.cpp
@@ -6,7 +6,6 @@
 #include "dsglobal.h"
 
 #include <cstddef>
-#include <qloggingcategory.h>
 #include <unistd.h>
 #include <xcb/xcb.h>
 #include <xcb/res.h>
@@ -314,4 +313,11 @@ void X11Utils::restackWindow(const xcb_window_t& window)
 {
     xcb_ewmh_request_restack_window(&m_ewmh, 0, window, 0, XCB_STACK_MODE_ABOVE);
 }
+
+void X11Utils::setWindowIconGemeotry(const xcb_window_t& window, const QRect& geometry)
+{
+    const auto ratio = qApp->devicePixelRatio();
+    xcb_ewmh_set_wm_icon_geometry(&m_ewmh, window, geometry.x() * ratio, geometry.y() * ratio, geometry.width() * ratio, geometry.height() * ratio);
+}
+
 }
diff --git a/panels/dock/taskmanager/x11utils.h b/panels/dock/taskmanager/x11utils.h
@@ -64,6 +64,7 @@ class X11Utils
     void killClient(const xcb_window_t& window);
     void setActiveWindow(const xcb_window_t& window);
     void restackWindow(const xcb_window_t& window);
+    void setWindowIconGemeotry(const xcb_window_t& window, const QRect& geometry);
 
 private:
     X11Utils();

diff --git a/panels/dock/taskmanager/x11window.cpp b/panels/dock/taskmanager/x11window.cpp
@@ -9,6 +9,7 @@
 
 #include <mutex>
 
+#include <QRect>
 #include <QObject>
 #include <QLoggingCategory>
 
@@ -142,6 +143,12 @@ void X11Window::killClient()
     X11->killClient(m_windowID);
 }
 
+void X11Window::setWindowIconGeometry(const QWindow* baseWindow, const QRect& gemeotry)
+{
+    auto pos = baseWindow->position() + gemeotry.topLeft();
+    X11->setWindowIconGemeotry(m_windowID, QRect(pos.x(), pos.y(), gemeotry.width(), gemeotry.height()));
+}
+
 void X11Window::updatePid()
 {
     auto oldPid = m_pid;

diff --git a/panels/dock/taskmanager/x11window.h b/panels/dock/taskmanager/x11window.h
@@ -35,6 +35,7 @@ class X11Window : public AbstractWindow
     virtual void maxmize() override;
     virtual void minimize() override;
     virtual void killClient() override;
+    virtual void setWindowIconGeometry(const QWindow* baseWindow, const QRect& gemeotry) override;
 
 private:
     friend class X11WindowMonitor;