Give every OSD card exact padding on all four sides
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LfqzqpU1T6pQRsmpbGxBs5
This commit is contained in:
David Heinemeier Hansson
co-authored by
Claude Opus 5
Claude Opus 5
parent
1e152b0d9e
commit
248659de5a
+80
-36
@@ -17,24 +17,45 @@ Item {
|
||||
property int maxValue: 100
|
||||
property bool hasProgress: true
|
||||
property int duration: 1200
|
||||
property bool fit: false
|
||||
readonly property int cardWidth: Style.space(269)
|
||||
readonly property int mediaCardWidth: Math.round(cardWidth * 1.5)
|
||||
readonly property int messageWidth: Style.space(190)
|
||||
readonly property int mediaMessageWidth: messageWidth + mediaCardWidth - cardWidth
|
||||
|
||||
readonly property bool mediaOsd: iconKey.indexOf("media") === 0 || iconKey.indexOf("player") === 0
|
||||
readonly property bool textOnlyOsd: root.fit && !root.hasProgress && !root.mediaOsd
|
||||
readonly property int fitMessageWidth: root.message === "" ? 0 : Math.round(messageMetrics.boundingRect.width) + Style.space(4)
|
||||
readonly property int fitCardWidth: root.message === "" || root.fitMessageWidth === 0
|
||||
? card.borderLeft + Style.space(16) + Style.space(28) + Style.space(16) + card.borderRight
|
||||
: card.borderLeft + Style.space(16) + Style.space(28) + Style.space(16) + root.fitMessageWidth + Style.space(16) + card.borderRight
|
||||
|
||||
// The card is built out of measured columns instead of fixed widths, so it
|
||||
// keeps exactly `pad` between border and content on every side whatever
|
||||
// glyph or message it carries. Messages grow with their text up to
|
||||
// `maxMessageWidth` and elide beyond it.
|
||||
readonly property int pad: Style.space(16)
|
||||
readonly property int gap: Style.space(16)
|
||||
// A glyph next to a message reads airier than it measures: the icon outline
|
||||
// and the letterforms both fall away from their ink extremes, so the space
|
||||
// between them opens up well past the nominal gap. Text takes two thirds of
|
||||
// it; the progress bar's hard edge keeps the full gap.
|
||||
readonly property int messageGap: Math.round(root.gap * 2 / 3)
|
||||
readonly property int barWidth: Style.space(142)
|
||||
readonly property int maxMessageWidth: root.mediaOsd ? Style.space(325) : Style.space(190)
|
||||
|
||||
// Nerd Font glyphs draw well outside their monospace cell, so the icon
|
||||
// column is measured by ink rather than by advance width. Progress OSDs pin
|
||||
// it to the widest glyph the model can return, so the bar doesn't shift when
|
||||
// volume crosses an icon threshold.
|
||||
readonly property int iconInkWidth: Math.ceil(iconMetrics.tightBoundingRect.width)
|
||||
readonly property int iconWidth: root.hasProgress
|
||||
? Math.max(root.iconInkWidth, Math.ceil(widestIconMetrics.tightBoundingRect.width))
|
||||
: root.iconInkWidth
|
||||
// Same idea for the readout: it is as wide as the longest percentage so the
|
||||
// digits don't jitter between 9% and 100%.
|
||||
readonly property int valueWidth: Math.ceil(Math.max(valueMetrics.advanceWidth, messageMetrics.advanceWidth))
|
||||
readonly property int messageWidth: Math.min(Math.ceil(messageMetrics.advanceWidth), root.maxMessageWidth)
|
||||
readonly property int contentWidth: root.hasProgress
|
||||
? root.iconWidth + root.gap + root.barWidth + root.gap + root.valueWidth
|
||||
: (root.message === "" ? root.iconWidth : root.iconWidth + root.messageGap + root.messageWidth)
|
||||
|
||||
function iconFor(name, percent) {
|
||||
return OsdModel.iconFor(name, percent)
|
||||
}
|
||||
|
||||
function show(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration, rawFit) {
|
||||
var next = OsdModel.stateForShow(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration, rawFit)
|
||||
function show(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration) {
|
||||
var next = OsdModel.stateForShow(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration)
|
||||
iconKey = next.iconKey
|
||||
maxValue = next.maxValue
|
||||
hasProgress = next.hasProgress
|
||||
@@ -42,7 +63,6 @@ Item {
|
||||
message = next.message
|
||||
icon = next.icon
|
||||
duration = next.duration
|
||||
fit = next.fit
|
||||
opened = true
|
||||
if (duration > 0) hideTimer.restart()
|
||||
else hideTimer.stop()
|
||||
@@ -51,7 +71,7 @@ Item {
|
||||
function open(payloadJson) {
|
||||
try {
|
||||
var p = JSON.parse(payloadJson || "{}")
|
||||
show(p.icon || "", p.message || "", p.value === undefined ? "" : String(p.value), p.max === undefined ? "100" : String(p.max), p.progressText || "", p.duration === undefined ? "1200" : String(p.duration), p.fit === undefined ? false : p.fit)
|
||||
show(p.icon || "", p.message || "", p.value === undefined ? "" : String(p.value), p.max === undefined ? "100" : String(p.max), p.progressText || "", p.duration === undefined ? "1200" : String(p.duration))
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
@@ -71,6 +91,25 @@ Item {
|
||||
text: root.message
|
||||
}
|
||||
|
||||
TextMetrics {
|
||||
id: valueMetrics
|
||||
font: messageMetrics.font
|
||||
text: "100%"
|
||||
}
|
||||
|
||||
TextMetrics {
|
||||
id: iconMetrics
|
||||
font.family: Style.font.family
|
||||
font.pixelSize: Style.font.displayLarge
|
||||
text: root.icon
|
||||
}
|
||||
|
||||
TextMetrics {
|
||||
id: widestIconMetrics
|
||||
font: iconMetrics.font
|
||||
text: OsdModel.widestIcon
|
||||
}
|
||||
|
||||
IpcHandler {
|
||||
target: "osd"
|
||||
function show(payloadJson: string): string {
|
||||
@@ -97,8 +136,8 @@ Item {
|
||||
|
||||
BorderSurface {
|
||||
id: card
|
||||
width: root.textOnlyOsd ? root.fitCardWidth : (root.mediaOsd ? root.mediaCardWidth : root.cardWidth)
|
||||
height: Math.max(Style.space(68), Style.font.displayLarge + Style.spacing.panelGap)
|
||||
width: card.borderLeft + root.pad + root.contentWidth + root.pad + card.borderRight
|
||||
height: card.borderTop + root.pad + Style.font.displayLarge + root.pad + card.borderBottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: Style.space(67)
|
||||
@@ -109,23 +148,27 @@ Item {
|
||||
|
||||
Row {
|
||||
anchors.fill: parent
|
||||
anchors.topMargin: card.borderTop
|
||||
anchors.rightMargin: card.borderRight + Style.space(16)
|
||||
anchors.bottomMargin: card.borderBottom
|
||||
anchors.leftMargin: card.borderLeft + Style.space(16)
|
||||
spacing: Style.space(16)
|
||||
Text {
|
||||
width: Style.space(28)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: root.icon
|
||||
font.family: Style.font.family
|
||||
font.pixelSize: Style.font.displayLarge
|
||||
color: Color.popups.text
|
||||
anchors.topMargin: card.borderTop + root.pad
|
||||
anchors.rightMargin: card.borderRight + root.pad
|
||||
anchors.bottomMargin: card.borderBottom + root.pad
|
||||
anchors.leftMargin: card.borderLeft + root.pad
|
||||
spacing: root.hasProgress ? root.gap : root.messageGap
|
||||
Item {
|
||||
width: root.iconWidth
|
||||
height: parent.height
|
||||
Text {
|
||||
// Sit the glyph's ink flush in the column, centered when the
|
||||
// column is wider than this particular glyph.
|
||||
x: Math.round((root.iconWidth - root.iconInkWidth) / 2 - iconMetrics.tightBoundingRect.x)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: root.icon
|
||||
font: iconMetrics.font
|
||||
color: Color.popups.text
|
||||
}
|
||||
}
|
||||
Rectangle {
|
||||
visible: root.hasProgress
|
||||
width: visible ? Style.space(142) : 0
|
||||
width: root.barWidth
|
||||
height: Math.max(Style.space(6), Style.spacing.sm)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: Util.alpha(Color.popups.text, 0.45)
|
||||
@@ -136,16 +179,17 @@ Item {
|
||||
}
|
||||
}
|
||||
Text {
|
||||
width: root.textOnlyOsd ? root.fitMessageWidth : (root.hasProgress ? Style.space(41) : (root.mediaOsd ? root.mediaMessageWidth : root.messageWidth))
|
||||
visible: root.message !== ""
|
||||
width: root.hasProgress ? root.valueWidth : root.messageWidth
|
||||
// The readout hugs the card edge so a short percentage doesn't leave
|
||||
// a hole in the padding; the slack lands in the gap after the bar.
|
||||
horizontalAlignment: root.hasProgress ? Text.AlignRight : Text.AlignLeft
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: root.message
|
||||
font.family: Style.font.family
|
||||
font.bold: true
|
||||
font.pixelSize: Style.font.title
|
||||
font: messageMetrics.font
|
||||
color: Color.popups.text
|
||||
elide: root.textOnlyOsd ? Text.ElideNone : Text.ElideRight
|
||||
elide: Text.ElideRight
|
||||
maximumLineCount: 1
|
||||
clip: !root.textOnlyOsd
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,10 @@ function clamp(value, min, max) {
|
||||
return Math.max(min, Math.min(max, value))
|
||||
}
|
||||
|
||||
// The widest glyph `iconFor` can return. The progress OSD sizes its icon
|
||||
// column to it so the bar keeps its place as the icon changes.
|
||||
var widestIcon = ""
|
||||
|
||||
function iconFor(name, percent) {
|
||||
var n = String(name || "").toLowerCase()
|
||||
if (n === "volume-muted" || n === "volume-mute" || n === "muted" || n === "mute") return ""
|
||||
@@ -30,14 +34,13 @@ function iconFor(name, percent) {
|
||||
return ""
|
||||
}
|
||||
|
||||
function stateForShow(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration, rawFit) {
|
||||
function stateForShow(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration) {
|
||||
var maxValue = Math.max(1, parseInt(rawMax || "100", 10))
|
||||
var parsedValue = parseInt(rawValue || "0", 10)
|
||||
var hasProgress = rawValue !== "" && !isNaN(parsedValue) && rawMessage === ""
|
||||
var value = hasProgress ? clamp(parsedValue, 0, maxValue) : 0
|
||||
var percent = hasProgress ? Math.round(value * 100 / maxValue) : -1
|
||||
var parsedDuration = parseInt(rawDuration || "1200", 10)
|
||||
var fit = rawFit === true || rawFit === 1 || rawFit === "1" || rawFit === "true"
|
||||
|
||||
return {
|
||||
iconKey: String(iconName || "").toLowerCase(),
|
||||
@@ -46,13 +49,13 @@ function stateForShow(iconName, rawMessage, rawValue, rawMax, rawProgressText, r
|
||||
value: value,
|
||||
message: String(rawMessage || (hasProgress ? (rawProgressText || percent + "%") : "")),
|
||||
icon: iconFor(iconName, percent),
|
||||
duration: isNaN(parsedDuration) ? 1200 : Math.max(0, parsedDuration),
|
||||
fit: fit
|
||||
duration: isNaN(parsedDuration) ? 1200 : Math.max(0, parsedDuration)
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof module !== "undefined") {
|
||||
module.exports = {
|
||||
widestIcon: widestIcon,
|
||||
iconFor: iconFor,
|
||||
stateForShow: stateForShow
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user