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