From 532497f6bd1c668dab241cb75cb78180111ecf5a Mon Sep 17 00:00:00 2001
From: cupcat121 <75441895+cupcat121@users.noreply.github.com>
Date: Sat, 6 Sep 2025 11:40:24 +0800
Subject: [PATCH 1/3] fix out of index error in OverviewWindow monitorData

---
 .config/quickshell/ii/modules/overview/OverviewWidget.qml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.config/quickshell/ii/modules/overview/OverviewWidget.qml b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
index 2510a5642..367565d30 100644
--- a/.config/quickshell/ii/modules/overview/OverviewWidget.qml
+++ b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
@@ -153,15 +153,17 @@ Item {
                         })
                     }
                 }
+            // TODO: Fix various issues in multiple monitors
+            //  1. Indicator for workspace ID is wrong when workspaces in overview are included from multiple monitors
                 delegate: OverviewWindow {
                     id: window
                     required property var modelData
                     property int monitorId: windowData?.monitor
-                    property var monitor: HyprlandData.monitors[monitorId]
+                    property var monitor: HyprlandData.monitors.find(m => m.id == Hyprland.focusedMonitor?.id)
                     property var address: `0x${modelData.HyprlandToplevel.address}`
                     windowData: windowByAddress[address]
                     toplevel: modelData
-                    monitorData: HyprlandData.monitors[monitorId]
+                    monitorData: root.monitorData
                     scale: root.scale
                     availableWorkspaceWidth: root.workspaceImplicitWidth
                     availableWorkspaceHeight: root.workspaceImplicitHeight

From cd851afc8d1bf691404aa1bfa064cdb3813e8094 Mon Sep 17 00:00:00 2001
From: cupcat121 <75441895+cupcat121@users.noreply.github.com>
Date: Tue, 9 Sep 2025 19:08:29 +0800
Subject: [PATCH 2/3] remove TODO

---
 .config/quickshell/ii/modules/overview/OverviewWidget.qml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.config/quickshell/ii/modules/overview/OverviewWidget.qml b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
index 367565d30..dc64d3f58 100644
--- a/.config/quickshell/ii/modules/overview/OverviewWidget.qml
+++ b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
@@ -153,8 +153,6 @@ Item {
                         })
                     }
                 }
-            // TODO: Fix various issues in multiple monitors
-            //  1. Indicator for workspace ID is wrong when workspaces in overview are included from multiple monitors
                 delegate: OverviewWindow {
                     id: window
                     required property var modelData

From f1ba087bff12be659ef327f7d6b8ec5fa5615db8 Mon Sep 17 00:00:00 2001
From: cupcat121 <75441895+cupcat121@users.noreply.github.com>
Date: Thu, 11 Sep 2025 00:29:44 +0800
Subject: [PATCH 3/3] fix wrong monitor data being passed to OverviewWindow

---
 .config/quickshell/ii/modules/overview/OverviewWidget.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.config/quickshell/ii/modules/overview/OverviewWidget.qml b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
index dc64d3f58..5d965585a 100644
--- a/.config/quickshell/ii/modules/overview/OverviewWidget.qml
+++ b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
@@ -155,13 +155,13 @@ Item {
                 }
                 delegate: OverviewWindow {
                     id: window
+                    windowData: windowByAddress[address]
                     required property var modelData
                     property int monitorId: windowData?.monitor
-                    property var monitor: HyprlandData.monitors.find(m => m.id == Hyprland.focusedMonitor?.id)
+                    property var monitor: HyprlandData.monitors.find(m => m.id == monitorId)
                     property var address: `0x${modelData.HyprlandToplevel.address}`
-                    windowData: windowByAddress[address]
                     toplevel: modelData
-                    monitorData: root.monitorData
+                    monitorData: this.monitor
                     scale: root.scale
                     availableWorkspaceWidth: root.workspaceImplicitWidth
                     availableWorkspaceHeight: root.workspaceImplicitHeight