Merge branch 'main' of https://github.com/noctalia-dev/noctalia-shell

Modules/SettingsPanel/Bar/BarSectionEditor.qml

@@ -19,10 +19,8 @@ NBox {
   signal reorderWidget(string section, int fromIndex, int toIndex)
   signal updateWidgetSettings(string section, int index, var settings)
   signal dragPotentialStarted
-  // Emitted when a widget is pressed (potential drag start)
   signal dragPotentialEnded
 
-  // Emitted when interaction ends (drag or click)
   color: Color.mSurface
   Layout.fillWidth: true
   Layout.minimumHeight: {
@@ -147,12 +145,12 @@ NBox {
 
             Behavior on opacity {
               NumberAnimation {
-                duration: 150
+                duration: Style.animationFast
               }
             }
             Behavior on scale {
               NumberAnimation {
-                duration: 150
+                duration: Style.animationFast
               }
             }
 

Modules/SettingsPanel/Bar/WidgetSettings/CustomButtonSettings.qml

@@ -48,18 +48,16 @@ ColumnLayout {
   Popup {
     id: iconPicker
     modal: true
-    property real panelWidth: {
+    width: {
       var w = Math.round(Math.max(Screen.width * 0.35, 900) * scaling)
       w = Math.min(w, Screen.width - Style.marginL * 2)
       return w
     }
-    property real panelHeight: {
+    height: {
       var h = Math.round(Math.max(Screen.height * 0.65, 700) * scaling)
       h = Math.min(h, Screen.height - Style.barHeight * scaling - Style.marginL * 2)
       return h
     }
-    width: panelWidth
-    height: panelHeight
     anchors.centerIn: Overlay.overlay
     padding: Style.marginXL * scaling
 

Modules/SettingsPanel/SettingsPanel.qml

@@ -11,16 +11,11 @@ import qs.Widgets
 NPanel {
   id: root
 
-  panelWidth: {
-    var w = Math.round(Math.max(screen?.width * 0.4, 1000) * scaling)
-    w = Math.min(w, screen?.width - Style.marginL * 2)
-    return w
-  }
-  panelHeight: {
-    var h = Math.round(Math.max(screen?.height * 0.75, 800) * scaling)
-    h = Math.min(h, screen?.height - Style.barHeight * scaling - Style.marginL * 2)
-    return h
-  }
+  preferredWidth: 1000
+  preferredHeight: 1000
+  preferredWidthRatio: 0.4
+  preferredHeightRatio: 0.75
+
   panelAnchorHorizontalCenter: true
   panelAnchorVerticalCenter: true
 

Modules/SettingsPanel/Tabs/DisplayTab.qml

@@ -44,12 +44,11 @@ ColumnLayout {
       model: Quickshell.screens || []
       delegate: Rectangle {
         Layout.fillWidth: true
-        Layout.minimumWidth: 550 * scaling
+        implicitHeight: contentCol.implicitHeight + Style.marginXL * 2 * scaling
         radius: Style.radiusM * scaling
         color: Color.mSurface
         border.color: Color.mOutline
         border.width: Math.max(1, Style.borderS * scaling)
-        implicitHeight: contentCol.implicitHeight + Style.marginXL * 2 * scaling
 
         property real localScaling: ScalingService.getScreenScale(modelData)
         Connections {
@@ -177,7 +176,6 @@ ColumnLayout {
                   value: localScaling
                   onPressedChanged: ScalingService.setScreenScale(modelData, value)
                   Layout.fillWidth: true
-                  Layout.minimumWidth: 150 * scaling
                 }
 
                 NIconButton {