nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: bar mono abuse

Browse source
This commit is contained in:
2 * r + 2 * t 2026-05-05 23:53:07 +10:00
parent e45f8f84ce
commit 2931a8c51e
2 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/bar/components/ActiveWindow.qml
View file

@ -86,7 +86,7 @@ Item {
id: metrics id: metrics
text: root.windowTitle text: root.windowTitle
font: root.Tokens.font.mono.small font: root.Tokens.font.body.builders.small.letterSpacing(1.4).build()
elide: Qt.ElideRight elide: Qt.ElideRight
elideWidth: root.maxHeight - icon.height elideWidth: root.maxHeight - icon.height

63
modules/bar/components/Clock.qml
View file

@ -1,6 +1,7 @@
pragma ComponentBehavior: Bound pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import QtQuick.Layouts
import Caelestia.Config import Caelestia.Config
import qs.components import qs.components
import qs.services import qs.services
@ -10,6 +11,7 @@ StyledRect {
readonly property color colour: Colours.palette.m3tertiary readonly property color colour: Colours.palette.m3tertiary
readonly property int padding: Config.bar.clock.background ? Tokens.padding.medium : Tokens.padding.extraSmall readonly property int padding: Config.bar.clock.background ? Tokens.padding.medium : Tokens.padding.extraSmall
readonly property var font: Tokens.font.body.builders.small.scale(1.1)
implicitWidth: Tokens.sizes.bar.innerWidth implicitWidth: Tokens.sizes.bar.innerWidth
implicitHeight: layout.implicitHeight + root.padding * 2 implicitHeight: layout.implicitHeight + root.padding * 2
@ -17,16 +19,15 @@ StyledRect {
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, Config.bar.clock.background ? Colours.tPalette.m3surfaceContainer.a : 0) color: Qt.alpha(Colours.tPalette.m3surfaceContainer, Config.bar.clock.background ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.full radius: Tokens.rounding.full
Column { ColumnLayout {
id: layout id: layout
anchors.centerIn: parent anchors.centerIn: parent
spacing: Tokens.spacing.small spacing: Tokens.spacing.small
Loader { Loader {
Layout.alignment: Qt.AlignHCenter
asynchronous: true asynchronous: true
anchors.horizontalCenter: parent.horizontalCenter
active: Config.bar.clock.showIcon active: Config.bar.clock.showIcon
visible: active visible: active
@ -37,8 +38,7 @@ StyledRect {
} }
StyledText { StyledText {
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
visible: Config.bar.clock.showDate visible: Config.bar.clock.showDate
horizontalAlignment: StyledText.AlignHCenter horizontalAlignment: StyledText.AlignHCenter
@ -48,22 +48,53 @@ StyledRect {
} }
Rectangle { Rectangle {
anchors.horizontalCenter: parent.horizontalCenter Layout.fillWidth: true
visible: Config.bar.clock.showDate visible: Config.bar.clock.showDate
height: visible ? 1 : 0 implicitHeight: 1
color: Colours.palette.m3outlineVariant
width: parent.width * 0.8
color: root.colour
opacity: 0.2
} }
StyledText { StyledText {
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
text: Time.hourStr
horizontalAlignment: StyledText.AlignHCenter font: root.font.width(Math.min(120, Math.max(hourMetrics.width, minMetrics.width) / hourMetrics.width * 100)).build()
text: Time.format(GlobalConfig.services.useTwelveHourClock ? "hh\nmm\nA" : "hh\nmm")
font: Tokens.font.mono.small
color: root.colour color: root.colour
TextMetrics {
id: hourMetrics
font: root.font.build()
text: Time.hourStr
}
}
StyledText {
Layout.topMargin: -parent.spacing - 2
Layout.alignment: Qt.AlignHCenter
text: Time.minuteStr
font: root.font.width(Math.min(120, Math.max(hourMetrics.width, minMetrics.width) / minMetrics.width * 100)).build()
color: root.colour
TextMetrics {
id: minMetrics
font: root.font.build()
text: Time.minuteStr
}
}
Loader {
Layout.topMargin: -parent.spacing - 1
Layout.alignment: Qt.AlignHCenter
asynchronous: true
active: GlobalConfig.services.useTwelveHourClock
visible: active
sourceComponent: StyledText {
text: Time.amPmStr.toLowerCase()
font: Tokens.font.body.builders.small.scale(0.9).build()
color: root.colour
}
} }
} }
} }