fix: sometimes clicking dock icon won't activate window as intended

修正部分情况下点击任务栏上的图标无法激活已经打开的窗口的问题.

复现步骤:

1. 启动程序A,然后再启动程序A(使目前存在两个A窗口)
2. 点击任何一个其他程序的窗口,切换焦点到其他程序B
3. 点击任务栏上的A图标,将其中一个A窗口激活到顶部
4. 点击这个A窗口的关闭按钮
5. 点击任务栏上的A图标,观察结果

修复前:点击无反应
修复后:点击有反应,会把A置前

PMS: BUG-335803
Log:

Author: BLumia

panels/dock/taskmanager/dockgroupmodel.cpp

@@ -26,10 +26,27 @@ DockGroupModel::DockGroupModel(QAbstractItemModel *sourceModel, int role, QObjec
         Q_EMIT dataChanged(index(parent.row(), 0), index(parent.row(), 0), {TaskManager::WindowsRole});
     });
     connect(this, &QAbstractItemModel::rowsRemoved, this, [this](const QModelIndex &parent, int first, int last) {
-        Q_UNUSED(first)
-        Q_UNUSED(last)
         if (!parent.isValid())
             return;
+
+        // Update m_currentActiveWindow when windows are removed
+        int parentRow = parent.row();
+        if (m_currentActiveWindow.contains(parentRow)) {
+            int currentActive = m_currentActiveWindow.value(parentRow);
+            int windowCount = RoleGroupModel::rowCount(parent);
+
+            // Check if the current active window was removed
+            if (currentActive >= first && currentActive <= last) {
+                // Current active window was removed, reset to first window
+                resetActiveWindow(parentRow);
+            } else if (currentActive > last) {
+                // Current active window is after the removed range, shift it back
+                int removedCount = last - first + 1;
+                m_currentActiveWindow[parentRow] = currentActive - removedCount;
+            }
+            // If currentActive < first, no change needed
+        }
+
         Q_EMIT dataChanged(index(parent.row(), 0), index(parent.row(), 0), {TaskManager::WindowsRole});
     });
 
@@ -179,4 +196,18 @@ void DockGroupModel::requestNewInstance(const QModelIndex &index, const QString
         return;
     }
 }
+
+void DockGroupModel::resetActiveWindow(int parentRow)
+{
+    if (m_currentActiveWindow.contains(parentRow)) {
+        int windowCount = RoleGroupModel::rowCount(index(parentRow, 0));
+        if (windowCount > 0) {
+            // Reset to first window
+            m_currentActiveWindow[parentRow] = 0;
+        } else {
+            // No windows left, remove the tracking
+            m_currentActiveWindow.remove(parentRow);
+        }
+    }
+}
 }

panels/dock/taskmanager/dockgroupmodel.h

@@ -28,6 +28,7 @@ class DockGroupModel : public RoleGroupModel, public AbstractTaskManagerInterfac
 private:
     bool any(const QModelIndex &index, int role) const;
     QVariantList all(const QModelIndex &index, int role) const;
+    void resetActiveWindow(int parentRow);
 
 private:
     int m_roleForDeduplication;