diff --git a/Drawers/Panels.qml b/Drawers/Panels.qml index b9d230c..23c9f44 100644 --- a/Drawers/Panels.qml +++ b/Drawers/Panels.qml @@ -56,7 +56,6 @@ Item { anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale) anchors.verticalCenter: parent.verticalCenter clip: sidebar.visible - implicitHeight: osd.implicitHeight implicitWidth: osd.implicitWidth * (1 - osd.offsetScale) @@ -102,6 +101,7 @@ Item { anchors.right: parent.right anchors.top: parent.top panels: root + sidebarPanel: sidebar visibilities: root.visibilities } diff --git a/Drawers/Windows.qml b/Drawers/Windows.qml index b1364b5..6556bdd 100644 --- a/Drawers/Windows.qml +++ b/Drawers/Windows.qml @@ -221,7 +221,6 @@ Variants { PanelBg { id: popoutBg - // Extra height to prevent vertical movement deformation partially detaching panel from bar property real extraHeight: panels.popouts.isDetached ? 0 : 0.2 deformAmount: panels.popouts.isDetached ? 0.05 * Config.appearance.deform.scale : panels.popouts.hasCurrent ? 0.15 * Config.appearance.deform.scale : 0.1 * Config.appearance.deform.scale diff --git a/Modules/Notifications/Wrapper.qml b/Modules/Notifications/Wrapper.qml index 08918ef..e430a0c 100644 --- a/Modules/Notifications/Wrapper.qml +++ b/Modules/Notifications/Wrapper.qml @@ -6,10 +6,11 @@ Item { id: root required property Item panels + required property Item sidebarPanel required property var visibilities implicitHeight: content.implicitHeight - implicitWidth: Math.max(panels.sidebar.width, content.implicitWidth) + implicitWidth: content.implicitWidth visible: height > 0 states: State { diff --git a/Modules/Resources/Wrapper.qml b/Modules/Resources/Wrapper.qml index 16f7086..a60f898 100644 --- a/Modules/Resources/Wrapper.qml +++ b/Modules/Resources/Wrapper.qml @@ -9,16 +9,16 @@ Item { id: root readonly property real nonAnimHeight: state === "visible" ? (content.item?.nonAnimHeight ?? 0) : 0 + property real offsetScale: shouldBeActive ? 0 : 1 + readonly property bool shouldBeActive: root.visibilities.resources required property PersistentProperties visibilities - readonly property bool shouldBeActive: root.visibilities.resources - property real offsetScale: shouldBeActive ? 0 : 1 - - visible: offsetScale < 1 anchors.topMargin: (-implicitHeight - 5) * offsetScale + clip: true implicitHeight: content.implicitHeight implicitWidth: content.implicitWidth || 854 // Hard coded fallback for first open opacity: 1 - offsetScale + visible: offsetScale < 1 Behavior on offsetScale { Anim { @@ -30,11 +30,10 @@ Item { Loader { id: content + active: root.shouldBeActive || root.visible anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter - active: root.shouldBeActive || root.visible - sourceComponent: Content { padding: Appearance.padding.normal visibilities: root.visibilities