Standardize shell UI theme tokens

shell/Ui/PanelActionButton.qml

@@ -13,13 +13,13 @@ import qs.Commons
 // here because action buttons are not cursor targets — the row they live
 // in is.
 //
-// Set `focusable: true` to make the button keyboard-tabbable with an
-// accent focus ring (Style.focusBorderColor / FillColor / Width). Use this
+// Set `focusable: true` to make the button keyboard-tabbable with the
+// shared hover-cursor/focus tokens. Use this
 // in form contexts (the bar settings widget cards) where Tab walks a list
 // of controls; leave it false for the right-edge actions on panel rows
 // where the row's CursorSurface owns the keyboard cursor.
 //
-// Set `hasCursor: true` to have the button render the same fill as a
+// Set `hasCursor: true` to have the button render the same hover state as
 // mouse hover — so a panel's keyboard cursor lands on it identically.
 // Use this when a PanelActionButton is itself the cursor target (rather
 // than living inside a CursorSurface row). Emits `hovered(bool)` on
@@ -34,10 +34,11 @@ Rectangle {
   property color panelBackground: Color.background
   property string fontFamily: Style.font.family
   property real fontSize: Style.font.icon
-  property real size: 22
+  property real size: Math.max(Style.space(22), fontSize + Style.spacing.sm * 2)
 
   property bool focusable: false
   property bool hasCursor: false
+  property bool bordered: false
 
   signal clicked()
   signal hovered(bool isHovered)
@@ -55,12 +56,20 @@ Rectangle {
   readonly property bool _hot: (mouse.containsMouse || root.hasCursor) && root.enabled
 
   color: _showFocusRing
-    ? Style.focusFillColor
+    ? Style.focusFillFor(hoverColor, hoverColor)
     : (_hot
-      ? Qt.rgba(hoverColor.r, hoverColor.g, hoverColor.b, 0.20)
+      ? Style.hoverFillFor(hoverColor, hoverColor)
       : "transparent")
-  border.width: _showFocusRing ? Style.focusBorderWidth : 0
-  border.color: _showFocusRing ? Style.focusBorderColor : "transparent"
+  border.width: _showFocusRing
+    ? Style.focusBorderWidth
+    : (_hot && bordered
+      ? Style.hoverBorderWidth
+      : (bordered ? Style.normalBorderWidth : 0))
+  border.color: _showFocusRing
+    ? Style.focusBorderFor(hoverColor, hoverColor)
+    : (_hot && bordered
+      ? Style.hoverBorderFor(hoverColor, hoverColor)
+      : Style.normalBorderFor(foreground, Color.accent))
 
   Behavior on color { ColorAnimation { duration: 60 } }