From e40ec8c6b092ef4c4f66e65b30914f04ae709b19 Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Mon, 13 Oct 2025 08:32:49 -0400 Subject: [PATCH] Settings: reordering bar and dock tabs. --- Modules/Settings/Tabs/BarTab.qml | 40 +++++++++++++++---------------- Modules/Settings/Tabs/DockTab.qml | 16 ++++--------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/Modules/Settings/Tabs/BarTab.qml b/Modules/Settings/Tabs/BarTab.qml index b98e3100..47207f0d 100644 --- a/Modules/Settings/Tabs/BarTab.qml +++ b/Modules/Settings/Tabs/BarTab.qml @@ -87,26 +87,6 @@ ColumnLayout { onSelected: key => Settings.data.bar.density = key } - ColumnLayout { - spacing: Style.marginXXS - Layout.fillWidth: true - - NLabel { - label: I18n.tr("settings.bar.appearance.background-opacity.label") - description: I18n.tr("settings.bar.appearance.background-opacity.description") - } - - NValueSlider { - Layout.fillWidth: true - from: 0 - to: 1 - stepSize: 0.01 - value: Settings.data.bar.backgroundOpacity - onMoved: value => Settings.data.bar.backgroundOpacity = value - text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%" - } - } - NToggle { Layout.fillWidth: true label: I18n.tr("settings.bar.appearance.show-capsule.label") @@ -180,6 +160,26 @@ ColumnLayout { } } + ColumnLayout { + spacing: Style.marginXXS + Layout.fillWidth: true + + NLabel { + label: I18n.tr("settings.bar.appearance.background-opacity.label") + description: I18n.tr("settings.bar.appearance.background-opacity.description") + } + + NValueSlider { + Layout.fillWidth: true + from: 0 + to: 1 + stepSize: 0.01 + value: Settings.data.bar.backgroundOpacity + onMoved: value => Settings.data.bar.backgroundOpacity = value + text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%" + } + } + NDivider { Layout.fillWidth: true Layout.topMargin: Style.marginXL diff --git a/Modules/Settings/Tabs/DockTab.qml b/Modules/Settings/Tabs/DockTab.qml index ce40bcbb..6856a48c 100644 --- a/Modules/Settings/Tabs/DockTab.qml +++ b/Modules/Settings/Tabs/DockTab.qml @@ -87,10 +87,11 @@ ColumnLayout { } } - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginXL - Layout.bottomMargin: Style.marginXL + NToggle { + label: I18n.tr("settings.dock.monitors.only-same-output.label") + description: I18n.tr("settings.dock.monitors.only-same-output.description") + checked: Settings.data.dock.onlySameOutput + onToggled: checked => Settings.data.dock.onlySameOutput = checked } NToggle { @@ -139,13 +140,6 @@ ColumnLayout { } } - NToggle { - label: I18n.tr("settings.dock.monitors.only-same-output.label") - description: I18n.tr("settings.dock.monitors.only-same-output.description") - checked: Settings.data.dock.onlySameOutput - onToggled: checked => Settings.data.dock.onlySameOutput = checked - } - NDivider { Layout.fillWidth: true Layout.topMargin: Style.marginXL