fix settings background desync
This commit is contained in:
+17
-6
@@ -34,6 +34,7 @@ Item {
|
||||
readonly property alias resourcesWrapper: resourcesWrapper
|
||||
required property ShellScreen screen
|
||||
readonly property alias settings: settings
|
||||
readonly property alias settingsWrapper: settingsWrapper
|
||||
readonly property alias sidebar: sidebar
|
||||
readonly property alias toasts: toasts
|
||||
readonly property alias utilities: utilities
|
||||
@@ -176,15 +177,25 @@ Item {
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
|
||||
Settings.Wrapper {
|
||||
id: settings
|
||||
Item {
|
||||
id: settingsWrapper
|
||||
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
// anchors.centerIn: parent
|
||||
panels: root
|
||||
screen: root.screen
|
||||
visibilities: root.visibilities
|
||||
clip: true
|
||||
implicitHeight: settings.implicitHeight * (1 - settings.offsetScale)
|
||||
implicitWidth: settings.implicitWidth
|
||||
|
||||
Settings.Wrapper {
|
||||
id: settings
|
||||
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
// anchors.centerIn: parent
|
||||
panels: root
|
||||
screen: root.screen
|
||||
visibilities: root.visibilities
|
||||
}
|
||||
}
|
||||
|
||||
Dock.Wrapper {
|
||||
|
||||
@@ -272,6 +272,8 @@ Variants {
|
||||
radius: Appearance.rounding.large
|
||||
topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
|
||||
topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
|
||||
x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
|
||||
y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight
|
||||
}
|
||||
|
||||
PanelBg {
|
||||
|
||||
@@ -7,45 +7,56 @@ import qs.Helpers
|
||||
Item {
|
||||
id: root
|
||||
|
||||
property real offsetScale: shouldBeActive ? 0 : 1
|
||||
required property var panels
|
||||
required property ShellScreen screen
|
||||
readonly property bool shouldBeActive: visibilities.settings
|
||||
required property PersistentProperties visibilities
|
||||
|
||||
implicitHeight: 0
|
||||
anchors.topMargin: (-implicitHeight - 5) * offsetScale
|
||||
implicitHeight: content.implicitHeight
|
||||
implicitWidth: content.implicitWidth
|
||||
visible: height > 0
|
||||
opacity: 1 - offsetScale
|
||||
visible: offsetScale < 1
|
||||
|
||||
states: State {
|
||||
name: "visible"
|
||||
when: root.visibilities.settings
|
||||
|
||||
PropertyChanges {
|
||||
root.implicitHeight: content.implicitHeight
|
||||
Behavior on offsetScale {
|
||||
Anim {
|
||||
duration: Appearance.anim.durations.expressiveDefaultSpatial
|
||||
easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
|
||||
}
|
||||
}
|
||||
transitions: [
|
||||
Transition {
|
||||
from: ""
|
||||
to: "visible"
|
||||
|
||||
Anim {
|
||||
duration: MaterialEasing.expressiveEffectsTime
|
||||
easing.bezierCurve: MaterialEasing.expressiveEffects
|
||||
property: "implicitHeight"
|
||||
target: root
|
||||
}
|
||||
},
|
||||
Transition {
|
||||
from: "visible"
|
||||
to: ""
|
||||
|
||||
Anim {
|
||||
easing.bezierCurve: MaterialEasing.expressiveEffects
|
||||
property: "implicitHeight"
|
||||
target: root
|
||||
}
|
||||
}
|
||||
]
|
||||
// states: State {
|
||||
// name: "visible"
|
||||
// when: root.visibilities.settings
|
||||
//
|
||||
// PropertyChanges {
|
||||
// root.implicitHeight: content.implicitHeight
|
||||
// }
|
||||
// }
|
||||
// transitions: [
|
||||
// Transition {
|
||||
// from: ""
|
||||
// to: "visible"
|
||||
//
|
||||
// Anim {
|
||||
// duration: MaterialEasing.expressiveEffectsTime
|
||||
// easing.bezierCurve: MaterialEasing.expressiveEffects
|
||||
// property: "implicitHeight"
|
||||
// target: root
|
||||
// }
|
||||
// },
|
||||
// Transition {
|
||||
// from: "visible"
|
||||
// to: ""
|
||||
//
|
||||
// Anim {
|
||||
// easing.bezierCurve: MaterialEasing.expressiveEffects
|
||||
// property: "implicitHeight"
|
||||
// target: root
|
||||
// }
|
||||
// }
|
||||
// ]
|
||||
|
||||
CustomClippingRect {
|
||||
anchors.fill: parent
|
||||
|
||||
Reference in New Issue
Block a user