Post refactoring fixes 1/??

2025-08-15 21:55:32 -04:00 · 2025-08-15 21:55:32 -04:00 · 4631239b92
commit 4631239b92
parent 605e3610d2
19 changed files with 8 additions and 11 deletions
--- a/Modules/SettingsPanel/Tabs/DisplayTab.qml
+++ b/Modules/SettingsPanel/Tabs/DisplayTab.qml
@ -0,0 +1,191 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Quickshell
+import qs.Commons
+import qs.Services
+import qs.Widgets
+
+Item {
+  property real scaling: 1
+  readonly property string tabIcon: "monitor"
+  readonly property string tabLabel: "Display"
+  readonly property int tabIndex: 5
+  Layout.fillWidth: true
+  Layout.fillHeight: true
+
+  // Helper functions to update arrays immutably
+  function addMonitor(list, name) {
+    const arr = (list || []).slice()
+    if (!arr.includes(name))
+      arr.push(name)
+    return arr
+  }
+  function removeMonitor(list, name) {
+    return (list || []).filter(function (n) {
+      return n !== name
+    })
+  }
+
+  ScrollView {
+    anchors.fill: parent
+    clip: true
+    ScrollBar.vertical.policy: ScrollBar.AsNeeded
+    ScrollBar.horizontal.policy: ScrollBar.AsNeeded
+    contentWidth: parent.width
+
+    ColumnLayout {
+      width: parent.width
+      ColumnLayout {
+        spacing: Style.marginLarge * scaling
+        Layout.margins: Style.marginLarge * scaling
+        Layout.fillWidth: true
+
+        NText {
+          text: "Per‑monitor configuration"
+          font.pointSize: Style.fontSizeXL * scaling
+          font.weight: Style.fontWeightBold
+          color: Colors.mOnSurface
+        }
+
+        NText {
+          text: "By default, bars and notifications are shown on all displays. Select one or more below to narrow your view."
+          font.pointSize: Style.fontSize * scaling
+          color: Colors.mOnSurfaceVariant
+        }
+
+        Repeater {
+          model: Quickshell.screens || []
+          delegate: Rectangle {
+            Layout.fillWidth: true
+            radius: Style.radiusMedium * scaling
+            color: Colors.mSurface
+            border.color: Colors.mOutline
+            border.width: Math.max(1, Style.borderThin * scaling)
+            implicitHeight: contentCol.implicitHeight + Style.marginXL * 2 * scaling
+
+            ColumnLayout {
+              id: contentCol
+              anchors.fill: parent
+              anchors.margins: Style.marginLarge * scaling
+              spacing: Style.marginTiniest * scaling
+
+              NText {
+                text: (modelData.name || "Unknown")
+                font.pointSize: Style.fontSizeLarge * scaling
+                font.weight: Style.fontWeightBold
+                color: Colors.mSecondary
+              }
+
+              NText {
+                text: `Resolution: ${modelData.width}x${modelData.height} - Position: (${modelData.x}, ${modelData.y})`
+                font.pointSize: Style.fontSizeSmall * scaling
+                color: Colors.mOnSurface
+              }
+
+              ColumnLayout {
+                spacing: Style.marginLarge * scaling
+
+                NToggle {
+                  label: "Bar"
+                  description: "Enable the top bar on this monitor"
+                  value: (Settings.data.bar.monitors || []).indexOf(modelData.name) !== -1
+                  onToggled: function (newValue) {
+                    if (newValue) {
+                      Settings.data.bar.monitors = addMonitor(Settings.data.bar.monitors, modelData.name)
+                    } else {
+                      Settings.data.bar.monitors = removeMonitor(Settings.data.bar.monitors, modelData.name)
+                    }
+                  }
+                }
+
+                NToggle {
+                  label: "Notifications"
+                  description: "Enable notifications on this monitor"
+                  value: (Settings.data.notifications.monitors || []).indexOf(modelData.name) !== -1
+                  onToggled: function (newValue) {
+                    if (newValue) {
+                      Settings.data.notifications.monitors = addMonitor(Settings.data.notifications.monitors,
+                                                                        modelData.name)
+                    } else {
+                      Settings.data.notifications.monitors = removeMonitor(Settings.data.notifications.monitors,
+                                                                           modelData.name)
+                    }
+                  }
+                }
+
+                NToggle {
+                  label: "Dock"
+                  description: "Enable the dock on this monitor"
+                  value: (Settings.data.dock.monitors || []).indexOf(modelData.name) !== -1
+                  onToggled: function (newValue) {
+                    if (newValue) {
+                      Settings.data.dock.monitors = addMonitor(Settings.data.dock.monitors, modelData.name)
+                    } else {
+                      Settings.data.dock.monitors = removeMonitor(Settings.data.dock.monitors, modelData.name)
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        NDivider {
+          Layout.fillWidth: true
+          Layout.topMargin: Style.marginLarge * 2 * scaling
+          Layout.bottomMargin: Style.marginLarge * scaling
+        }
+
+        // Brightness Section
+        ColumnLayout {
+          spacing: Style.marginSmall * scaling
+          Layout.fillWidth: true
+          Layout.topMargin: Style.marginSmall * scaling
+
+          NText {
+            text: "Brightness Step Size"
+            font.weight: Style.fontWeightBold
+            color: Colors.mOnSurface
+          }
+
+          NText {
+            text: "Adjust the step size for brightness changes (scroll wheel, ipc bind)"
+            font.pointSize: Style.fontSizeSmall * scaling
+            color: Colors.mOnSurface
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
+          }
+
+          RowLayout {
+            Layout.fillWidth: true
+            spacing: Style.marginMedium * scaling
+
+            NSlider {
+              Layout.fillWidth: true
+              from: 1
+              to: 50
+              value: Settings.data.brightness.brightnessStep
+              stepSize: 1
+              onPressedChanged: {
+                if (!pressed) {
+                  Settings.data.brightness.brightnessStep = value
+                }
+              }
+            }
+
+            NText {
+              text: Settings.data.brightness.brightnessStep + "%"
+              Layout.alignment: Qt.AlignVCenter
+              color: Colors.mOnSurface
+            }
+          }
+        }
+
+        Item {
+          Layout.fillHeight: true
+        }
+      }
+    }
+  }
+}