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).
75 lines
1.9 KiB
QML
75 lines
1.9 KiB
QML
import QtQuick
|
|
import QtQuick.Controls as QQC
|
|
import qs.Commons
|
|
|
|
Column {
|
|
id: root
|
|
|
|
property string label: ""
|
|
property int value: 0
|
|
property int from: 0
|
|
property int to: 100
|
|
property int stepSize: 1
|
|
property color foreground: Color.foreground
|
|
property color accent: Color.accent
|
|
property string fontFamily: Style.font.family
|
|
property real fontSize: Style.font.body
|
|
property real fieldWidth: 120
|
|
property bool hasCursor: false
|
|
property alias field: spin
|
|
|
|
signal modified(int value)
|
|
signal hovered(bool on)
|
|
|
|
spacing: 6
|
|
|
|
Text {
|
|
visible: root.label !== ""
|
|
text: root.label
|
|
color: Qt.darker(root.foreground, 1.4)
|
|
font.family: root.fontFamily
|
|
font.pixelSize: Style.font.bodySmall
|
|
}
|
|
|
|
QQC.SpinBox {
|
|
id: spin
|
|
width: root.fieldWidth
|
|
from: root.from
|
|
to: root.to
|
|
stepSize: root.stepSize
|
|
value: root.value
|
|
editable: true
|
|
font.family: root.fontFamily
|
|
font.pixelSize: root.fontSize
|
|
|
|
onValueModified: root.modified(value)
|
|
|
|
background: Rectangle {
|
|
readonly property bool _hot: spin.activeFocus || (root.hasCursor && !spin.activeFocus)
|
|
color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, _hot ? 0.10 : 0.05)
|
|
border.color: _hot
|
|
? Style.focusBorderColor
|
|
: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.3)
|
|
border.width: _hot ? Style.focusBorderWidth : 1
|
|
radius: Style.cornerRadius
|
|
|
|
HoverHandler {
|
|
onHoveredChanged: root.hovered(hovered)
|
|
}
|
|
}
|
|
|
|
contentItem: TextInput {
|
|
text: spin.displayText
|
|
font: spin.font
|
|
color: root.foreground
|
|
selectionColor: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.35)
|
|
selectedTextColor: root.foreground
|
|
horizontalAlignment: Qt.AlignHCenter
|
|
verticalAlignment: Qt.AlignVCenter
|
|
readOnly: !spin.editable
|
|
validator: spin.validator
|
|
inputMethodHints: Qt.ImhFormattedNumbersOnly
|
|
}
|
|
}
|
|
}
|