diff --git a/modules/Cpu.qml b/modules/Cpu.qml index d49a9fc..5705c08 100644 --- a/modules/Cpu.qml +++ b/modules/Cpu.qml @@ -102,14 +102,6 @@ M.BarSection { onTriggered: root._pinned = false } - function _loadColor(pct) { - const t = Math.max(0, Math.min(100, pct)) / 100; - const a = t < 0.5 ? M.Theme.base0B : M.Theme.base0A; - const b = t < 0.5 ? M.Theme.base0A : M.Theme.base08; - const u = t < 0.5 ? t * 2 : (t - 0.5) * 2; - return Qt.rgba(a.r + (b.r - a.r) * u, a.g + (b.g - a.g) * u, a.b + (b.b - a.b) * u, 1); - } - M.BarIcon { icon: "\uF2DB" anchors.verticalCenter: parent.verticalCenter @@ -175,7 +167,6 @@ M.BarSection { readonly property int _u: root._coreUsage[index] ?? 0 readonly property real _f: root._coreFreq[index] ?? 0 - readonly property color _barColor: root._loadColor(_u) Text { id: coreLabel @@ -206,7 +197,7 @@ M.BarSection { Rectangle { width: parent.width * (parent.parent._u / 100) height: parent.height - color: parent.parent._barColor + color: root.accentColor radius: 2 Behavior on width { NumberAnimation { @@ -222,7 +213,7 @@ M.BarSection { anchors.rightMargin: 12 anchors.verticalCenter: parent.verticalCenter text: parent._f.toFixed(2) - color: parent._barColor + color: M.Theme.base04 font.pixelSize: M.Theme.fontSize - 2 font.family: M.Theme.fontFamily width: 32 diff --git a/modules/Volume.qml b/modules/Volume.qml index 551cf8b..98cac53 100644 --- a/modules/Volume.qml +++ b/modules/Volume.qml @@ -50,13 +50,7 @@ M.BarSection { } on_ExpandedChanged: console.log("[vol] expanded →", _expanded) - on_AnyHoverChanged: { - console.log("[vol] anyHover →", _anyHover, "| barHover:", root._hovered, "| panelHover:", hoverPanel.panelHovered); - if (_anyHover) - _collapseTimer.stop(); - else if (_expanded) - _collapseTimer.start(); - } + on_AnyHoverChanged: console.log("[vol] anyHover →", _anyHover, "| barHover:", root._hovered, "| panelHover:", hoverPanel.panelHovered) onVolumeChanged: _flashPanel() onMutedChanged: _flashPanel() @@ -72,6 +66,13 @@ M.BarSection { onTriggered: root._osdActive = false } + on_AnyHoverChanged: { + if (_anyHover) + _collapseTimer.stop(); + else if (_expanded) + _collapseTimer.start(); + } + Timer { id: _collapseTimer interval: 1500