Merge branch 'master' into fix-bug-334659

wjyrich · web-flow · commit cfa1563db33f · 2025-09-29T14:03:51.000+08:00
diff --git a/panels/dock/taskmanager/abstracttaskmanagerinterface.h b/panels/dock/taskmanager/abstracttaskmanagerinterface.h
@@ -62,9 +62,9 @@ class AbstractTaskManagerInterface
     {
         callInterfaceMethod(index, &AbstractTaskManagerInterface::requestClose, force);
     }
-    virtual void requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const
+    virtual void requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const
     {
-        callInterfaceMethod(index, &AbstractTaskManagerInterface::requestUpdateWindowGeometry, geometry, delegate);
+        callInterfaceMethod(index, &AbstractTaskManagerInterface::requestUpdateWindowIconGeometry, geometry, delegate);
     }
     virtual void requestWindowsView(const QModelIndexList &indexes) const
     {
diff --git a/panels/dock/taskmanager/abstractwindowmonitor.cpp b/panels/dock/taskmanager/abstractwindowmonitor.cpp
@@ -65,7 +65,7 @@ void AbstractWindowMonitor::requestClose(const QModelIndex &index, bool force) c
     }
 }
 
-void AbstractWindowMonitor::requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
+void AbstractWindowMonitor::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
 {
 }
 
diff --git a/panels/dock/taskmanager/abstractwindowmonitor.h b/panels/dock/taskmanager/abstractwindowmonitor.h
@@ -39,7 +39,7 @@ class AbstractWindowMonitor : public QAbstractListModel, public AbstractTaskMana
     void requestOpenUrls(const QModelIndex &index, const QList<QUrl> &urls) const override;
     void requestNewInstance(const QModelIndex &index, const QString &action) const override;
     void requestClose(const QModelIndex &index, bool force = false) const override;
-    void requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
+    void requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
 
     virtual void
     requestPreview(QAbstractItemModel *sourceModel, QWindow *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction) = 0;
diff --git a/panels/dock/taskmanager/dockglobalelementmodel.cpp b/panels/dock/taskmanager/dockglobalelementmodel.cpp
@@ -382,11 +382,17 @@ void DockGlobalElementModel::requestClose(const QModelIndex &index, bool force)
     qWarning() << "unable to close app not running";
 }
 
-void DockGlobalElementModel::requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
+void DockGlobalElementModel::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
 {
-    Q_UNUSED(index)
-    Q_UNUSED(geometry)
-    Q_UNUSED(delegate)
+    auto data = m_data.value(index.row());
+    auto id = std::get<0>(data);
+    auto sourceModel = std::get<1>(data);
+    auto sourceRow = std::get<2>(data);
+
+    if (sourceModel == m_activeAppModel) {
+        auto sourceIndex = sourceModel->index(sourceRow, 0);
+        m_activeAppModel->requestUpdateWindowIconGeometry(sourceIndex, geometry, delegate);
+    }
 }
 
 void DockGlobalElementModel::requestWindowsView(const QModelIndexList &indexes) const
diff --git a/panels/dock/taskmanager/dockglobalelementmodel.h b/panels/dock/taskmanager/dockglobalelementmodel.h
@@ -31,7 +31,7 @@ class DockGlobalElementModel : public QAbstractListModel, public AbstractTaskMan
 
     void requestOpenUrls(const QModelIndex &index, const QList<QUrl> &urls) const override;
     void requestClose(const QModelIndex &index, bool force = false) const override;
-    void requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
+    void requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
 
     void requestWindowsView(const QModelIndexList &indexes) const override;
 
diff --git a/panels/dock/taskmanager/dockgroupmodel.cpp b/panels/dock/taskmanager/dockgroupmodel.cpp
@@ -136,11 +136,17 @@ void DockGroupModel::requestClose(const QModelIndex &index, bool force) const
     }
 }
 
-void DockGroupModel::requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
+void DockGroupModel::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
 {
-    Q_UNUSED(index)
-    Q_UNUSED(geometry)
-    Q_UNUSED(delegate)
+    auto interface = dynamic_cast<AbstractTaskManagerInterface *>(sourceModel());
+    if (nullptr == interface)
+        return;
+
+    auto indexRowCount = RoleGroupModel::rowCount(index);
+    for (int i = 0; i < indexRowCount; i++) {
+        auto cIndex = RoleGroupModel::index(i, 0, index);
+        callInterfaceMethod(cIndex, &AbstractTaskManagerInterface::requestUpdateWindowIconGeometry, geometry, delegate);
+    }
 }
 
 void DockGroupModel::requestWindowsView(const QModelIndexList &indexes) const
