mirror of
https://github.com/arthur-pbty/arthur-os.git
synced 2026-08-07 12:40:55 +02:00
Ryan Hughes
648bc54db1
Themes now drive typography the same way they drive colors: one [font] base-size in shell.toml is the rem root, and every Style.font.<token> (caption, bodySmall, body, subtitle, title, heading, display, displayLarge, iconSmall, icon, iconLarge) derives from it via a fixed multiplier. Themes can also pin individual tokens for stylistic emphasis. base-size is clamped 11..13 until row-height tokens exist. Bar dimensions move to the same singleton: [bar] size-horizontal / size-vertical replace the hardcoded 26/28 in Bar.qml, exposed as Style.bar.sizeHorizontal / sizeVertical. Style.qml also resolves the fontconfig 'monospace' alias via fc-match and exposes Style.font.resolvedFamily so panels can display the concrete family. Watches ~/.config/fontconfig/fonts.conf so it tracks 'omarchy font set <name>'. The qs.Ui kit (PillButton, Dropdown, Toggle, TextField, etc.) and every first-party plugin (bar widgets, settings, menu, clipboard, emoji, polkit, notifications, osd, image-picker, dev-gallery) now bind to Style.font.* instead of pixel literals. Only three deliberate display-scale outliers remain: the notification empty-state glyph and the weather flyout's hero temperature pair, all commented. Background plugin's applyTheme IPC fast-path also pushes shell.toml to Style so theme swaps update typography and bar size without waiting for inotify debounce. Dev gallery (omarchy dev ui-preview) now ships a Typography section that renders the full scale and theme tokens live, and its summon command is fixed (omarchy-shell-ipc -> omarchy-shell).
71 lines
2.3 KiB
QML
71 lines
2.3 KiB
QML
import QtQuick
|
|
import qs.Commons
|
|
|
|
Item {
|
|
id: root
|
|
|
|
property var bar: null
|
|
property string text: ""
|
|
property string fontFamily: bar ? bar.fontFamily : Style.font.family
|
|
property real fontSize: Style.font.body
|
|
property color foreground: bar ? bar.foreground : Color.foreground
|
|
property color activeColor: bar ? bar.urgent : Color.urgent
|
|
property bool active: false
|
|
property real horizontalMargin: 8.5
|
|
property real rightExtraMargin: 0
|
|
property real verticalPadding: 6
|
|
property real fixedWidth: -1
|
|
property real fixedHeight: -1
|
|
property real textRotation: 0
|
|
property bool keepSpace: false
|
|
property string tooltipText: ""
|
|
|
|
signal pressed(int button)
|
|
signal wheelMoved(int delta)
|
|
|
|
readonly property bool vertical: bar ? bar.vertical : false
|
|
readonly property int barSize: bar ? bar.barSize : Style.bar.sizeHorizontal
|
|
|
|
visible: text !== "" || keepSpace
|
|
opacity: text === "" ? 0 : 1
|
|
implicitWidth: fixedWidth > 0 ? fixedWidth : (vertical ? barSize : Math.max(12, label.implicitWidth + horizontalMargin * 2 + rightExtraMargin))
|
|
implicitHeight: fixedHeight > 0 ? fixedHeight : (vertical ? Math.max(12, label.implicitHeight + verticalPadding * 2) : barSize)
|
|
|
|
Behavior on opacity {
|
|
NumberAnimation { duration: 140; easing.type: Easing.OutCubic }
|
|
}
|
|
|
|
Text {
|
|
id: label
|
|
anchors.centerIn: parent
|
|
anchors.horizontalCenterOffset: root.vertical ? 0 : -root.rightExtraMargin / 2
|
|
text: root.text
|
|
color: root.active ? root.activeColor : root.foreground
|
|
font.family: root.fontFamily
|
|
font.pixelSize: root.fontSize
|
|
renderType: Text.NativeRendering
|
|
rotation: root.textRotation
|
|
horizontalAlignment: Text.AlignHCenter
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
Behavior on color {
|
|
ColorAnimation { duration: 160 }
|
|
}
|
|
}
|
|
|
|
MouseArea {
|
|
id: mouseArea
|
|
anchors.fill: parent
|
|
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
|
|
hoverEnabled: true
|
|
cursorShape: Qt.PointingHandCursor
|
|
onEntered: if (root.bar) root.bar.showTooltip(root, root.tooltipText)
|
|
onExited: if (root.bar) root.bar.hideTooltip(root)
|
|
onClicked: function(mouse) {
|
|
if (root.bar) root.bar.hideTooltip(root)
|
|
root.pressed(mouse.button)
|
|
}
|
|
onWheel: function(wheel) { root.wheelMoved(wheel.angleDelta.y) }
|
|
}
|
|
}
|