diff --git a/Drawers/Panels.qml b/Drawers/Panels.qml index 9f2f67a..8a587be 100644 --- a/Drawers/Panels.qml +++ b/Drawers/Panels.qml @@ -184,18 +184,14 @@ Item { Item { id: settingsWrapper + anchors.fill: parent clip: true - implicitHeight: settings.implicitHeight - implicitWidth: settings.implicitWidth - x: (root.width - settings.implicitWidth) / 2 - y: (settings.implicitHeight + (root.height - root.bar.implicitHeight - settings.implicitHeight) / 2) * (1 - settings.offsetScale) - settings.implicitHeight - 5 Settings.Wrapper { id: settings - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - // anchors.centerIn: parent + anchors.centerIn: parent + anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale panels: root screen: root.screen visibilities: root.visibilities diff --git a/Drawers/Regions.qml b/Drawers/Regions.qml index 5d74faf..ff7a655 100644 --- a/Drawers/Regions.qml +++ b/Drawers/Regions.qml @@ -60,7 +60,7 @@ Region { } R { - panel: root.panels.settingsWrapper + panel: root.panels.settings } R { diff --git a/Drawers/Windows.qml b/Drawers/Windows.qml index adc63bd..a714e67 100644 --- a/Drawers/Windows.qml +++ b/Drawers/Windows.qml @@ -306,15 +306,9 @@ CustomWindow { PanelBg { id: settingsBg - property real extraHeight: 0 - deformAmount: 0.03 - implicitHeight: panels.settings.height * (1 + extraHeight) - implicitWidth: panels.settings.width - panel: panels.settingsWrapper + panel: panels.settings radius: Appearance.rounding.large + Appearance.padding.normal - x: panels.settingsWrapper.x + panels.settings.x + root.borderThickness - y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight } PanelBg { @@ -422,7 +416,7 @@ CustomWindow { resources.transform: Matrix4x4 { matrix: resourcesBg.deformMatrix } - settingsWrapper.transform: Matrix4x4 { + settings.transform: Matrix4x4 { matrix: settingsBg.deformMatrix } sidebar.transform: Matrix4x4 { diff --git a/Modules/Settings/Common/WallpaperCropper.qml b/Modules/Settings/Common/WallpaperCropper.qml index 21c3b69..fe7f970 100644 --- a/Modules/Settings/Common/WallpaperCropper.qml +++ b/Modules/Settings/Common/WallpaperCropper.qml @@ -267,8 +267,6 @@ Item { function restoreFromData() { let data = Wallpapers.getCrop(wrapper.currentScreen.name); - console.log(data.x, data.y); - if (data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001)) { zoom = data.zoom > 0 ? data.zoom : 1.0; x = imageX + (data.x * scaledImg.paintedWidth); diff --git a/Modules/Settings/Wrapper.qml b/Modules/Settings/Wrapper.qml index 1895ae7..cc5a9fb 100644 --- a/Modules/Settings/Wrapper.qml +++ b/Modules/Settings/Wrapper.qml @@ -39,8 +39,6 @@ Item { sState.animatingContainer: content.opacity < 1 sState.currentPageIdx: ["wallpaper"][0] sState.screen: root.screen - - onClose: console.log("shouldclose") } } }