diff options
| author | Ja.KooLit <85185940+JaKooLit@users.noreply.github.com> | 2025-07-29 23:11:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-29 23:11:26 +0900 |
| commit | 3d991ece8dfea37aea490a4c8f23927786db5416 (patch) | |
| tree | fc835bec717a2ded521806b501a2d932902dac16 /config/quickshell | |
| parent | 0ef4312445c4f7169b21802d18e939192eca358e (diff) | |
| parent | 0539861a8f951f0f13ed71af9516293c132cfff6 (diff) | |
Merge pull request #781 from JaKooLit/development
Development to main
Diffstat (limited to 'config/quickshell')
| -rw-r--r-- | config/quickshell/modules/overview/OverviewWidget.qml | 8 | ||||
| -rw-r--r-- | config/quickshell/modules/overview/OverviewWindow.qml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config/quickshell/modules/overview/OverviewWidget.qml b/config/quickshell/modules/overview/OverviewWidget.qml index 2ea8d58a..93e90967 100644 --- a/config/quickshell/modules/overview/OverviewWidget.qml +++ b/config/quickshell/modules/overview/OverviewWidget.qml @@ -239,8 +239,8 @@ Item { delegate: OverviewWindow { id: window windowData: windowByAddress[modelData] - monitorData: root.monitorData - scale: root.scale + monitorData: HyprlandData.monitors.find(m => m.id === windowData?.monitor) // use monitorData of the monitor the window is on + scale: root.scale * (monitorData?.scale / root.monitor?.scale) // adjust window scale to the monitor where the overview is displayed availableWorkspaceWidth: root.workspaceImplicitWidth availableWorkspaceHeight: root.workspaceImplicitHeight @@ -258,8 +258,8 @@ Item { repeat: false running: false onTriggered: { - window.x = Math.max((windowData?.at[0] - monitorData?.reserved[0]) * root.scale, 0) + xOffset - window.y = Math.max((windowData?.at[1] - monitorData?.reserved[1]) * root.scale, 0) + yOffset + window.x = Math.max((windowData?.at[0] - monitorData?.reserved[0] - monitorData?.x) * root.scale, 0) + xOffset + window.y = Math.max((windowData?.at[1] - monitorData?.reserved[1] - monitorData?.y) * root.scale, 0) + yOffset } } diff --git a/config/quickshell/modules/overview/OverviewWindow.qml b/config/quickshell/modules/overview/OverviewWindow.qml index 449a98c4..93ea06f9 100644 --- a/config/quickshell/modules/overview/OverviewWindow.qml +++ b/config/quickshell/modules/overview/OverviewWindow.qml @@ -18,8 +18,8 @@ Rectangle { // 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?.reserved[0] - monitorData?.x) * root.scale, 0) + xOffset + property real initY: Math.max((windowData?.at[1] - monitorData?.reserved[1] - monitorData?.y) * root.scale, 0) + yOffset property real xOffset: 0 property real yOffset: 0 |