vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: vinzenz:26de0d6c4f625c6b08d12123b0c0290781f51fea
Branches Tags
vinzenz:main
..
compare: vinzenz:7633ed75a9699dbf3a302c0483f008f90949dc52
Branches Tags
vinzenz:main

No commits in common. "26de0d6c4f625c6b08d12123b0c0290781f51fea" and "7633ed75a9699dbf3a302c0483f008f90949dc52" have entirely different histories.
26de0d6c4f ... 7633ed75a9

2 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/Cpu.qml
View file

@ -102,14 +102,6 @@ M.BarSection {
onTriggered: root._pinned = false 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 { M.BarIcon {
icon: "\uF2DB" icon: "\uF2DB"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -175,7 +167,6 @@ M.BarSection {
readonly property int _u: root._coreUsage[index] ?? 0 readonly property int _u: root._coreUsage[index] ?? 0
readonly property real _f: root._coreFreq[index] ?? 0 readonly property real _f: root._coreFreq[index] ?? 0
readonly property color _barColor: root._loadColor(_u)
Text { Text {
id: coreLabel id: coreLabel
@ -206,7 +197,7 @@ M.BarSection {
Rectangle { Rectangle {
width: parent.width * (parent.parent._u / 100) width: parent.width * (parent.parent._u / 100)
height: parent.height height: parent.height
color: parent.parent._barColor color: root.accentColor
radius: 2 radius: 2
Behavior on width { Behavior on width {
NumberAnimation { NumberAnimation {
@ -222,7 +213,7 @@ M.BarSection {
anchors.rightMargin: 12 anchors.rightMargin: 12
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: parent._f.toFixed(2) text: parent._f.toFixed(2)
color: parent._barColor color: M.Theme.base04
font.pixelSize: M.Theme.fontSize - 2 font.pixelSize: M.Theme.fontSize - 2
font.family: M.Theme.fontFamily font.family: M.Theme.fontFamily
width: 32 width: 32

15
modules/Volume.qml
View file

@ -50,13 +50,7 @@ M.BarSection {
} }
on_ExpandedChanged: console.log("[vol] expanded →", _expanded) on_ExpandedChanged: console.log("[vol] expanded →", _expanded)
on_AnyHoverChanged: { on_AnyHoverChanged: console.log("[vol] anyHover →", _anyHover, "| barHover:", root._hovered, "| panelHover:", hoverPanel.panelHovered)
console.log("[vol] anyHover →", _anyHover, "| barHover:", root._hovered, "| panelHover:", hoverPanel.panelHovered);
if (_anyHover)
_collapseTimer.stop();
else if (_expanded)
_collapseTimer.start();
}
onVolumeChanged: _flashPanel() onVolumeChanged: _flashPanel()
onMutedChanged: _flashPanel() onMutedChanged: _flashPanel()
@ -72,6 +66,13 @@ M.BarSection {
onTriggered: root._osdActive = false onTriggered: root._osdActive = false
} }
on_AnyHoverChanged: {
if (_anyHover)
_collapseTimer.stop();
else if (_expanded)
_collapseTimer.start();
}
Timer { Timer {
id: _collapseTimer id: _collapseTimer
interval: 1500 interval: 1500