diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index 39215cd8..db72c3e5 100644 --- a/modules/osd/Wrapper.qml +++ b/modules/osd/Wrapper.qml @@ -17,7 +17,6 @@ Item { 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 offsetScale: shouldBeActive ? 0 : 1 - property real sidebarOffset: !shouldBeActive && sidebarOrSessionVisible ? 16 : 0 property real volume property bool muted @@ -39,7 +38,7 @@ Item { } visible: offsetScale < 1 - anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale + anchors.rightMargin: (-implicitWidth - 5) * offsetScale implicitWidth: content.implicitWidth implicitHeight: content.implicitHeight @@ -50,13 +49,6 @@ Item { } } - Behavior on sidebarOffset { - Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial - } - } - Connections { function onMutedChanged(): void { root.show(); diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml index 32d6fea2..ab929c01 100644 --- a/modules/session/Wrapper.qml +++ b/modules/session/Wrapper.qml @@ -13,10 +13,9 @@ Item { readonly property bool shouldBeActive: visibilities.session && Config.session.enabled 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 - anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale + anchors.rightMargin: (-implicitWidth - 5) * offsetScale implicitWidth: content.implicitWidth 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 { id: content