From 3b0574bd46db3c2035db61e2f90547029a0e8ae9 Mon Sep 17 00:00:00 2001
From: 1cebp <1cebp@protonmail.com>
Date: Wed, 16 Jul 2025 13:16:01 -0400
Subject: [PATCH] Fix monitor offset w/ left-of-center monitors in overview

---
 .../quickshell/ii/modules/overview/OverviewWidget.qml  | 10 ++++------
 .../quickshell/ii/modules/overview/OverviewWindow.qml  |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.config/quickshell/ii/modules/overview/OverviewWidget.qml b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
index 18e60c2f..ab5d4332 100644
--- a/.config/quickshell/ii/modules/overview/OverviewWidget.qml
+++ b/.config/quickshell/ii/modules/overview/OverviewWidget.qml
@@ -175,10 +175,8 @@ Item {
 
                     property int workspaceColIndex: (windowData?.workspace.id - 1) % Config.options.overview.columns
                     property int workspaceRowIndex: Math.floor((windowData?.workspace.id - 1) % root.workspacesShown / Config.options.overview.columns)
-                    xOffset: {
-                        return (root.workspaceImplicitWidth + workspaceSpacing) * workspaceColIndex - (monitor?.x * root.scale)
-                    }
-                    yOffset: (root.workspaceImplicitHeight + workspaceSpacing) * workspaceRowIndex - (monitor?.y * root.scale)
+                    xOffset: (root.workspaceImplicitWidth + workspaceSpacing) * workspaceColIndex
+                    yOffset: (root.workspaceImplicitHeight + workspaceSpacing) * workspaceRowIndex
 
                     Timer {
                         id: updateWindowPosition
@@ -186,8 +184,8 @@ Item {
                         repeat: false
                         running: false
                         onTriggered: {
-                            window.x = Math.round(Math.max((windowData?.at[0] - monitorData?.reserved[0]) * root.scale, 0) + xOffset)
-                            window.y = Math.round(Math.max((windowData?.at[1] - monitorData?.reserved[1]) * root.scale, 0) + yOffset)
+                            window.x = Math.round(Math.max((windowData?.at[0] - (monitor?.x ?? 0) - monitorData?.reserved[0]) * root.scale, 0) + xOffset)
+                            window.y = Math.round(Math.max((windowData?.at[1] - (monitor?.y ?? 0) - monitorData?.reserved[1]) * root.scale, 0) + yOffset)
                         }
                     }
 
diff --git a/.config/quickshell/ii/modules/overview/OverviewWindow.qml b/.config/quickshell/ii/modules/overview/OverviewWindow.qml
index bf023a09..2820cb65 100644
--- a/.config/quickshell/ii/modules/overview/OverviewWindow.qml
+++ b/.config/quickshell/ii/modules/overview/OverviewWindow.qml
@@ -22,8 +22,8 @@ Item { // Window
     property var availableWorkspaceWidth
     property var availableWorkspaceHeight
     property bool restrictToWorkspace: true
-    property real initX: Math.max((windowData?.at[0] - monitorData?.reserved[0]) * root.scale, 0) + xOffset
-    property real initY: Math.max((windowData?.at[1] - monitorData?.reserved[1]) * root.scale, 0) + yOffset
+    property real initX: Math.max((windowData?.at[0] - (monitorData?.x ?? 0) - monitorData?.reserved[0]) * root.scale, 0) + xOffset
+    property real initY: Math.max((windowData?.at[1] - (monitorData?.y ?? 0) - monitorData?.reserved[1]) * root.scale, 0) + yOffset
     property real xOffset: 0
     property real yOffset: 0