28allday
83c6b62c13
Convert remaining reachable surfaces to NsIcon (launcher, utilities, windowinfo,
sidebar, dashboard, notification toast, shared controls IconTextButton/Menu/
SplitButton/ToggleButton/CollapsibleSection/CustomSpinBox, CoverArt). Handles
the `sourceComponent: MaterialIcon {` form and icon-via-alias controls.
- IconTextButton: alias -> plain `icon` property + bound NsIcon (cross-file alias
to a custom property was rejected).
- Reverted IconButton `font:` (the controls-wide font->fontStyle sweep wrongly
hit ButtonBase, which uses font not fontStyle).
- Glyphs map: +31 names (dashboard/utilities/launcher leftovers) — no "?" glyphs.
Old collapsed bar + old lock sub-components left as-is (unused, never render).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
147 lines
4.3 KiB
QML
147 lines
4.3 KiB
QML
import QtQuick
|
|
import QtQuick.Layouts
|
|
import Quickshell.Services.UPower
|
|
import Caelestia.Config
|
|
import Caelestia.Services
|
|
import qs.components
|
|
import qs.services
|
|
|
|
StyledClippingRect {
|
|
id: root
|
|
|
|
property real animPerc: UPower.displayDevice.percentage
|
|
|
|
color: Colours.palette.m3secondaryContainer
|
|
radius: Tokens.rounding.large
|
|
|
|
implicitWidth: Config.dashboard.performance.showCpu || (Config.dashboard.performance.showGpu && Gpu.type !== Gpu.None) || Config.dashboard.performance.showStorage || Config.dashboard.performance.showMemory ? Tokens.sizes.dashboard.perfBattWidth : Tokens.sizes.dashboard.perfBattWidthSingle
|
|
implicitHeight: Tokens.sizes.dashboard.perfBattHeight
|
|
|
|
Behavior on animPerc {
|
|
Anim {}
|
|
}
|
|
|
|
Contents {
|
|
id: layout
|
|
|
|
anchors.fill: parent
|
|
anchors.margins: Tokens.padding.medium
|
|
|
|
accentColour: Colours.palette.m3primary
|
|
textColour: Colours.palette.m3onSurface
|
|
subTextColour: Colours.palette.m3onSurfaceVariant
|
|
}
|
|
|
|
StyledRect {
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
implicitHeight: parent.height * root.animPerc
|
|
|
|
color: Colours.palette.m3secondary
|
|
radius: Tokens.rounding.extraSmall
|
|
clip: true
|
|
|
|
Contents {
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
anchors.margins: layout.anchors.margins
|
|
height: layout.height
|
|
|
|
accentColour: Colours.palette.m3primaryContainer
|
|
textColour: Colours.palette.m3onSecondary
|
|
subTextColour: Colours.palette.m3secondaryContainer
|
|
}
|
|
}
|
|
|
|
component Contents: ColumnLayout {
|
|
id: contents
|
|
|
|
required property color accentColour
|
|
required property color textColour
|
|
required property color subTextColour
|
|
readonly property bool charging: [UPowerDeviceState.Charging, UPowerDeviceState.FullyCharged, UPowerDeviceState.PendingCharge].includes(UPower.displayDevice.state)
|
|
|
|
spacing: 0
|
|
|
|
NsIcon {
|
|
Layout.leftMargin: -Tokens.padding.extraSmall
|
|
icon: "battery_full"
|
|
color: contents.accentColour
|
|
fontStyle: Tokens.font.icon.large
|
|
}
|
|
|
|
StyledText {
|
|
Layout.fillWidth: true
|
|
text: qsTr("Battery")
|
|
color: contents.textColour
|
|
font: Tokens.font.body.medium
|
|
}
|
|
|
|
Item {
|
|
Layout.fillHeight: true
|
|
}
|
|
|
|
StyledText {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: {
|
|
if (UPower.displayDevice.state === UPowerDeviceState.FullyCharged)
|
|
return qsTr("Full");
|
|
|
|
if (contents.charging)
|
|
return qsTr("Charging");
|
|
|
|
const s = UPower.displayDevice.timeToEmpty;
|
|
if (s === 0)
|
|
return qsTr("...");
|
|
|
|
const hr = Math.floor(s / 3600);
|
|
const min = Math.floor((s % 3600) / 60);
|
|
if (hr > 0)
|
|
return `${hr}h ${min}m`;
|
|
|
|
return `${min}m`;
|
|
}
|
|
color: contents.subTextColour
|
|
font: Tokens.font.body.small
|
|
animate: true
|
|
}
|
|
|
|
RowLayout {
|
|
Layout.topMargin: -Tokens.padding.extraSmall
|
|
Layout.bottomMargin: -Tokens.padding.small
|
|
Layout.rightMargin: -Tokens.padding.extraSmall
|
|
Layout.alignment: Qt.AlignRight
|
|
spacing: Tokens.spacing.extraSmall
|
|
|
|
NsIcon {
|
|
icon: "bolt"
|
|
color: contents.accentColour
|
|
fontStyle: Tokens.font.icon.large
|
|
fill: 1
|
|
|
|
scale: contents.charging ? 1 : 0
|
|
opacity: contents.charging ? 1 : 0
|
|
|
|
Behavior on scale {
|
|
Anim {
|
|
type: Anim.FastSpatial
|
|
}
|
|
}
|
|
|
|
Behavior on opacity {
|
|
Anim {
|
|
type: Anim.FastEffects
|
|
}
|
|
}
|
|
}
|
|
|
|
StyledText {
|
|
text: `${Math.round(UPower.displayDevice.percentage * 100)}%`
|
|
color: contents.accentColour
|
|
font: Tokens.font.headline.medium
|
|
}
|
|
}
|
|
}
|
|
}
|