Normalize bar icon size and alignment

shell/Ui/OpticalGlyph.qml

@@ -8,14 +8,22 @@ Item {
   property string text: ""
   property string fontFamily: Style.font.family
   property real fontSize: Style.font.body
+  property real paintedSize: 0
   property color color: Commons.Color.foreground
   property bool debugBounds: false
 
   readonly property int renderedFontSize: Math.max(1, Math.round(fontSize))
   readonly property real tightWidth: Math.max(1, glyphMetrics.tightBoundingRect.width)
+  readonly property real tightHeight: Math.max(1, glyphMetrics.tightBoundingRect.height)
+  readonly property real paintedScale: paintedSize > 0
+    ? Math.min(paintedSize, width, height) / Math.max(tightWidth, tightHeight)
+    : 1
+  readonly property real paintedWidth: tightWidth * paintedScale
+  readonly property real paintedHeight: tightHeight * paintedScale
   readonly property real horizontalCorrection: glyph.implicitWidth / 2 - (glyphMetrics.tightBoundingRect.x + tightWidth / 2)
-  readonly property real paintedCenterX: glyph.x + glyphMetrics.tightBoundingRect.x + tightWidth / 2
-  readonly property real baselineY: glyph.y + glyph.baselineOffset
+  readonly property real paintedCenterX: glyph.x + (glyphMetrics.tightBoundingRect.x + tightWidth / 2) * paintedScale
+  readonly property real paintedCenterY: glyph.y + (glyph.baselineOffset + glyphMetrics.tightBoundingRect.y + tightHeight / 2) * paintedScale
+  readonly property real baselineY: glyph.y + glyph.baselineOffset * paintedScale
 
   TextMetrics {
     id: glyphMetrics
@@ -27,17 +35,18 @@ Item {
   Text {
     id: glyph
     textFormat: Text.PlainText
-    // Keep the shared line box and baseline intact. Correcting only the
-    // horizontal painted bounds avoids per-glyph vertical drift.
-    // The correction is fractional, so x is set exactly: centerIn would snap it
-    // to a whole pixel and undo it. y still snaps, keeping the baseline crisp.
-    x: (root.width - width) / 2 + root.horizontalCorrection
-    y: Math.round((root.height - height) / 2)
+    // Bar icons fit their painted bounds. Text labels retain their line box.
+    x: root.width / 2 - (glyphMetrics.tightBoundingRect.x + root.tightWidth / 2) * root.paintedScale
+    y: root.paintedSize > 0
+      ? root.height / 2 - (baselineOffset + glyphMetrics.tightBoundingRect.y + root.tightHeight / 2) * root.paintedScale
+      : Math.round((root.height - height) / 2)
     text: root.text
     color: root.color
     font.family: root.fontFamily
     font.pixelSize: root.renderedFontSize
-    renderType: Text.NativeRendering
+    transformOrigin: Item.TopLeft
+    scale: root.paintedScale
+    renderType: root.paintedSize > 0 ? Text.CurveRendering : Text.NativeRendering
   }
 
   Rectangle {