diff --git a/Assets/settings-default.json b/Assets/settings-default.json index 017157ef..60096117 100644 --- a/Assets/settings-default.json +++ b/Assets/settings-default.json @@ -57,7 +57,6 @@ }, "general": { "avatarImage": "", - "dimDesktop": true, "showScreenCorners": false, "forceBlackScreenCorners": false, "scaleRatio": 1, diff --git a/Commons/Settings.qml b/Commons/Settings.qml index 34ca5988..201719b1 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -182,7 +182,6 @@ Singleton { // general property JsonObject general: JsonObject { property string avatarImage: "" - property bool dimDesktop: true property bool showScreenCorners: false property bool forceBlackScreenCorners: false property real scaleRatio: 1.0 diff --git a/Modules/ControlCenter/Cards/WeatherCard.qml b/Modules/ControlCenter/Cards/WeatherCard.qml index ea9f8ac4..e5cb7011 100644 --- a/Modules/ControlCenter/Cards/WeatherCard.qml +++ b/Modules/ControlCenter/Cards/WeatherCard.qml @@ -67,7 +67,7 @@ NBox { temp = Math.round(temp) return `${temp}°${suffix}` } - pointSize: showLocation ? Style.fontSizeXL : Style.fontSizeXL * 1.6 + pointSize: showLocation ? Style.fontSizeXL : Style.fontSizeXL * 1.6 font.weight: Style.fontWeightBold } diff --git a/Modules/Settings/Tabs/UserInterfaceTab.qml b/Modules/Settings/Tabs/UserInterfaceTab.qml index 690a7f3d..063714e5 100644 --- a/Modules/Settings/Tabs/UserInterfaceTab.qml +++ b/Modules/Settings/Tabs/UserInterfaceTab.qml @@ -19,13 +19,6 @@ ColumnLayout { description: I18n.tr("settings.user-interface.section.description") } - NToggle { - label: I18n.tr("settings.user-interface.dim-desktop.label") - description: I18n.tr("settings.user-interface.dim-desktop.description") - checked: Settings.data.general.dimDesktop - onToggled: checked => Settings.data.general.dimDesktop = checked - } - NToggle { label: I18n.tr("settings.user-interface.tooltips.label") description: I18n.tr("settings.user-interface.tooltips.description") diff --git a/Modules/SetupWizard/SetupCustomizeStep.qml b/Modules/SetupWizard/SetupCustomizeStep.qml index e5e0dcc1..f81ac3a8 100644 --- a/Modules/SetupWizard/SetupCustomizeStep.qml +++ b/Modules/SetupWizard/SetupCustomizeStep.qml @@ -11,11 +11,9 @@ ColumnLayout { property real selectedScaleRatio: 1.0 property string selectedBarPosition: "top" - property bool selectedDimDesktop: true signal scaleRatioChanged(real ratio) signal barPositionChanged(string position) - signal dimDesktopChanged(bool dim) spacing: Style.marginM @@ -214,32 +212,6 @@ ColumnLayout { anchors.centerIn: parent } } - - ColumnLayout { - Layout.fillWidth: true - spacing: 2 - NText { - text: I18n.tr("settings.user-interface.dim-desktop.label") - pointSize: Style.fontSizeL - font.weight: Style.fontWeightBold - color: Color.mOnSurface - } - NText { - text: I18n.tr("settings.user-interface.dim-desktop.description") - pointSize: Style.fontSizeS - color: Color.mOnSurfaceVariant - wrapMode: Text.WordWrap - Layout.fillWidth: true - } - } - - NToggle { - checked: selectedDimDesktop - onToggled: function (checked) { - selectedDimDesktop = checked - dimDesktopChanged(checked) - } - } } // Divider diff --git a/Modules/SetupWizard/SetupWizard.qml b/Modules/SetupWizard/SetupWizard.qml index 12be78d1..5be6df91 100644 --- a/Modules/SetupWizard/SetupWizard.qml +++ b/Modules/SetupWizard/SetupWizard.qml @@ -30,7 +30,6 @@ NPanel { property string selectedWallpaper: "" property real selectedScaleRatio: 1.0 property string selectedBarPosition: "top" - property bool selectedDimDesktop: true panelContent: Component { Item { @@ -199,7 +198,6 @@ NPanel { id: step2 selectedScaleRatio: root.selectedScaleRatio selectedBarPosition: root.selectedBarPosition - selectedDimDesktop: root.selectedDimDesktop onScaleRatioChanged: function (ratio) { root.selectedScaleRatio = ratio root.applyUISettings() @@ -208,10 +206,6 @@ NPanel { root.selectedBarPosition = position root.applyUISettings() } - onDimDesktopChanged: function (dim) { - root.selectedDimDesktop = dim - root.applyUISettings() - } } // Step 3: Dock Setup @@ -384,7 +378,6 @@ NPanel { Settings.data.general.scaleRatio = selectedScaleRatio Settings.data.bar.position = selectedBarPosition - Settings.data.general.dimDesktop = selectedDimDesktop Settings.data.setupCompleted = true Settings.saveImmediate() @@ -406,7 +399,6 @@ NPanel { function applyUISettings() { Settings.data.general.scaleRatio = selectedScaleRatio Settings.data.bar.position = selectedBarPosition - Settings.data.general.dimDesktop = selectedDimDesktop } Component.onCompleted: { @@ -415,7 +407,6 @@ NPanel { if (Settings && Settings.data) { selectedScaleRatio = Settings.data.general.scaleRatio selectedBarPosition = Settings.data.bar.position - selectedDimDesktop = Settings.data.general.dimDesktop selectedWallpaperDirectory = Settings.data.wallpaper.directory || Settings.defaultWallpapersDirectory } } diff --git a/Widgets/NPanel.qml b/Widgets/NPanel.qml index 332743a0..02f28860 100644 --- a/Widgets/NPanel.qml +++ b/Widgets/NPanel.qml @@ -169,8 +169,7 @@ Loader { } } - visible: true - color: Settings.data.general.dimDesktop ? Qt.alpha(Color.mShadow, dimmingOpacity) : Color.transparent + color: Color.transparent WlrLayershell.exclusionMode: ExclusionMode.Ignore WlrLayershell.namespace: "noctalia-panel"