From b717baf4ba6ed4cab1079a99227eb20a76244fbf Mon Sep 17 00:00:00 2001 From: kurrycat <44340227+kurrycat2004@users.noreply.github.com> Date: Wed, 12 Nov 2025 00:16:35 +0100 Subject: [PATCH] allow update-text toggle without command + disable update-text toggle in text stream mode --- Modules/Bar/Widgets/CustomButton.qml | 12 +++++++++--- .../Bar/WidgetSettings/CustomButtonSettings.qml | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml index 7e03fdb1..96de2515 100644 --- a/Modules/Bar/Widgets/CustomButton.qml +++ b/Modules/Bar/Widgets/CustomButton.qml @@ -213,20 +213,24 @@ Item { if (leftClickExec) { Quickshell.execDetached(["sh", "-c", leftClickExec]) Logger.i("CustomButton", `Executing command: ${leftClickExec}`) - if (leftClickUpdateText) runTextCommand() } else if (!hasExec) { // No script was defined, open settings var settingsPanel = PanelService.getPanel("settingsPanel", screen) settingsPanel.requestedTab = SettingsPanel.Tab.Bar settingsPanel.open() } + if (!textStream && leftClickUpdateText) { + runTextCommand() + } } function onRightClicked() { if (rightClickExec) { Quickshell.execDetached(["sh", "-c", rightClickExec]) Logger.i("CustomButton", `Executing command: ${rightClickExec}`) - if (rightClickUpdateText) runTextCommand() + } + if (!textStream && rightClickUpdateText) { + runTextCommand() } } @@ -234,7 +238,9 @@ Item { if (middleClickExec) { Quickshell.execDetached(["sh", "-c", middleClickExec]) Logger.i("CustomButton", `Executing command: ${middleClickExec}`) - if (middleClickUpdateText) runTextCommand() + } + if (!textStream && middleClickUpdateText) { + runTextCommand() } } diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml index 31c38c71..208d4e11 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml @@ -79,6 +79,7 @@ ColumnLayout { NToggle { id: leftClickUpdateText + enabled: !valueTextStream Layout.alignment: Qt.AlignRight | Qt.AlignBottom Layout.bottomMargin: Style.marginS onEntered: TooltipService.show(Screen, leftClickUpdateText, I18n.tr("bar.widget-settings.custom-button.left-click.update-text"), "auto") @@ -102,6 +103,7 @@ ColumnLayout { NToggle { id: rightClickUpdateText + enabled: !valueTextStream Layout.alignment: Qt.AlignRight | Qt.AlignBottom Layout.bottomMargin: Style.marginS onEntered: TooltipService.show(Screen, rightClickUpdateText, I18n.tr("bar.widget-settings.custom-button.right-click.update-text"), "auto") @@ -125,6 +127,7 @@ ColumnLayout { NToggle { id: middleClickUpdateText + enabled: !valueTextStream Layout.alignment: Qt.AlignRight | Qt.AlignBottom Layout.bottomMargin: Style.marginS onEntered: TooltipService.show(Screen, middleClickUpdateText, I18n.tr("bar.widget-settings.custom-button.middle-click.update-text"), "auto")