diff --git a/Drawers/Windows.qml b/Drawers/Windows.qml index d907024..4efedf9 100644 --- a/Drawers/Windows.qml +++ b/Drawers/Windows.qml @@ -170,7 +170,7 @@ Variants { PanelBg { id: dashBg - deformAmount: 0.1 + deformAmount: 0 panel: panels.dashboard radius: Appearance.rounding.normal } @@ -178,7 +178,7 @@ Variants { PanelBg { id: launcherBg - deformAmount: 0.1 + deformAmount: 0 panel: panels.launcher radius: Appearance.rounding.smallest + 5 } @@ -187,7 +187,7 @@ Variants { id: sidebarBg bottomLeftRadius: 0 - deformAmount: 0.03 + deformAmount: 0 exclude: panels.sidebar.offsetscale > 0.08 ? [] : [utilsBg] implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2 panel: panels.sidebar @@ -196,7 +196,7 @@ Variants { PanelBg { id: osdBg - deformAmount: 0.25 + deformAmount: 0 panel: panels.osd radius: 20 } @@ -210,7 +210,7 @@ Variants { PanelBg { id: utilsBg - deformAmount: panels.sidebar.visible ? 0.1 : 0.15 + deformAmount: panels.sidebar.visible ? 0 : 0 exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg] panel: panels.utilities topLeftRadius: 0 @@ -219,7 +219,7 @@ Variants { PanelBg { id: popoutBg - deformAmount: 0.15 + deformAmount: 0 implicitWidth: panels.popouts.width panel: panels.popoutsWrapper } @@ -227,7 +227,7 @@ Variants { PanelBg { id: resourcesBg - deformAmount: 0.15 + deformAmount: 0 panel: panels.resources radius: Appearance.rounding.normal } @@ -235,7 +235,7 @@ Variants { PanelBg { id: settingsBg - deformAmount: 0.05 + deformAmount: 0 panel: panels.settings radius: Appearance.rounding.large topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller @@ -245,7 +245,7 @@ Variants { PanelBg { id: dockBg - deformAmount: 0.1 + deformAmount: 0 panel: panels.dock radius: Appearance.rounding.normal } diff --git a/Modules/ClipWrapper.qml b/Modules/ClipWrapper.qml index d9265d0..6802d9a 100644 --- a/Modules/ClipWrapper.qml +++ b/Modules/ClipWrapper.qml @@ -26,8 +26,8 @@ Item { Behavior on offsetScale { Anim { - duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial + duration: MaterialEasing.expressiveEffectsTime + easing.bezierCurve: MaterialEasing.expressiveEffects } } Behavior on x { diff --git a/Modules/Content.qml b/Modules/Content.qml index 9ab78a2..e308a10 100644 --- a/Modules/Content.qml +++ b/Modules/Content.qml @@ -101,7 +101,9 @@ Item { readonly property bool shouldBeActive: root.popouts.currentName === name active: false - anchors.centerIn: parent + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + anchors.topMargin: 5 opacity: 0 scale: 0.8 diff --git a/Modules/Wrapper.qml b/Modules/Wrapper.qml index bb0ebe9..00e6f76 100644 --- a/Modules/Wrapper.qml +++ b/Modules/Wrapper.qml @@ -8,8 +8,8 @@ import qs.Config Item { id: root - property list animCurve: Appearance.anim.curves.expressiveDefaultSpatial - property int animLength: Appearance.anim.durations.expressiveDefaultSpatial + property list animCurve: MaterialEasing.expressiveEffects + property int animLength: MaterialEasing.expressiveEffectsTime readonly property alias content: content readonly property Item current: (content.item as Content)?.current ?? null property real currentCenter @@ -73,7 +73,9 @@ Item { Comp { id: content - anchors.centerIn: parent + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + // anchors.centerIn: parent shouldBeActive: root.hasCurrent && !root.detachedMode sourceComponent: Content {