diff --git a/quickshell/Modules/Bar/Components/MemUsage.qml b/quickshell/Modules/Bar/Components/MemUsage.qml index 3419984..74ef88b 100644 --- a/quickshell/Modules/Bar/Components/MemUsage.qml +++ b/quickshell/Modules/Bar/Components/MemUsage.qml @@ -5,12 +5,14 @@ import qs.Modules.Bar.Misc import qs.Services MonitorItem { + property bool showPercent: false + symbol: Icons.memory fillColor: Colors.green value: Math.round(SystemStatService.memPercent) maxValue: 100 - textValue: SystemStatService.memGb - textSuffix: "G" + textValue: showPercent ? SystemStatService.memPercent : SystemStatService.memGb + textSuffix: showPercent ? "%" : "GB" onClicked: { if (action.running) { action.signal(15); @@ -18,6 +20,9 @@ MonitorItem { } action.exec(["ghostty", "-e", "btop"]); } + onRightClicked: { + showPercent = !showPercent; + } Process { id: action diff --git a/quickshell/Modules/Bar/Components/TrayExpander.qml b/quickshell/Modules/Bar/Components/TrayExpander.qml index b3e6d4e..1e287f9 100644 --- a/quickshell/Modules/Bar/Components/TrayExpander.qml +++ b/quickshell/Modules/Bar/Components/TrayExpander.qml @@ -22,6 +22,7 @@ Item { SymbolButton { symbol: Icons.tray buttonColor: Colors.green + disabledHover: true } Item { diff --git a/quickshell/Modules/Bar/Misc/MonitorItem.qml b/quickshell/Modules/Bar/Misc/MonitorItem.qml index 131ca4c..67947b8 100644 --- a/quickshell/Modules/Bar/Misc/MonitorItem.qml +++ b/quickshell/Modules/Bar/Misc/MonitorItem.qml @@ -15,11 +15,13 @@ Item { property string textSuffix: "" property bool pointerCursor: true property alias hovered: mouseArea.containsMouse + property bool disableHover: false readonly property real ratio: value / maxValue signal wheelUp() signal wheelDown() signal clicked() + signal rightClicked() implicitHeight: parent.height - 5 implicitWidth: parent.height + (hovered ? textDisplay.width : 0) @@ -28,7 +30,7 @@ Item { id: mouseArea anchors.fill: parent - hoverEnabled: true + hoverEnabled: !disableHover acceptedButtons: Qt.LeftButton | Qt.RightButton cursorShape: pointerCursor ? Qt.PointingHandCursor : Qt.ArrowCursor onClicked: (mouse) => { diff --git a/quickshell/Modules/Bar/Misc/SymbolButton.qml b/quickshell/Modules/Bar/Misc/SymbolButton.qml index 5499a7e..6ce7171 100644 --- a/quickshell/Modules/Bar/Misc/SymbolButton.qml +++ b/quickshell/Modules/Bar/Misc/SymbolButton.qml @@ -11,6 +11,7 @@ Item { readonly property alias hovered: mouseArea.containsMouse property real iconSize: Fonts.icon property real radius: Style.radiusS + property bool disabledHover: false signal clicked() signal rightClicked() @@ -23,7 +24,7 @@ Item { anchors.fill: parent cursorShape: Qt.PointingHandCursor - hoverEnabled: true + hoverEnabled: !disabledHover acceptedButtons: Qt.LeftButton | Qt.RightButton onClicked: (mouse) => { if (mouse.button === Qt.RightButton) diff --git a/quickshell/Modules/Bar/Misc/TrayMenu.qml b/quickshell/Modules/Bar/Misc/TrayMenu.qml index 6a8ee3a..e695e04 100644 --- a/quickshell/Modules/Bar/Misc/TrayMenu.qml +++ b/quickshell/Modules/Bar/Misc/TrayMenu.qml @@ -151,6 +151,7 @@ PopupWindow { pointSize: Style.fontSizeS verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap + family: Fonts.sans } Image {