The widget declared no indicator hint, so the mark fell back to 55% of the slot — sized for a lone icon, too short once the percentage doubles the block. Hint the glyph's painted width, the way the clock hints its label width. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
64 lines
1.8 KiB
QML
64 lines
1.8 KiB
QML
import QtQuick
|
|
import Quickshell
|
|
import qs.Commons
|
|
|
|
WidgetButton {
|
|
id: root
|
|
|
|
property Component iconComponent: null
|
|
property real slotSize: Style.bar.iconSlot
|
|
property real opticalSize: Style.bar.iconCanvas
|
|
property bool debugOpticalBounds: Quickshell.env("OMARCHY_DEBUG_BAR_ICONS") === "1"
|
|
readonly property real opticalCenterErrorX: glyph.visible ? glyph.paintedCenterX - opticalCanvas.width / 2 : 0
|
|
readonly property real glyphPaintedWidth: glyph.visible ? glyph.tightWidth : 0
|
|
readonly property real glyphBaselineY: glyph.visible ? glyph.baselineY : 0
|
|
readonly property int glyphFontSize: glyph.visible ? glyph.renderedFontSize : 0
|
|
|
|
labelVisible: false
|
|
hasVisualContent: text !== "" || iconComponent !== null
|
|
fontSize: Style.bar.iconFont
|
|
fixedWidth: vertical ? -1 : slotSize
|
|
fixedHeight: vertical ? slotSize : -1
|
|
|
|
Item {
|
|
id: opticalCanvas
|
|
anchors.centerIn: parent
|
|
width: root.opticalSize
|
|
height: root.opticalSize
|
|
|
|
OpticalGlyph {
|
|
id: glyph
|
|
anchors.fill: parent
|
|
visible: root.iconComponent === null
|
|
text: root.text
|
|
fontFamily: root.fontFamily
|
|
fontSize: root.fontSize
|
|
color: root.active && root.useActiveColor ? root.activeColor : root.foreground
|
|
rotation: root.textRotation
|
|
debugBounds: root.debugOpticalBounds
|
|
}
|
|
|
|
Loader {
|
|
anchors.fill: parent
|
|
visible: root.iconComponent !== null
|
|
sourceComponent: root.iconComponent
|
|
}
|
|
|
|
Rectangle {
|
|
visible: root.debugOpticalBounds && root.iconComponent !== null
|
|
anchors.fill: parent
|
|
color: "transparent"
|
|
border.width: 1
|
|
border.color: "#4488ff"
|
|
}
|
|
}
|
|
|
|
Rectangle {
|
|
visible: root.debugOpticalBounds
|
|
anchors.fill: parent
|
|
color: "transparent"
|
|
border.width: 1
|
|
border.color: "#ff4455"
|
|
}
|
|
}
|