:Merge tag 'v2.11.0'

Commons/Settings.qml

@@ -121,6 +121,12 @@ Singleton {
         }
       }
     }
+
+    // Upgrade the density of the bar so the look stay the same for people who upgrade.
+    if (adapter.settingsVersion == 2) {
+      adapter.bar.density = "comfortable"
+      adapter.settingsVersion++
+    }
   }
 
   // -----------------------------------------------------
@@ -259,13 +265,15 @@ Singleton {
     JsonAdapter {
       id: adapter
 
-      property int settingsVersion: 2
+      property int settingsVersion: 3
 
       // bar
       property JsonObject bar: JsonObject {
         property string position: "top" // "top", "bottom", "left", or "right"
         property real backgroundOpacity: 1.0
         property list<string> monitors: []
+        property string density: "default" // "compact", "default", "comfortable"
+        property bool showCapsule: true
 
         // Floating bar settings
         property bool floating: false
@@ -320,7 +328,7 @@ Singleton {
       // general
       property JsonObject general: JsonObject {
         property string avatarImage: defaultAvatar
-        property bool dimDesktop: false
+        property bool dimDesktop: true
         property bool showScreenCorners: false
         property bool forceBlackScreenCorners: false
         property real radiusRatio: 1.0

Commons/Style.qml

@@ -65,14 +65,36 @@ Singleton {
   property int animationSlow: Math.round(450 / Settings.data.general.animationSpeed)
   property int animationSlowest: Math.round(750 / Settings.data.general.animationSpeed)
 
-  // Dimensions
-  property int barHeight: (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? 39 : 37
-  property int capsuleHeight: (barHeight * 0.73)
-  property int baseWidgetSize: (barHeight * 0.9)
-  property int sliderWidth: 200
-
   // Delays
   property int tooltipDelay: 300
   property int tooltipDelayLong: 1200
   property int pillDelay: 500
+
+  // Settings widgets base size
+  property real baseWidgetSize: 33
+  property real sliderWidth: 200
+
+  // Bar Dimensions
+  property real barHeight: {
+    if (Settings.data.bar.density === "compact") {
+      return (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? 27 : 25
+    }
+    if (Settings.data.bar.density === "default") {
+      return (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? 33 : 31
+    }
+    if (Settings.data.bar.density === "comfortable") {
+      return (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? 39 : 37
+    }
+  }
+  property real capsuleHeight: {
+    if (Settings.data.bar.density === "compact") {
+      return barHeight * 0.85
+    }
+    if (Settings.data.bar.density === "default") {
+      return barHeight * 0.82
+    }
+    if (Settings.data.bar.density === "comfortable") {
+      return barHeight * 0.73
+    }
+  }
 }