David Heinemeier HanssonandClaude Opus 5
d2e1587ceb
A bar surface is built per monitor, so a widget in the layout is live once per screen — but an IPC target only ever routes to the handler that registered first. `omarchy.indicators refresh` therefore reached a single bar, and since indicators only re-read their state on that signal, the other screens kept showing a stale reminder count, tmux alert, or DND state until the next reload. Clock and system-update refreshes had the same reach. Let the bar resolve every live instance of a widget id and relay the call to all of them. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
93 lines
2.5 KiB
QML
93 lines
2.5 KiB
QML
import QtQuick
|
|
import Quickshell
|
|
import Quickshell.Io
|
|
import qs.Commons
|
|
import qs.Ui
|
|
|
|
BarWidget {
|
|
id: root
|
|
moduleName: "omarchy.clock"
|
|
|
|
property bool alt: false
|
|
property date displayDate: clock.date
|
|
|
|
readonly property string activeFormat: alt
|
|
? (vertical ? setting("verticalFormatAlt", "dd\nMMM\n'W'ww\n''yy") : setting("formatAlt", "d MMMM 'W'ww yyyy"))
|
|
: (vertical ? setting("verticalFormat", "HH\n—\nmm") : setting("format", "dddd HH:mm"))
|
|
readonly property string displayText: formatted(displayDate)
|
|
readonly property var verticalLines: displayText.split("\n")
|
|
|
|
function refresh() {
|
|
displayDate = new Date()
|
|
}
|
|
|
|
function isoWeek(date) {
|
|
var d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()))
|
|
var day = d.getUTCDay() || 7
|
|
d.setUTCDate(d.getUTCDate() + 4 - day)
|
|
var yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1))
|
|
return Math.ceil(((d - yearStart) / 86400000 + 1) / 7)
|
|
}
|
|
|
|
function isoWeekLiteral(date) {
|
|
var week = isoWeek(date)
|
|
return (week < 10 ? "0" : "") + week
|
|
}
|
|
|
|
function formatted(date) {
|
|
return Qt.formatDateTime(date, activeFormat.replace(/ww/g, isoWeekLiteral(date)))
|
|
}
|
|
|
|
implicitWidth: button.implicitWidth
|
|
implicitHeight: button.implicitHeight
|
|
|
|
SystemClock {
|
|
id: clock
|
|
precision: SystemClock.Minutes
|
|
onDateChanged: root.displayDate = date
|
|
}
|
|
|
|
IpcHandler {
|
|
target: "omarchy.clock"
|
|
function refresh(): void { root.broadcast("refresh") }
|
|
}
|
|
|
|
WidgetButton {
|
|
id: button
|
|
anchors.fill: parent
|
|
bar: root.bar
|
|
text: root.vertical ? "" : root.displayText
|
|
labelVisible: !root.vertical
|
|
hasVisualContent: root.vertical ? root.verticalLines.length > 0 : text !== ""
|
|
fixedHeight: root.vertical ? root.verticalLines.length * Style.bar.iconSlot : -1
|
|
horizontalMargin: 8.75
|
|
verticalPadding: 8.75
|
|
onPressed: function(button) {
|
|
if (!root.bar) return
|
|
if (button === Qt.RightButton) root.bar.run("omarchy-menu-timezone")
|
|
else root.alt = !root.alt
|
|
}
|
|
|
|
Column {
|
|
visible: root.vertical
|
|
anchors.fill: parent
|
|
|
|
Repeater {
|
|
model: root.verticalLines
|
|
|
|
OpticalGlyph {
|
|
required property string modelData
|
|
width: button.width
|
|
height: Style.bar.iconSlot
|
|
text: modelData
|
|
fontFamily: button.fontFamily
|
|
fontSize: modelData.length > 3
|
|
? button.fontSize * 0.9
|
|
: button.fontSize
|
|
color: button.foreground
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|