chore: remove requestPreview from abstracttaskmanagerinterface.h

BLumia · BLumia · commit d95f5e92f206 · 2025-08-28T16:45:54.000+08:00
移除原本为图标预览所预留的 API,因为此接口计划调整形式.

原因是旧的接口传递的是 QModelIndexList, 当窗口数量变化时就无法主动
感知到变化,需要某种形式的刷新. 计划调整为使用 proxy model 的形式基
于原始模型提供的窗口信息过滤并展示对应的窗口预览, 这样当有新的符合
过滤条件的窗口出现或者窗口消失时, 视图即可直接因模型变化而刷新.

相关代理模型的实现也附带于本提交中,尽管目前并未实际用到.

Log:
diff --git a/panels/dock/taskmanager/CMakeLists.txt b/panels/dock/taskmanager/CMakeLists.txt
@@ -74,6 +74,8 @@ add_library(dock-taskmanager SHARED ${DBUS_INTERFACES}
     dockglobalelementmodel.h
     dockgroupmodel.cpp
     dockgroupmodel.h
+    hoverpreviewproxymodel.cpp
+    hoverpreviewproxymodel.h
     taskmanager.cpp
     taskmanager.h
     treelandwindow.cpp
diff --git a/panels/dock/taskmanager/abstracttaskmanagerinterface.h b/panels/dock/taskmanager/abstracttaskmanagerinterface.h
@@ -66,12 +66,6 @@ class AbstractTaskManagerInterface
     {
         callInterfaceMethod(index, &AbstractTaskManagerInterface::requestUpdateWindowGeometry, geometry, delegate);
     }
-
-    virtual void
-    requestPreview(const QModelIndexList &indexes, QObject *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction) const
-    {
-        callInterfaceMethod(indexes, &AbstractTaskManagerInterface::requestPreview, relativePositionItem, previewXoffset, previewYoffset, direction);
-    }
     virtual void requestWindowsView(const QModelIndexList &indexes) const
     {
         callInterfaceMethod(indexes, &AbstractTaskManagerInterface::requestWindowsView);
diff --git a/panels/dock/taskmanager/dockglobalelementmodel.cpp b/panels/dock/taskmanager/dockglobalelementmodel.cpp
@@ -41,7 +41,7 @@ DockGlobalElementModel::DockGlobalElementModel(QAbstractItemModel *appsModel, Do
         }
         std::for_each(m_data.begin(), m_data.end(), [this, first, last](auto &data) {
             if (std::get<1>(data) == m_appsModel && std::get<2>(data) >= first) {
-                data = std::make_tuple(std::get<0>(data), std::get<1>(data), std::get<2>(data) - -((last - first) + 1));
+                data = std::make_tuple(std::get<0>(data), std::get<1>(data), std::get<2>(data) - ((last - first) + 1));
             }
         });
     });
@@ -293,7 +293,9 @@ QVariant DockGlobalElementModel::data(const QModelIndex &index, int role) const
         if (model == m_activeAppModel) {
             return QStringList{model->index(row, 0).data(TaskManager::WinIdRole).toString()};
         }
