settings: removing unecessary wrappers

Modules/Panels/Settings/Bar/WidgetSettings/TaskbarSettings.qml

@@ -103,17 +103,10 @@ ColumnLayout {
     onToggled: checked => root.valueShowPinnedApps = checked
   }
 
-  ColumnLayout {
-    spacing: Style.marginXXS
-    Layout.fillWidth: true
-
-    NLabel {
-      label: I18n.tr("bar.taskbar.icon-scale-label")
-      description: I18n.tr("bar.taskbar.icon-scale-description")
-    }
-
   NValueSlider {
     Layout.fillWidth: true
+    label: I18n.tr("bar.taskbar.icon-scale-label")
+    description: I18n.tr("bar.taskbar.icon-scale-description")
     from: 0.5
     to: 1
     stepSize: 0.01
@@ -121,7 +114,6 @@ ColumnLayout {
     onMoved: value => root.valueIconScale = value
     text: Math.round(root.valueIconScale * 100) + "%"
   }
-  }
 
   NToggle {
     Layout.fillWidth: true
@@ -141,18 +133,11 @@ ColumnLayout {
     onToggled: checked => root.valueSmartWidth = checked
   }
 
-  ColumnLayout {
+  NValueSlider {
     visible: root.valueSmartWidth && !isVerticalBar
-    spacing: Style.marginXXS
     Layout.fillWidth: true
-
-    NLabel {
     label: I18n.tr("bar.taskbar.max-width-label")
     description: I18n.tr("bar.taskbar.max-width-description")
-    }
-
-    NValueSlider {
-      Layout.fillWidth: true
     from: 10
     to: 100
     stepSize: 5
@@ -160,7 +145,6 @@ ColumnLayout {
     onMoved: value => root.valueMaxTaskbarWidth = Math.round(value)
     text: Math.round(root.valueMaxTaskbarWidth) + "%"
   }
-  }
 
   NTextInput {
     id: titleWidthInput

Modules/Panels/Settings/Tabs/Bar/AppearanceSubTab.qml

@@ -108,13 +108,9 @@ ColumnLayout {
     onToggled: checked => Settings.data.bar.showCapsule = checked
   }
 
-  ColumnLayout {
-    Layout.fillWidth: true
-    spacing: Style.marginXXS
-    visible: Settings.data.bar.showCapsule
-
   NValueSlider {
     Layout.fillWidth: true
+    visible: Settings.data.bar.showCapsule
     label: I18n.tr("panels.bar.appearance-capsule-opacity-label")
     description: I18n.tr("panels.bar.appearance-capsule-opacity-description")
     from: 0
@@ -125,7 +121,6 @@ ColumnLayout {
     onMoved: value => Settings.data.bar.capsuleOpacity = value
     text: Math.floor(Settings.data.bar.capsuleOpacity * 100) + "%"
   }
-  }
 
   NToggle {
     Layout.fillWidth: true
@@ -162,9 +157,6 @@ ColumnLayout {
       Layout.fillWidth: true
       spacing: Style.marginL
 
-      ColumnLayout {
-        spacing: Style.marginXXS
-
       NValueSlider {
         Layout.fillWidth: true
         label: I18n.tr("panels.bar.appearance-margins-vertical")
@@ -176,10 +168,6 @@ ColumnLayout {
         onMoved: value => Settings.data.bar.marginVertical = value
         text: Settings.data.bar.marginVertical + "px"
       }
-      }
-
-      ColumnLayout {
-        spacing: Style.marginXXS
 
       NValueSlider {
         Layout.fillWidth: true
@@ -194,7 +182,6 @@ ColumnLayout {
       }
     }
   }
-  }
 
   NToggle {
     Layout.fillWidth: true

Modules/Panels/Settings/Tabs/LockScreenTab.qml

@@ -51,18 +51,11 @@ ColumnLayout {
     defaultValue: Settings.getDefaultValue("general.enableLockScreenCountdown")
   }
 
-  ColumnLayout {
+  NValueSlider {
     visible: Settings.data.general.showSessionButtonsOnLockScreen && Settings.data.general.enableLockScreenCountdown
-    spacing: Style.marginXXS
     Layout.fillWidth: true
-
-    NLabel {
     label: I18n.tr("panels.session-menu.countdown-duration-label")
     description: I18n.tr("panels.session-menu.countdown-duration-description")
-    }
-
-    NValueSlider {
-      Layout.fillWidth: true
     from: 1000
     to: 30000
     stepSize: 1000
@@ -72,4 +65,3 @@ ColumnLayout {
     defaultValue: Settings.getDefaultValue("general.lockScreenCountdownDuration")
   }
 }
-}

Modules/Panels/Settings/Tabs/Notifications/SoundSubTab.qml

@@ -53,12 +53,8 @@ ColumnLayout {
   }
 
   // Sound Volume
-  ColumnLayout {
-    enabled: SoundService.multimediaAvailable && (Settings.data.notifications?.sounds?.enabled ?? false)
-    spacing: Style.marginXXS
-    Layout.fillWidth: true
-
   NValueSlider {
+    enabled: SoundService.multimediaAvailable && (Settings.data.notifications?.sounds?.enabled ?? false)
     Layout.fillWidth: true
     label: I18n.tr("panels.notifications.sounds-volume-label")
     description: I18n.tr("panels.notifications.sounds-volume-description")
@@ -70,7 +66,6 @@ ColumnLayout {
     text: Math.round((Settings.data.notifications?.sounds?.volume ?? 0.5) * 100) + "%"
     defaultValue: Settings.getDefaultValue("notifications.sounds.volume")
   }
-  }
 
   // Separate Sounds Toggle
   NToggle {

Modules/Panels/Settings/Tabs/SessionMenu/GeneralSubTab.qml

@@ -105,18 +105,11 @@ ColumnLayout {
     defaultValue: Settings.getDefaultValue("sessionMenu.enableCountdown")
   }
 
-  ColumnLayout {
+  NValueSlider {
     visible: Settings.data.sessionMenu.enableCountdown
-    spacing: Style.marginXXS
     Layout.fillWidth: true
-
-    NLabel {
     label: I18n.tr("panels.session-menu.countdown-duration-label")
     description: I18n.tr("panels.session-menu.countdown-duration-description")
-    }
-
-    NValueSlider {
-      Layout.fillWidth: true
     from: 1000
     to: 30000
     stepSize: 1000
@@ -126,4 +119,3 @@ ColumnLayout {
     defaultValue: Settings.getDefaultValue("sessionMenu.countdownDuration")
   }
 }
-}