Compare commits

..

No commits in common. "bc9eda464cd378b0454b9eb8a6df8e51e75bade1" and "9fa2a72a0bba4f7ab1b5efeb20073810fdeece12" have entirely different histories.

5 changed files with 24 additions and 33 deletions

View file

@ -12,12 +12,9 @@ M.BarSection {
property int percent: 0 property int percent: 0
property bool _osdActive: false property bool _osdActive: false
property bool _ready: false
readonly property bool _showPanel: root._hovered || hoverPanel.panelHovered || _osdActive readonly property bool _showPanel: root._hovered || hoverPanel.panelHovered || _osdActive
Component.onCompleted: _ready = true onPercentChanged: if (percent > 0)
onPercentChanged: if (_ready && percent > 0)
_flashPanel() _flashPanel()
function _flashPanel() { function _flashPanel() {

View file

@ -29,17 +29,29 @@ QtObject {
} }
} }
// Relative time string recomputed whenever NotifService._now ticks (single global 5s timer) // Relative time string
readonly property string timeStr: { property string timeStr: "now"
const diff = M.NotifService._now - time; readonly property Timer _timeStrTimer: Timer {
running: root.state !== "dismissed"
repeat: true
interval: 5000
onTriggered: root._updateTimeStr()
}
function _updateTimeStr() {
const diff = Date.now() - time;
const m = Math.floor(diff / 60000); const m = Math.floor(diff / 60000);
if (m < 1) if (m < 1) {
return "now"; timeStr = "now";
return;
}
const h = Math.floor(m / 60); const h = Math.floor(m / 60);
if (h < 1) if (h < 1) {
return m + "m"; timeStr = m + "m";
return;
}
const d = Math.floor(h / 24); const d = Math.floor(h / 24);
return d > 0 ? d + "d" : h + "h"; timeStr = d > 0 ? d + "d" : h + "h";
} }
function beginDismiss() { function beginDismiss() {

View file

@ -124,15 +124,6 @@ QtObject {
} }
// Persistence // Persistence
// Single global tick for all NotifItem.timeStr bindings replaces per-item 5s timers
property real _now: Date.now()
property Timer _nowTimer: Timer {
running: root.count > 0
repeat: true
interval: 5000
onTriggered: root._now = Date.now()
}
property Timer _saveTimer: Timer { property Timer _saveTimer: Timer {
interval: 1000 interval: 1000
onTriggered: { onTriggered: {

View file

@ -21,11 +21,7 @@ QtObject {
property var _coreGraceTimer: Timer { property var _coreGraceTimer: Timer {
interval: 30000 interval: 30000
onTriggered: root.cpuCores = root.cpuCores.map(() => ({ onTriggered: root.cpuCores = []
"usage": 0,
"freq_ghz": 0,
"history": []
}))
} }
property var cpuCoreMaxFreq: [] property var cpuCoreMaxFreq: []
property var cpuCoreTypes: [] property var cpuCoreTypes: []

View file

@ -39,16 +39,11 @@ M.BarSection {
} }
property bool _osdActive: false property bool _osdActive: false
property bool _ready: false
readonly property bool _anyHover: root._hovered || hoverPanel.panelHovered readonly property bool _anyHover: root._hovered || hoverPanel.panelHovered
readonly property bool _showPanel: _anyHover || _osdActive readonly property bool _showPanel: _anyHover || _osdActive
Component.onCompleted: _ready = true onVolumeChanged: _flashPanel()
onMutedChanged: _flashPanel()
onVolumeChanged: if (_ready)
_flashPanel()
onMutedChanged: if (_ready)
_flashPanel()
function _flashPanel() { function _flashPanel() {
_osdActive = true; _osdActive = true;