-        return QVariant();
+        // For m_appsModel data, when it's GroupModel we can directly get all window IDs for this desktop ID
+        QModelIndex groupIndex = model->index(row, 0);
+        return groupIndex.data(TaskManager::WindowsRole).toStringList();
     }
     case TaskManager::MenusRole: {
         return getMenus(index);
@@ -384,25 +386,6 @@ void DockGlobalElementModel::requestUpdateWindowGeometry(const QModelIndex &inde
     Q_UNUSED(delegate)
 }
 
-void DockGlobalElementModel::requestPreview(const QModelIndexList &indexes,
-                                            QObject *relativePositionItem,
-                                            int32_t previewXoffset,
-                                            int32_t previewYoffset,
-                                            uint32_t direction) const
-{
-    QModelIndexList sourceIndexes;
-    for (auto index : indexes) {
-        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) {
-            sourceIndexes.append(sourceModel->index(sourceRow, 0));
-        }
-    }
-    m_activeAppModel->requestPreview(sourceIndexes, relativePositionItem, previewXoffset, previewYoffset, direction);
-}
-
 void DockGlobalElementModel::requestWindowsView(const QModelIndexList &indexes) const
 {
     Q_UNUSED(indexes)
diff --git a/panels/dock/taskmanager/dockglobalelementmodel.h b/panels/dock/taskmanager/dockglobalelementmodel.h
@@ -34,11 +34,6 @@ class DockGlobalElementModel : public QAbstractListModel, public AbstractTaskMan
     void requestClose(const QModelIndex &index, bool force = false) const override;
     void requestUpdateWindowGeometry(const QModelIndex &index, const QRect &geometry, QObject *delegate = nullptr) const override;
 
-    void requestPreview(const QModelIndexList &indexes,
-                        QObject *relativePositionItem,
-                        int32_t previewXoffset,
-                        int32_t previewYoffset,
-                        uint32_t direction) const override;
     void requestWindowsView(const QModelIndexList &indexes) const override;
 
 private:
diff --git a/panels/dock/taskmanager/dockgroupmodel.cpp b/panels/dock/taskmanager/dockgroupmodel.cpp
@@ -137,23 +137,6 @@ void DockGroupModel::requestUpdateWindowGeometry(const QModelIndex &index, const
     Q_UNUSED(delegate)
 }
 
-void DockGroupModel::requestPreview(const QModelIndexList &indexes,
-                                    QObject *relativePositionItem,
-                                    int32_t previewXoffset,
-                                    int32_t previewYoffset,
-                                    uint32_t direction) const
-{
-    QModelIndexList proxyIndexes;
-    for (auto index : indexes) {
-        for (int i = 0; i < RoleGroupModel::rowCount(index); ++i) {
-            auto proxyIndex = createIndex(i, 0, index.row());
-            proxyIndexes.append(proxyIndex);
-        }
-    }
-
-    callInterfaceMethod(proxyIndexes, &AbstractTaskManagerInterface::requestPreview, relativePositionItem, previewXoffset, previewYoffset, direction);
-}
-
 void DockGroupModel::requestWindowsView(const QModelIndexList &indexes) const
 {
     QModelIndexList sourceIndexes;
@@ -165,4 +148,4 @@ void DockGroupModel::requestWindowsView(const QModelIndexList &indexes) const
 
     callInterfaceMethod(sourceIndexes, &AbstractTaskManagerInterface::requestWindowsView);
 }
-}
+}
diff --git a/panels/dock/taskmanager/dockgroupmodel.h b/panels/dock/taskmanager/dockgroupmodel.h
@@ -22,11 +22,6 @@ class DockGroupModel : public RoleGroupModel, public AbstractTaskManagerInterfac
     void requestActivate(const QModelIndex &index) 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 requestPreview(const QModelIndexList &indexes,
-                        QObject *relativePositionItem,
-                        int32_t previewXoffset,
-                        int32_t previewYoffset,
-                        uint32_t direction) const override;
     void requestWindowsView(const QModelIndexList &indexes) const override;
 
 private:
