Borders: optim/simplification of scaled borders

Modules/Settings/Bar/BarWidgetSettingsDialog.qml

@@ -44,7 +44,7 @@ Popup {
     color: Color.mSurface
     radius: Style.radiusL
     border.color: Color.mPrimary
-    border.width: Math.max(1, Style.borderM)
+    border.width: Style.borderM
   }
 
   contentItem: ColumnLayout {

Modules/Settings/Bar/WidgetSettings/ClockSettings.qml

@@ -181,7 +181,7 @@ ColumnLayout {
         color: Color.mSurfaceVariant
         radius: Style.radiusM
         border.color: Color.mSecondary
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
 
         Behavior on border.color {
           ColorAnimation {

Modules/Settings/Bar/WidgetSettings/TraySettings.qml

@@ -100,7 +100,7 @@ ColumnLayout {
         anchors.margins: Style.marginXS
         color: Color.transparent // Make background transparent
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         radius: Style.radiusS
         visible: model.rule !== undefined && model.rule !== "" // Only visible if rule exists
       }

Modules/Settings/SettingsPanel.qml

@@ -362,7 +362,7 @@ NPanel {
           Layout.alignment: Qt.AlignTop
           color: Color.mSurfaceVariant
           border.color: Color.mOutline
-          border.width: Math.max(1, Style.borderS)
+          border.width: Style.borderS
           radius: Style.radiusM
 
           MouseArea {
@@ -464,7 +464,7 @@ NPanel {
           radius: Style.radiusM
           color: Color.mSurfaceVariant
           border.color: Color.mOutline
-          border.width: Math.max(1, Style.borderS)
+          border.width: Style.borderS
 
           ColumnLayout {
             id: contentLayout

Modules/Settings/Tabs/AboutTab.qml

@@ -194,7 +194,7 @@ ColumnLayout {
             anchors.margins: Style.marginXS
             fallbackIcon: "person"
             borderColor: contributorArea.containsMouse ? Color.mOnTertiary : Color.mPrimary
-            borderWidth: Math.max(1, Style.borderM)
+            borderWidth: Style.borderM
 
             Behavior on borderColor {
               ColorAnimation {

Modules/Settings/Tabs/AudioTab.qml

@@ -297,7 +297,7 @@ ColumnLayout {
             // Visuals
             color: Qt.alpha(Color.mOnSurface, 0.125)
             border.color: Qt.alpha(Color.mOnSurface, Style.opacityLight)
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
 
             // Content
             RowLayout {

Modules/Settings/Tabs/ColorSchemeTab.qml

@@ -334,10 +334,10 @@ ColumnLayout {
 
           Layout.fillWidth: true
           Layout.alignment: Qt.AlignHCenter
-          height: 50
+          height: 50 * Style.uiScaleRatio
           radius: Style.radiusS
           color: root.getSchemeColor(schemeName, "mSurface")
-          border.width: Math.max(1, Style.borderL)
+          border.width: Style.borderL
           border.color: {
             if (Settings.data.colorSchemes.predefinedScheme === schemeName) {
               return Color.mSecondary
@@ -421,7 +421,7 @@ ColumnLayout {
             height: 20
             radius: width * 0.5
             color: Color.mSecondary
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
             border.color: Color.mOnSecondary
 
             NIcon {

Modules/Settings/Tabs/DisplayTab.qml

@@ -67,7 +67,7 @@ ColumnLayout {
         radius: Style.radiusM
         color: Color.mSurfaceVariant
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
 
         property var brightnessMonitor: BrightnessService.getMonitorForScreen(modelData)
 

Modules/Settings/Tabs/GeneralTab.qml

@@ -26,7 +26,7 @@ ColumnLayout {
       imagePath: Settings.preprocessPath(Settings.data.general.avatarImage)
       fallbackIcon: "person"
       borderColor: Color.mPrimary
-      borderWidth: Math.max(1, Style.borderM)
+      borderWidth: Style.borderM
       Layout.alignment: Qt.AlignTop
     }
 

Modules/Settings/Tabs/WallpaperTab.qml

@@ -59,7 +59,7 @@ ColumnLayout {
       radius: Style.radiusM
       color: Color.mSurfaceVariant
       border.color: Color.mOutline
-      border.width: Math.max(1, Style.borderS)
+      border.width: Style.borderS
       implicitHeight: contentCol.implicitHeight + Style.marginL * 2
 
       ColumnLayout {