Revert "Provide better scaling"

This reverts commit 3ea8d9ffb7.

shell/plugins/bar/widgets/Tray.qml

@@ -18,9 +18,7 @@ BarWidget {
   readonly property var drawerItems: bucket("drawer")
   readonly property var allItems: bucket("all")
   readonly property int drawerCount: drawerItems.length
-  readonly property int trayItemExtent: Style.space(16)
-  readonly property int trayItemGap: Style.space(6)
-  readonly property int drawerExtent: drawerCount > 0 ? drawerCount * trayItemExtent + (drawerCount - 1) * trayItemGap : 0
+  readonly property int drawerExtent: drawerCount > 0 ? drawerCount * 16 + (drawerCount - 1) * 17 : 0
   // Match Waybar's group/tray-expander drawer transition-duration.
   readonly property int animationDuration: 600
   property real revealProgress: expanded ? 1 : 0
@@ -156,7 +154,7 @@ BarWidget {
           height: implicitHeight
           x: root.drawerExtent - root.revealExtent
           text: "\uf053"
-          horizontalMargin: 5
+          horizontalMargin: 9
           verticalPadding: 6
           onPressed: function(button) {
             if (button === Qt.RightButton) root.managePopupOpen = !root.managePopupOpen
@@ -175,7 +173,7 @@ BarWidget {
             id: trayIcons
             x: root.drawerExtent - root.revealExtent
             anchors.verticalCenter: parent.verticalCenter
-            spacing: root.trayItemGap
+            spacing: Style.space(17)
             layer.enabled: true
 
             Repeater {
@@ -190,8 +188,8 @@ BarWidget {
         id: pinnedRow
         x: drawerArea.x + horizontalTrayRoot.drawerBlockWidth
         anchors.verticalCenter: parent.verticalCenter
-        spacing: root.trayItemGap
-        leftPadding: root.pinnedItems.length > 0 && root.allItems.length > 0 ? root.trayItemGap : 0
+        spacing: Style.space(17)
+        leftPadding: root.pinnedItems.length > 0 && root.allItems.length > 0 ? Style.space(6) : 0
         Repeater {
           model: root.pinnedItems
           TrayItem {}
@@ -241,7 +239,7 @@ BarWidget {
           y: root.drawerExtent - root.revealExtent
           text: "\uf053"
           textRotation: 90
-          horizontalMargin: 5
+          horizontalMargin: 9
           verticalPadding: 6
           onPressed: function(button) {
             if (button === Qt.RightButton) root.managePopupOpen = !root.managePopupOpen
@@ -260,7 +258,7 @@ BarWidget {
             id: trayIcons
             y: root.drawerExtent - root.revealExtent
             anchors.horizontalCenter: parent.horizontalCenter
-            spacing: root.trayItemGap
+            spacing: Style.space(17)
             layer.enabled: true
 
             Repeater {
@@ -275,8 +273,8 @@ BarWidget {
         id: pinnedCol
         y: drawerArea.y + verticalTrayRoot.drawerBlockHeight
         anchors.horizontalCenter: parent.horizontalCenter
-        spacing: root.trayItemGap
-        topPadding: root.pinnedItems.length > 0 && root.allItems.length > 0 ? root.trayItemGap : 0
+        spacing: Style.space(17)
+        topPadding: root.pinnedItems.length > 0 && root.allItems.length > 0 ? Style.space(6) : 0
         Repeater {
           model: root.pinnedItems
           TrayItem {}
@@ -409,14 +407,14 @@ BarWidget {
     required property var modelData
 
     visible: modelData.status !== Status.Passive
-    implicitWidth: visible ? root.trayItemExtent : 0
-    implicitHeight: visible ? root.trayItemExtent : 0
+    implicitWidth: visible ? 16 : 0
+    implicitHeight: visible ? 16 : 0
 
     IconImage {
       anchors.centerIn: parent
-      implicitSize: Style.space(12)
-      width: Style.space(12)
-      height: Style.space(12)
+      implicitSize: 12
+      width: 12
+      height: 12
       source: root.trayIconSource(trayItemRoot.modelData.icon)
     }
 

shell/plugins/bar/widgets/Workspaces.qml

@@ -60,7 +60,7 @@ BarWidget {
         opacity: occupied || focused ? 1 : 0.5
         horizontalMargin: 6
         verticalPadding: 6
-        fixedWidth: root.vertical ? root.barSize : Style.space(22)
+        fixedWidth: root.vertical ? root.barSize : 22
         fixedHeight: root.barSize
         onPressed: function() { root.focusWorkspace(modelData) }
       }

shell/plugins/dev-gallery/GalleryPanel.qml

@@ -445,12 +445,11 @@ Item {
             }
             Text {
               text: "Style.font.* is the shell-wide type scale. Themes ship a single "
-                + "[font] base-size in shell.toml; every token derives from it via a "
-                + "fixed multiplier, so changing base-size rescales the whole shell "
-                + "proportionally. There is no upper clamp. Themes can also pin "
-                + "individual tokens (caption, heading, display, etc.) for stylistic "
-                + "emphasis. The family follows the fontconfig monospace alias \u2014 "
-                + "set it with `omarchy font set <name>`."
+                + "[font] base-size in shell.toml (clamped 11..13); every token derives from "
+                + "it via a fixed multiplier, so changing base-size rescales the whole shell "
+                + "proportionally. Themes can also pin individual tokens (caption, heading, "
+                + "display, etc.) for stylistic emphasis. The family follows the fontconfig "
+                + "monospace alias \u2014 set it with `omarchy font set <name>`."
               color: Qt.darker(root.foreground, 1.5)
               font.family: root.fontFamily
               font.pixelSize: Style.font.bodySmall

shell/plugins/panels/Audio.qml

@@ -625,7 +625,6 @@ Panel {
     bar: root.bar
     text: root.outputIcon()
     fontSize: Style.font.body
-    horizontalMargin: 5
     onPressed: function(b) {
       if (b === Qt.RightButton) root.toggleOutputMute()
       else root.toggle()

shell/plugins/panels/Bluetooth.qml

@@ -459,7 +459,6 @@ Panel {
     anchors.fill: parent
     bar: root.bar
     text: root.icon
-    horizontalMargin: 5
     onPressed: function(b) {
       if (b === Qt.RightButton) root.toggleBluetooth()
       else if (b === Qt.MiddleButton) root.bar.run("omarchy-launch-bluetooth")

shell/plugins/panels/Monitor.qml

@@ -357,7 +357,6 @@ Panel {
     bar: root.bar
     text: root.displays.length > 1 ? "󰍺" : "󰍹"
     fontSize: Style.font.subtitle
-    horizontalMargin: 5
     onPressed: function(b) { root.toggle() }
     onWheelMoved: function(delta) {
       if (root.brightnessAvailable) root.setBrightness(root.brightnessPercent + (delta > 0 ? 5 : -5))

shell/plugins/panels/Network.qml

@@ -644,7 +644,8 @@ Panel {
     anchors.fill: parent
     bar: root.bar
     text: root.icon
-    horizontalMargin: 5
+    horizontalMargin: 8.5
+    rightExtraMargin: 2
 
     onPressed: function(b) {
       if (root.opened) root.close()

shell/plugins/panels/Power.qml

@@ -259,7 +259,8 @@ Panel {
     anchors.fill: parent
     bar: root.bar
     text: root.batteryIcon()
-    horizontalMargin: 5
+    horizontalMargin: 8.5
+    rightExtraMargin: 2
     active: UPower.displayDevice && UPower.displayDevice.percentage <= 0.2 && UPower.onBattery
     tooltipText: ""
     onPressed: function(b) { root.toggle() }