diff --git a/modules/Cpu.qml b/modules/Cpu.qml index 6be796d..01ea93d 100644 --- a/modules/Cpu.qml +++ b/modules/Cpu.qml @@ -57,11 +57,9 @@ M.BarSection { color: M.Theme.base08 anchors.verticalCenter: parent.verticalCenter } - Text { - text: root.usage.toString().padStart(2) + "%@" + root.freqGhz.toFixed(2) + M.BarLabel { + label: root.usage.toString().padStart(2) + "%@" + root.freqGhz.toFixed(2) color: M.Theme.base08 - font.pixelSize: M.Theme.fontSize - font.family: M.Theme.fontFamily - verticalAlignment: Text.AlignVCenter + anchors.verticalCenter: parent.verticalCenter } } diff --git a/modules/Disk.qml b/modules/Disk.qml index c9e3b6a..c8eb68b 100644 --- a/modules/Disk.qml +++ b/modules/Disk.qml @@ -37,11 +37,9 @@ M.BarSection { color: M.Theme.base09 anchors.verticalCenter: parent.verticalCenter } - Text { - text: root.freePct + "% " + root.totalTb.toFixed(1) + M.BarLabel { + label: root.freePct + "% " + root.totalTb.toFixed(1) color: M.Theme.base09 - font.pixelSize: M.Theme.fontSize - font.family: M.Theme.fontFamily - verticalAlignment: Text.AlignVCenter + anchors.verticalCenter: parent.verticalCenter } } diff --git a/modules/Memory.qml b/modules/Memory.qml index 13e10bd..3b7d81f 100644 --- a/modules/Memory.qml +++ b/modules/Memory.qml @@ -37,11 +37,9 @@ M.BarSection { color: M.Theme.base0B anchors.verticalCenter: parent.verticalCenter } - Text { - text: root.percent + "%" + M.BarLabel { + label: root.percent + "%" color: M.Theme.base0B - font.pixelSize: M.Theme.fontSize - font.family: M.Theme.fontFamily - verticalAlignment: Text.AlignVCenter + anchors.verticalCenter: parent.verticalCenter } } diff --git a/modules/Network.qml b/modules/Network.qml index e4bbe86..9afde20 100644 --- a/modules/Network.qml +++ b/modules/Network.qml @@ -64,12 +64,10 @@ M.BarSection { color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0C anchors.verticalCenter: parent.verticalCenter } - Text { + M.BarLabel { visible: root.state === "wifi" - text: root.essid + label: root.essid color: root.state === "disconnected" ? M.Theme.base08 : M.Theme.base0C - font.pixelSize: M.Theme.fontSize + 1 - font.family: M.Theme.fontFamily anchors.verticalCenter: parent.verticalCenter } } diff --git a/modules/Temperature.qml b/modules/Temperature.qml index 4e5842a..9b1d98e 100644 --- a/modules/Temperature.qml +++ b/modules/Temperature.qml @@ -29,11 +29,9 @@ M.BarSection { color: root._stateColor anchors.verticalCenter: parent.verticalCenter } - Text { - text: root.celsius + "\u00B0C" + M.BarLabel { + label: root.celsius + "\u00B0C" color: root._stateColor - font.pixelSize: M.Theme.fontSize - font.family: M.Theme.fontFamily - verticalAlignment: Text.AlignVCenter + anchors.verticalCenter: parent.verticalCenter } }