mirror of
https://github.com/arthur-pbty/arthur-os.git
synced 2026-08-02 04:37:49 +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).
62 lines
2.4 KiB
QML
62 lines
2.4 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import qs.Commons
|
|
|
|
// Single-line text input with the kit's focus + selection styling. Inherits
|
|
// from Qt Quick Controls TextField so the underlying type's API (text,
|
|
// placeholderText, accepted, editingFinished, validator, ...) is available
|
|
// to callers without re-exposing each property.
|
|
//
|
|
// Defaults bind to qs.Commons.Color so a caller with no theme overrides
|
|
// just works; foreground / accent / selectionTint can be overridden per
|
|
// instance. Focus styling uses Style.focusBorderColor (the same accent
|
|
// ring Toggle and ChoiceButton paint) so keyboard cursor and form-focus
|
|
// chrome stay consistent across the shell.
|
|
//
|
|
// Sizing is driven by font.pixelSize + verticalPadding. The default 30px
|
|
// implicitHeight fits dialog forms; inline callers (wifi's row-embedded
|
|
// passphrase prompt) drop verticalPadding to match a 22-26px row.
|
|
TextField {
|
|
id: root
|
|
|
|
property color foreground: Color.foreground
|
|
property color accent: Color.accent
|
|
property color selectionTint: Qt.rgba(foreground.r, foreground.g, foreground.b, 0.35)
|
|
property bool password: false
|
|
property real horizontalPadding: 10
|
|
property real verticalPadding: 7
|
|
|
|
// Panel-cursor flag. When true (and the field isn't already focused),
|
|
// the background paints the same accent ring as activeFocus so the
|
|
// panel's keyboard cursor lands here identically to a mouse hover.
|
|
// For mouse-enter/leave the consumer reads QQC TextField's inherited
|
|
// `hovered` property (via onHoveredChanged) — we don't add a sibling
|
|
// signal because the inherited property would shadow it.
|
|
property bool hasCursor: false
|
|
|
|
readonly property bool _focused: activeFocus || hasCursor
|
|
|
|
echoMode: password ? TextInput.Password : TextInput.Normal
|
|
font.family: Style.font.family
|
|
font.pixelSize: Style.font.body
|
|
color: foreground
|
|
selectionColor: selectionTint
|
|
selectedTextColor: foreground
|
|
placeholderTextColor: Qt.darker(foreground, 1.6)
|
|
|
|
leftPadding: horizontalPadding
|
|
rightPadding: horizontalPadding
|
|
topPadding: verticalPadding
|
|
bottomPadding: verticalPadding
|
|
|
|
background: Rectangle {
|
|
color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b,
|
|
root._focused ? 0.08 : 0.04)
|
|
border.color: root._focused
|
|
? Style.focusBorderColor
|
|
: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.18)
|
|
border.width: root._focused ? Style.focusBorderWidth : 1
|
|
radius: Style.cornerRadius
|
|
}
|
|
}
|