diff --git a/panels/dock/taskmanager/dockitemmodel.cpp b/panels/dock/taskmanager/dockitemmodel.cpp
@@ -19,11 +19,13 @@ DockItemModel::DockItemModel(QAbstractItemModel *globalModel, QObject *parent)
     , m_isUpdating(false)
 {
     auto updateSourceModel = [this]() {
-        if (TaskManagerSettings::instance()->isWindowSplit() == m_split)
+        bool isWindowSplit = TaskManagerSettings::instance()->isWindowSplit();
+        if (isWindowSplit == m_split)
             return;
 
-        m_split = TaskManagerSettings::instance()->isWindowSplit();
-        if (m_split) {
+        m_split = isWindowSplit;
+
+        if (isWindowSplit) {
             setSourceModel(m_globalModel);
             m_groupModel.reset(nullptr);
         } else {
diff --git a/panels/dock/taskmanager/hoverpreviewproxymodel.cpp b/panels/dock/taskmanager/hoverpreviewproxymodel.cpp
@@ -0,0 +1,82 @@
+// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "hoverpreviewproxymodel.h"
+#include "taskmanager.h"
+#include "taskmanagersettings.h"
+
+#include <QDebug>
+
+namespace dock
+{
+
+HoverPreviewProxyModel::HoverPreviewProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+    , m_settings(TaskManagerSettings::instance())
+{
+    // 设置动态排序，确保模型变化时自动重新过滤
+    setDynamicSortFilter(true);
+}
+
+void HoverPreviewProxyModel::setFilterModelIndex(const QModelIndex &index)
+{
+    if (m_filterIndex == index)
+        return;
+
+    m_filterIndex = index;
+
+    // 触发过滤器重新计算
+    invalidateFilter();
+}
+
+void HoverPreviewProxyModel::clearFilter()
+{
+    setFilterModelIndex(QModelIndex());
+}
+
+bool HoverPreviewProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    Q_UNUSED(sourceParent)
+
+    // 如果没有设置过滤条件，则不显示任何行
+    if (!m_filterIndex.isValid())
+        return false;
+
+    if (!sourceModel())
+        return false;
+
+    QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0);
+    if (!sourceIndex.isValid())
+        return false;
+
+    // 确保有实际的窗口ID
+    QVariant winIdData = sourceIndex.data(TaskManager::WinIdRole);
+    uint32_t winId = winIdData.toUInt();
+    if (winId == 0)
+        return false;
+
+    // 根据 noTaskGrouping 配置采用不同的过滤策略
+    bool isWindowSplit = (m_settings && m_settings->isWindowSplit());
+
+    if (isWindowSplit) {
+        // noTaskGrouping = true: 精确匹配该模型索引对应的窗口
+        // 比较窗口ID是否匹配
+        QVariant filterWinId = m_filterIndex.data(TaskManager::WinIdRole);
+        uint32_t targetWinId = filterWinId.toUInt();
+
+        bool result = (winId == targetWinId && targetWinId != 0);
+        // 在 WindowSplit 模式下，精确匹配单个窗口
+        return result;
+    } else {
+        // noTaskGrouping = false: 基于 DesktopIdRole 匹配应用的所有窗口
+        QVariant currentDesktopId = sourceIndex.data(TaskManager::DesktopIdRole);
+        QVariant filterDesktopId = m_filterIndex.data(TaskManager::DesktopIdRole);
+
+        bool result = (currentDesktopId.toString() == filterDesktopId.toString());
+        // 在 Grouped 模式下，匹配同一应用的所有窗口
+        return result;
+    }
+}
+
+}
diff --git a/panels/dock/taskmanager/hoverpreviewproxymodel.h b/panels/dock/taskmanager/hoverpreviewproxymodel.h
@@ -0,0 +1,55 @@
+// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QSortFilterProxyModel>
+
+namespace dock
+{
+
+class TaskManagerSettings;
+
+/**
+ * @brief HoverPreviewProxyModel - 专用于任务栏 hover 预览的代理模型
+ *
+ * 该模型用于过滤出特定应用的所有窗口，确保预览窗口与实际窗口状态保持同步
+ * 支持 noTaskGrouping 模式，在该模式下只显示特定窗口而非整个应用的窗口
+ */
+class HoverPreviewProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    explicit HoverPreviewProxyModel(QObject *parent = nullptr);
+
+    /**
+     * @brief 设置要预览的模型索引，在 noTaskGrouping 模式下精确匹配该窗口
+     * @param index 要预览的模型索引，无效索引则清除过滤条件
+     */
+    void setFilterModelIndex(const QModelIndex &index);
+
+    /**
+     * @brief 获取当前过滤的模型索引
+     * @return 当前过滤的模型索引
+     */
+    QModelIndex filterModelIndex() const
+    {
+        return m_filterIndex;
+    }
+
+    /**
+     * @brief 清除过滤条件，重置模型状态
+     */
+    void clearFilter();
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+
+private:
+    QModelIndex m_filterIndex; // 当前过滤的模型索引
+    TaskManagerSettings *m_settings; // 任务管理器设置，用于获取 noTaskGrouping 状态
+};
+
+}
diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp
@@ -194,17 +194,11 @@ void TaskManager::requestUpdateWindowGeometry(const QModelIndex &index, const QR
     m_itemModel->requestUpdateWindowGeometry(index, geometry, delegate);
 }
 
-void TaskManager::requestPreview(const QModelIndexList &indexes,
-                                 QObject *relativePositionItem,
-                                 int32_t previewXoffset,
-                                 int32_t previewYoffset,
-                                 uint32_t direction) const
+void TaskManager::requestPreview(const QModelIndex &index, QObject *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction)
 {
-    for (auto index : indexes) {
-        qDebug() << "requestPreview" << index << index.model() << (index.model() == m_itemModel);
-    }
-    m_itemModel->requestPreview(indexes, relativePositionItem, previewXoffset, previewYoffset, direction);
+    // TODO: implement this
 }
+
 void TaskManager::requestWindowsView(const QModelIndexList &indexes) const
 {
     m_itemModel->requestWindowsView(indexes);
@@ -353,9 +347,9 @@ bool TaskManager::requestDockByDesktopId(const QString& desktopID)
     if (desktopID.startsWith("internal/")) return false;
     QString appId = desktopIdToAppId(desktopID);
     // 检查应用是否已经在任务栏中，如果是则返回 false
-    if (IsDocked(appId)) 
+    if (IsDocked(appId))
         return false;
-    
+
     return RequestDock(appId);
 }
 
diff --git a/panels/dock/taskmanager/taskmanager.h b/panels/dock/taskmanager/taskmanager.h
@@ -78,11 +78,8 @@ 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 requestPreview(const QModelIndexList &indexes,
-                                    QObject *relativePositionItem,
-                                    int32_t previewXoffset,
-                                    int32_t previewYoffset,
-                                    uint32_t direction) 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;
 
     Q_INVOKABLE QString desktopIdToAppId(const QString& desktopId);

Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,6 @@ class AbstractTaskManagerInterface`
`66`	`66`	`{`
`67`	`67`	`callInterfaceMethod(index, &AbstractTaskManagerInterface::requestUpdateWindowGeometry, geometry, delegate);`
`68`	`68`	`}`
`69`		`-`
`70`		`- virtual void`
`71`		`- requestPreview(const QModelIndexList &indexes, QObject *relativePositionItem, int32_t previewXoffset, int32_t previewYoffset, uint32_t direction) const`
`72`		`- {`
`73`		`- callInterfaceMethod(indexes, &AbstractTaskManagerInterface::requestPreview, relativePositionItem, previewXoffset, previewYoffset, direction);`
`74`		`- }`
`75`	`69`	`virtual void requestWindowsView(const QModelIndexList &indexes) const`
`76`	`70`	`{`
`77`	`71`	`callInterfaceMethod(indexes, &AbstractTaskManagerInterface::requestWindowsView);`