diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-09-20 21:47:13 +1000 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-09-20 21:47:13 +1000 |
| commit | 700a3504ca6463920f03964fed8b5331198dc706 (patch) | |
| tree | 22730765012afeb8fb0c992162a6b1e7a008f89c /modules | |
| parent | sidebar/notifs: fix minor bugs (diff) | |
| download | caelestia-shell-700a3504ca6463920f03964fed8b5331198dc706.tar.gz caelestia-shell-700a3504ca6463920f03964fed8b5331198dc706.tar.bz2 caelestia-shell-700a3504ca6463920f03964fed8b5331198dc706.zip | |
internal: make osd, session and utilities exclusive
Hide utilities when session open
Hide osd when utilities open
Prevents overlaps
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/osd/Wrapper.qml | 5 | ||||
| -rw-r--r-- | modules/utilities/Wrapper.qml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index 0e37edc..2519609 100644 --- a/modules/osd/Wrapper.qml +++ b/modules/osd/Wrapper.qml @@ -13,6 +13,7 @@ Item { required property var visibilities property bool hovered readonly property Brightness.Monitor monitor: Brightness.getMonitorForScreen(root.screen) + readonly property bool shouldBeActive: visibilities.osd && Config.osd.enabled && !(visibilities.utilities && Config.utilities.enabled) property real volume property bool muted @@ -39,7 +40,7 @@ Item { states: State { name: "visible" - when: root.visibilities.osd && Config.osd.enabled + when: root.shouldBeActive PropertyChanges { root.implicitWidth: content.implicitWidth @@ -118,7 +119,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - Component.onCompleted: active = Qt.binding(() => (root.visibilities.osd && Config.osd.enabled) || root.visible) + Component.onCompleted: active = Qt.binding(() => root.shouldBeActive || root.visible) sourceComponent: Content { monitor: root.monitor diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml index a3ba53d..040a928 100644 --- a/modules/utilities/Wrapper.qml +++ b/modules/utilities/Wrapper.qml @@ -18,7 +18,7 @@ Item { reloadableId: "utilities" } - readonly property bool shouldBeActive: visibilities.sidebar || (visibilities.utilities && Config.utilities.enabled) + readonly property bool shouldBeActive: visibilities.sidebar || (visibilities.utilities && Config.utilities.enabled && !(visibilities.session && Config.session.enabled)) visible: height > 0 implicitHeight: 0 |