From 3f0333b4a098ddb882613569999e4366bedf0991 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 12 Dec 2025 05:12:02 +0100 Subject: [PATCH] Kde/patches: add more patches --- roles/kde/patches/plasma-desktop/patches.txt | 1 + roles/kde/patches/plasma-desktop/pr3356.patch | 37 +++++ roles/kde/patches/spectacle/patches.txt | 3 + roles/kde/patches/spectacle/pr493.patch | 129 ++++++++++++++++++ 4 files changed, 170 insertions(+) create mode 100644 roles/kde/patches/plasma-desktop/pr3356.patch create mode 100644 roles/kde/patches/spectacle/pr493.patch diff --git a/roles/kde/patches/plasma-desktop/patches.txt b/roles/kde/patches/plasma-desktop/patches.txt index 50ee310..84f4a14 100644 --- a/roles/kde/patches/plasma-desktop/patches.txt +++ b/roles/kde/patches/plasma-desktop/patches.txt @@ -3,3 +3,4 @@ Plasma 6.6.0: Pr 3256 https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/3256 Pr 3259 https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/3259 Pr 3269 https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/3269 +Pr 3356 https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/3356 diff --git a/roles/kde/patches/plasma-desktop/pr3356.patch b/roles/kde/patches/plasma-desktop/pr3356.patch new file mode 100644 index 0000000..3d47aca --- /dev/null +++ b/roles/kde/patches/plasma-desktop/pr3356.patch @@ -0,0 +1,37 @@ +From 04c747a41d8c01248c7baeec5c852c2298f76fc3 Mon Sep 17 00:00:00 2001 +From: Christoph Wolk +Date: Mon, 1 Dec 2025 14:36:09 +0100 +Subject: [PATCH] applets/kickoff: also close when triggering from footer menu + +Kickoff already closes when one of the power/session buttons from the +menu is pressed, but the same does not happen if the same action is +shown in the overflow menu. + +Instead, also close kickoff in that case. + +CCBUG: 508725 +--- + applets/kickoff/LeaveButtons.qml | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/applets/kickoff/LeaveButtons.qml b/applets/kickoff/LeaveButtons.qml +index c9a14dc3254..acf83639341 100644 +--- a/applets/kickoff/LeaveButtons.qml ++++ b/applets/kickoff/LeaveButtons.qml +@@ -214,7 +214,12 @@ RowLayout { + + text: model.display + icon: model.decoration +- onClicked: filteredMenuItemsModel.trigger(index) ++ onClicked: { ++ filteredMenuItemsModel.trigger(index) ++ if (kickoff.hideOnWindowDeactivate) { ++ kickoff.expanded = false; ++ } ++ } + } + onObjectAdded: (index, object) => contextMenu.addMenuItem(object) + onObjectRemoved: (index, object) => contextMenu.removeMenuItem(object) +-- +GitLab + diff --git a/roles/kde/patches/spectacle/patches.txt b/roles/kde/patches/spectacle/patches.txt index 34909b4..e11d502 100644 --- a/roles/kde/patches/spectacle/patches.txt +++ b/roles/kde/patches/spectacle/patches.txt @@ -1,2 +1,5 @@ Pr 462 https://invent.kde.org/plasma/spectacle/-/merge_requests/462 Pr 487 https://invent.kde.org/plasma/spectacle/-/merge_requests/487 + +Plasma 6.6.0: +Pr 493 https://invent.kde.org/plasma/spectacle/-/merge_requests/493 diff --git a/roles/kde/patches/spectacle/pr493.patch b/roles/kde/patches/spectacle/pr493.patch new file mode 100644 index 0000000..d6db2f7 --- /dev/null +++ b/roles/kde/patches/spectacle/pr493.patch @@ -0,0 +1,129 @@ +From 49c615c1989d9fcfce7ed1be805538a9dca6a8a8 Mon Sep 17 00:00:00 2001 +From: Taras Oleksyn +Date: Sat, 29 Nov 2025 10:17:28 +0200 +Subject: [PATCH] Add cancel button to capture window to improve touchscreen + usability + +BUG: 490980 +--- + src/CMakeLists.txt | 1 + + src/Gui/CancelAction.qml | 11 +++++++++++ + src/Gui/CaptureOverlay.qml | 14 ++++++++++++++ + src/Gui/CaptureWindow.cpp | 5 +++++ + src/Gui/CaptureWindow.h | 1 + + src/PlasmaVersion.h | 2 +- + 6 files changed, 33 insertions(+), 1 deletion(-) + create mode 100644 src/Gui/CancelAction.qml + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 23fc4f483..f4957bda7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -158,6 +158,7 @@ qt_target_qml_sources(spectacle + Gui/AnnotationOptionsToolBarContents.qml + Gui/AnnotationsToolBarContents.qml + Gui/ButtonGrid.qml ++ Gui/CancelAction.qml + Gui/CaptureModeButtonsColumn.qml + Gui/CaptureOptions.qml + Gui/CaptureOverlay.qml +diff --git a/src/Gui/CancelAction.qml b/src/Gui/CancelAction.qml +new file mode 100644 +index 000000000..74bf54816 +--- /dev/null ++++ b/src/Gui/CancelAction.qml +@@ -0,0 +1,11 @@ ++/* SPDX-FileCopyrightText: 2025 Noah Davis ++ * SPDX-License-Identifier: LGPL-2.0-or-later ++ */ ++ ++import QtQuick.Templates as T ++ ++T.Action { ++ icon.name: "dialog-cancel" ++ text: i18nc("@action cancel selection", "Cancel") ++ onTriggered: contextWindow.cancel() ++} +diff --git a/src/Gui/CaptureOverlay.qml b/src/Gui/CaptureOverlay.qml +index e5089934d..5c15d9939 100644 +--- a/src/Gui/CaptureOverlay.qml ++++ b/src/Gui/CaptureOverlay.qml +@@ -491,6 +491,11 @@ MouseArea { + visible: action.enabled + action: AcceptAction {} + } ++ ToolButton { ++ display: TtToolButton.TextBesideIcon ++ visible: action.enabled ++ action: CancelAction {} ++ } + ToolButton { + display: TtToolButton.IconOnly + visible: action.enabled +@@ -527,6 +532,10 @@ MouseArea { + visible: action.enabled + action: AcceptAction {} + } ++ ToolButton { ++ visible: action.enabled ++ action: CancelAction {} ++ } + ToolButton { + visible: action.enabled + action: SaveAction {} +@@ -560,6 +569,11 @@ MouseArea { + visible: action.enabled + action: RecordAction {} + } ++ ToolButton { ++ display: TtToolButton.TextBesideIcon ++ visible: action.enabled ++ action: CancelAction {} ++ } + } + } + +diff --git a/src/Gui/CaptureWindow.cpp b/src/Gui/CaptureWindow.cpp +index cb8ce97ab..c263d1b45 100644 +--- a/src/Gui/CaptureWindow.cpp ++++ b/src/Gui/CaptureWindow.cpp +@@ -129,6 +129,11 @@ bool CaptureWindow::accept() + return SelectionEditor::instance()->acceptSelection(); + } + ++void CaptureWindow::cancel() ++{ ++ SpectacleCore::instance()->cancelScreenshot(); ++} ++ + void CaptureWindow::save() + { + SelectionEditor::instance()->acceptSelection(ExportManager::Save | ExportManager::UserAction); +diff --git a/src/Gui/CaptureWindow.h b/src/Gui/CaptureWindow.h +index b5e87a834..0d50aac90 100644 +--- a/src/Gui/CaptureWindow.h ++++ b/src/Gui/CaptureWindow.h +@@ -34,6 +34,7 @@ public: + + public Q_SLOTS: + bool accept(); ++ void cancel(); + void save() override; + void saveAs() override; + void copyImage() override; +diff --git a/src/PlasmaVersion.h b/src/PlasmaVersion.h +index 08502c895..9518da62b 100644 +--- a/src/PlasmaVersion.h ++++ b/src/PlasmaVersion.h +@@ -15,7 +15,7 @@ public: + static quint32 get(); + + /** +- * Use this for plasama versions the same way you'd use QT_VERSION_CHECK() ++ * Use this for plasma versions the same way you'd use QT_VERSION_CHECK() + */ + static quint32 check(quint8 major, quint8 minor, quint8 patch); + +-- +GitLab +