From 0c1ed01319bdd196ba6c69dfd44e0456006de5b1 Mon Sep 17 00:00:00 2001
From: LemmyCook <studio@quadbyte.net>
Date: Sun, 21 Sep 2025 17:06:15 -0400
Subject: [PATCH] DisplayTab: slight UI rework

---
 Modules/SettingsPanel/Tabs/DisplayTab.qml | 35 +++++++++++------------
 Widgets/NComboBox.qml                     |  4 ---
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Modules/SettingsPanel/Tabs/DisplayTab.qml b/Modules/SettingsPanel/Tabs/DisplayTab.qml
index 8d1c4c2f..79c66b2a 100644
--- a/Modules/SettingsPanel/Tabs/DisplayTab.qml
+++ b/Modules/SettingsPanel/Tabs/DisplayTab.qml
@@ -63,7 +63,7 @@ ColumnLayout {
       model: Quickshell.screens || []
       delegate: Rectangle {
         Layout.fillWidth: true
-        implicitHeight: contentCol.implicitHeight + Style.marginXL * 2 * scaling
+        implicitHeight: contentCol.implicitHeight + Style.marginL * 2 * scaling
         radius: Style.radiusM * scaling
         color: Color.mSurfaceVariant
         border.color: Color.mOutline
@@ -83,8 +83,9 @@ ColumnLayout {
 
         ColumnLayout {
           id: contentCol
-          anchors.fill: parent
-          anchors.margins: Style.marginL * scaling
+          width: parent.width - 2 * Style.marginL * scaling
+          x: Style.marginL * scaling
+          y: Style.marginL * scaling
           spacing: Style.marginXXS * scaling
 
           NLabel {
@@ -98,7 +99,7 @@ ColumnLayout {
             Layout.fillWidth: true
 
             RowLayout {
-              spacing: Style.marginM * scaling
+              spacing: Style.marginL * scaling
               Layout.fillWidth: true
 
               NText {
@@ -142,7 +143,7 @@ ColumnLayout {
 
             RowLayout {
               Layout.fillWidth: true
-              spacing: Style.marginM * scaling
+              spacing: Style.marginL * scaling
 
               NText {
                 text: "Brightness"
@@ -289,8 +290,6 @@ ColumnLayout {
         }
       }
 
-      Item {}
-
       NText {
         text: "Day"
         font.pointSize: Style.fontSizeM * scaling
@@ -322,21 +321,19 @@ ColumnLayout {
     visible: Settings.data.nightLight.enabled
   }
 
-  // Schedule settings
+  // Manual scheduling
   ColumnLayout {
-    spacing: Style.marginXS * scaling
+    spacing: Style.marginS * scaling
     visible: Settings.data.nightLight.enabled && !Settings.data.nightLight.autoSchedule && !Settings.data.nightLight.forced
 
+    NLabel {
+      label: "Manual scheduling"
+      description: "Set custom times for sunrise and sunset."
+    }
+
     RowLayout {
       Layout.fillWidth: false
-      spacing: Style.marginM * scaling
-
-      NLabel {
-        label: "Manual scheduling"
-      }
-
-      Item {// add a little more spacing
-      }
+      spacing: Style.marginS * scaling
 
       NText {
         text: "Sunrise time"
@@ -352,7 +349,8 @@ ColumnLayout {
         minimumWidth: 120 * scaling
       }
 
-      Item {// add a little more spacing
+      Item {
+        Layout.preferredWidth: 20 * scaling
       }
 
       NText {
@@ -360,6 +358,7 @@ ColumnLayout {
         font.pointSize: Style.fontSizeM * scaling
         color: Color.mOnSurfaceVariant
       }
+
       NComboBox {
         model: timeOptions
         currentKey: Settings.data.nightLight.manualSunset
diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index c0f096ac..9c9b5bd2 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -40,10 +40,6 @@ RowLayout {
     description: root.description
   }
 
-  Item {
-    Layout.fillWidth: true
-  }
-
   ComboBox {
     id: combo