fix: remove osd and session wrapper hacks

The panels are ignored if they are closed, so they don't produce bulges.
This does remove the sink effect on overshoot, but that didn't work
anyways. (also that change was part of the previous commit)
This commit is contained in:
2 * r + 2 * t 2026-03-27 19:03:55 +11:00
parent f2d023b131
commit 14437cc1ed
2 changed files with 2 additions and 18 deletions

View file

@ -17,7 +17,6 @@ Item {
readonly property Brightness.Monitor monitor: Brightness.getMonitorForScreen(root.screen) readonly property Brightness.Monitor monitor: Brightness.getMonitorForScreen(root.screen)
readonly property bool shouldBeActive: visibilities.osd && Config.osd.enabled && !(visibilities.utilities && Config.utilities.enabled) readonly property bool shouldBeActive: visibilities.osd && Config.osd.enabled && !(visibilities.utilities && Config.utilities.enabled)
property real offsetScale: shouldBeActive ? 0 : 1 property real offsetScale: shouldBeActive ? 0 : 1
property real sidebarOffset: !shouldBeActive && sidebarOrSessionVisible ? 16 : 0
property real volume property real volume
property bool muted property bool muted
@ -39,7 +38,7 @@ Item {
} }
visible: offsetScale < 1 visible: offsetScale < 1
anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale anchors.rightMargin: (-implicitWidth - 5) * offsetScale
implicitWidth: content.implicitWidth implicitWidth: content.implicitWidth
implicitHeight: content.implicitHeight implicitHeight: content.implicitHeight
@ -50,13 +49,6 @@ Item {
} }
} }
Behavior on sidebarOffset {
Anim {
duration: Appearance.anim.durations.expressiveDefaultSpatial
easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
}
}
Connections { Connections {
function onMutedChanged(): void { function onMutedChanged(): void {
root.show(); root.show();

View file

@ -13,10 +13,9 @@ Item {
readonly property bool shouldBeActive: visibilities.session && Config.session.enabled readonly property bool shouldBeActive: visibilities.session && Config.session.enabled
property real offsetScale: shouldBeActive ? 0 : 1 property real offsetScale: shouldBeActive ? 0 : 1
property real sidebarOffset: !shouldBeActive && sidebarVisible ? 14 : 0 // TODO: there is clearly something wrong with the rect to rect edge sink
visible: offsetScale < 1 visible: offsetScale < 1
anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale anchors.rightMargin: (-implicitWidth - 5) * offsetScale
implicitWidth: content.implicitWidth implicitWidth: content.implicitWidth
implicitHeight: content.implicitHeight || 510 // Hard coded fallback for first open implicitHeight: content.implicitHeight || 510 // Hard coded fallback for first open
@ -27,13 +26,6 @@ Item {
} }
} }
Behavior on sidebarOffset {
Anim {
duration: Appearance.anim.durations.expressiveDefaultSpatial
easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
}
}
Loader { Loader {
id: content id: content