diff --git a/panels/dock/taskmanager/dockgroupmodel.h b/panels/dock/taskmanager/dockgroupmodel.h
@@ -22,7 +22,7 @@ class DockGroupModel : public RoleGroupModel, public AbstractTaskManagerInterfac
     void requestActivate(const QModelIndex &index) const override;
     void requestNewInstance(const QModelIndex &index, const QString &action) const override;
     void requestClose(const QModelIndex &index, bool force = false) const override;
-    void requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
+    void requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
     void requestWindowsView(const QModelIndexList &indexes) const override;
 
 private:
diff --git a/panels/dock/taskmanager/package/AppItem.qml b/panels/dock/taskmanager/package/AppItem.qml
@@ -272,8 +272,8 @@ Item {
         repeat: false
         onTriggered: {
             var pos = icon.mapToItem(null, 0, 0)
-            taskmanager.Applet.setAppItemWindowIconGeometry(root.itemId, Panel.rootObject, pos.x, pos.y,
-                pos.x + icon.width, pos.y + icon.height)
+            taskmanager.Applet.requestUpdateWindowIconGeometry(root.modelIndex, Qt.rect(pos.x, pos.y,
+                icon.width, icon.height), Panel.rootObject)
         }
     }
 
diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp
@@ -201,9 +201,9 @@ void TaskManager::requestClose(const QModelIndex &index, bool force) const
     m_itemModel->requestClose(index, force);
 }
 
-void TaskManager::requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
+void TaskManager::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
 {
-    m_itemModel->requestUpdateWindowGeometry(index, geometry, delegate);
+    m_itemModel->requestUpdateWindowIconGeometry(index, geometry, delegate);
 }
 
 void TaskManager::requestPreview(const QModelIndex &index, QObject *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction)
