diff options
| author | outfoxxed <outfoxxed@outfoxxed.me> | 2025-06-06 23:26:17 -0700 |
|---|---|---|
| committer | outfoxxed <outfoxxed@outfoxxed.me> | 2025-06-06 23:26:17 -0700 |
| commit | fc4eff7271e27fac29438cbad8cb865cec7b55a6 (patch) | |
| tree | ebbd42d1ba820a42063c49ecf598666d5833bb15 /modules/drawers | |
| parent | popouts: fix anim when not shown (diff) | |
| download | caelestia-shell-fc4eff7271e27fac29438cbad8cb865cec7b55a6.tar.gz caelestia-shell-fc4eff7271e27fac29438cbad8cb865cec7b55a6.tar.bz2 caelestia-shell-fc4eff7271e27fac29438cbad8cb865cec7b55a6.zip | |
popouts: fix multimonitor
Diffstat (limited to 'modules/drawers')
| -rw-r--r-- | modules/drawers/Drawers.qml | 2 | ||||
| -rw-r--r-- | modules/drawers/Interactions.qml | 8 | ||||
| -rw-r--r-- | modules/drawers/Panels.qml | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml index c897f4a..23520e1 100644 --- a/modules/drawers/Drawers.qml +++ b/modules/drawers/Drawers.qml @@ -117,6 +117,7 @@ Variants { Interactions { screen: scope.modelData + popouts: panels.popouts visibilities: visibilities panels: panels bar: bar @@ -134,6 +135,7 @@ Variants { id: bar screen: scope.modelData + popouts: panels.popouts } } } diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml index e66c24d..3ec522b 100644 --- a/modules/drawers/Interactions.qml +++ b/modules/drawers/Interactions.qml @@ -1,5 +1,6 @@ import "root:/services" import "root:/config" +import "root:/modules/bar/popouts" as BarPopouts import "root:/modules/osd" as Osd import Quickshell import QtQuick @@ -8,6 +9,7 @@ MouseArea { id: root required property ShellScreen screen + required property BarPopouts.Wrapper popouts required property PersistentProperties visibilities required property Panels panels required property Item bar @@ -38,7 +40,7 @@ MouseArea { visibilities.osd = false; osdHovered = false; visibilities.dashboard = false; - Popouts.hasCurrent = false; + popouts.hasCurrent = false; } } @@ -68,9 +70,9 @@ MouseArea { bar.checkPopout(y); else // Keep on hover - Popouts.hasCurrent = withinPanelHeight(popout, x, y); + popouts.hasCurrent = withinPanelHeight(popout, x, y); } else - Popouts.hasCurrent = false; + popouts.hasCurrent = false; } Osd.Interactions { diff --git a/modules/drawers/Panels.qml b/modules/drawers/Panels.qml index 0514b3e..6c6d892 100644 --- a/modules/drawers/Panels.qml +++ b/modules/drawers/Panels.qml @@ -83,7 +83,7 @@ Item { anchors.left: parent.left anchors.verticalCenter: parent.top anchors.verticalCenterOffset: { - const off = Popouts.currentCenter - BorderConfig.thickness; + const off = root.popouts.currentCenter - BorderConfig.thickness; const diff = root.height - Math.floor(off + implicitHeight / 2); if (diff < 0) return off + diff; |