@@ -312,16 +312,6 @@ 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)));
-    }
-}
-
 bool TaskManager::allowForceQuit()
 {
     return Settings->isAllowedForceQuit();
diff --git a/panels/dock/taskmanager/taskmanager.h b/panels/dock/taskmanager/taskmanager.h
@@ -78,7 +78,7 @@ class TaskManager : public DS_NAMESPACE::DContainment, public AbstractTaskManage
 
     Q_INVOKABLE void requestOpenUrls(const QModelIndex &index, const QList<QUrl> &urls) const override;
     Q_INVOKABLE void requestClose(const QModelIndex &index, bool force = false) const override;
-    Q_INVOKABLE void requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
+    Q_INVOKABLE void requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
     Q_INVOKABLE void
     requestPreview(const QModelIndex &index, QObject *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction);
     Q_INVOKABLE void requestWindowsView(const QModelIndexList &indexes) const override;
@@ -93,7 +93,6 @@ class TaskManager : public DS_NAMESPACE::DContainment, public AbstractTaskManage
     Q_INVOKABLE void dropFilesOnItem(const QString &itemId, const QStringList &urls);
     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_INVOKABLE void activateWindow(uint32_t windowID);
     Q_INVOKABLE void saveDockElementsOrder(const QStringList &appIds);
 
diff --git a/panels/dock/taskmanager/x11windowmonitor.cpp b/panels/dock/taskmanager/x11windowmonitor.cpp
@@ -151,6 +151,13 @@ void X11WindowMonitor::requestPreview(QAbstractItemModel *sourceModel,
     m_windowPreview->updatePosition();
 }
 
+void X11WindowMonitor::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const
+{
+    xcb_window_t winId = index.data(TaskManager::WinIdRole).toUInt();
+    auto pos = qobject_cast<QWindow *>(delegate)->position() + geometry.topLeft();
+    X11->setWindowIconGemeotry(winId, QRect(pos.x(), pos.y(), geometry.width(), geometry.height()));
+}
+
 void X11WindowMonitor::clearPreviewState()
 {
     // 发出信号通知 TaskManager 清空预览过滤状态
diff --git a/panels/dock/taskmanager/x11windowmonitor.h b/panels/dock/taskmanager/x11windowmonitor.h
@@ -44,6 +44,7 @@ class X11WindowMonitor : public AbstractWindowMonitor
 
     void
     requestPreview(QAbstractItemModel *sourceModel, QWindow *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction) override;
+    void requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
 
 Q_SIGNALS:
     void windowMapped(xcb_window_t window);
diff --git a/panels/dock/tray/package/tray.qml b/panels/dock/tray/package/tray.qml
@@ -57,11 +57,14 @@ AppletItem {
                 color: "transparent"
                 model: DDT.SortFilterProxyModel {
                     sourceModel: DDT.TraySortOrderModel
+                    sortRoleName: "visualIndex"
+                    sortOrder: Qt.AscendingOrder
                     filterRowCallback: (sourceRow, sourceParent) => {
                         let index = sourceModel.index(sourceRow, 0, sourceParent)
                         return sourceModel.data(index, DDT.TraySortOrderModel.SectionTypeRole) === "stashed" &&
                                sourceModel.data(index, DDT.TraySortOrderModel.VisibilityRole) === true
                     }
+                    sortRole: DDT.TraySortOrderModel.VisualIndexRole
                 }
                 anchors.centerIn: parent
                 onRowCountChanged: {

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ class AbstractTaskManagerInterface`
`62`	`62`	`{`
`63`	`63`	`callInterfaceMethod(index, &AbstractTaskManagerInterface::requestClose, force);`
`64`	`64`	`}`
`65`		`- virtual void requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const`
	`65`	`+ virtual void requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const`
`66`	`66`	`{`
`67`		`- callInterfaceMethod(index, &AbstractTaskManagerInterface::requestUpdateWindowGeometry, geometry, delegate);`
	`67`	`+ callInterfaceMethod(index, &AbstractTaskManagerInterface::requestUpdateWindowIconGeometry, geometry, delegate);`
`68`	`68`	`}`
`69`	`69`	`virtual void requestWindowsView(const QModelIndexList &indexes) const`
`70`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void AbstractWindowMonitor::requestClose(const QModelIndex &index, bool force) c`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`-void AbstractWindowMonitor::requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const`
	`68`	`+void AbstractWindowMonitor::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const`
`69`	`69`	`{`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -136,11 +136,17 @@ void DockGroupModel::requestClose(const QModelIndex &index, bool force) const`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`-void DockGroupModel::requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const`
	`139`	`+void DockGroupModel::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const`
`140`	`140`	`{`
`141`		`- Q_UNUSED(index)`
`142`		`- Q_UNUSED(geometry)`
`143`		`- Q_UNUSED(delegate)`
	`141`	`+ auto interface = dynamic_cast<AbstractTaskManagerInterface *>(sourceModel());`
	`142`	`+ if (nullptr == interface)`
	`143`	`+ return;`
	`144`	`+`
	`145`	`+ auto indexRowCount = RoleGroupModel::rowCount(index);`
	`146`	`+ for (int i = 0; i < indexRowCount; i++) {`
	`147`	`+ auto cIndex = RoleGroupModel::index(i, 0, index);`
	`148`	`+ callInterfaceMethod(cIndex, &AbstractTaskManagerInterface::requestUpdateWindowIconGeometry, geometry, delegate);`
	`149`	`+ }`
`144`	`150`	`}`
`145`	`151`
`146`	`152`	`void DockGroupModel::requestWindowsView(const QModelIndexList &indexes) const`
Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,8 @@ Item {`
`272`	`272`	`repeat: false`
`273`	`273`	`onTriggered: {`
`274`	`274`	`var pos = icon.mapToItem(null, 0, 0)`
`275`		`- taskmanager.Applet.setAppItemWindowIconGeometry(root.itemId, Panel.rootObject, pos.x, pos.y,`
`276`		`- pos.x + icon.width, pos.y + icon.height)`
	`275`	`+ taskmanager.Applet.requestUpdateWindowIconGeometry(root.modelIndex, Qt.rect(pos.x, pos.y,`
	`276`	`+ icon.width, icon.height), Panel.rootObject)`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`
Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,9 @@ void TaskManager::requestClose(const QModelIndex &index, bool force) const`
`201`	`201`	`m_itemModel->requestClose(index, force);`
`202`	`202`	`}`
`203`	`203`
`204`		`-void TaskManager::requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const`
	`204`	`+void TaskManager::requestUpdateWindowIconGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate) const`
`205`	`205`	`{`
`206`		`- m_itemModel->requestUpdateWindowGeometry(index, geometry, delegate);`
	`206`	`+ m_itemModel->requestUpdateWindowIconGeometry(index, geometry, delegate);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`void TaskManager::requestPreview(const QModelIndex &index, QObject *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction)`
`@@ -312,16 +312,6 @@ void TaskManager::hideItemPreview()`
`312`	`312`	`m_windowMonitor->hideItemPreview();`
`313`	`313`	`}`
`314`	`314`
`315`		`-void TaskManager::setAppItemWindowIconGeometry(const QString& appid, QObject* relativePositionItem, const int& x1, const int& y1, const int& x2, const int& y2)`
`316`		`-{`
`317`		`- QPointer<AppItem> item = static_cast<AppItem*>(ItemModel::instance()->getItemById(appid).get());`
`318`		`- if (item.isNull()) return;`
`319`		`-`
`320`		`- for (auto window : item->getAppendWindows()) {`
`321`		`- window->setWindowIconGeometry(qobject_cast<QWindow*>(relativePositionItem), QRect(QPoint(x1, y1),QPoint(x2, y2)));`
`322`		`- }`
`323`		`-}`
`324`		`-`
`325`	`315`	`bool TaskManager::allowForceQuit()`
`326`	`316`	`{`
`327`	`317`	`return Settings->isAllowedForceQuit();`