[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     decd45a692fd074be7165ffd4f5e269fc94bf2dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 17:16:25 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 20:07:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=decd45a6

kde-plasma/plasma-workspace: Prevent panel going out of screen boundaries

See also: https://bugs.kde.org/show_bug.cgi?id=450068

Upstream commit 9c7ac7061c5c85d63875eaee70793ba04334c1d0

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=353975
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=438114

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ace-5.25.5-prevent-panel-go-out-of-screen.patch | 33 ++++++++++++++++++++++
 .../plasma-workspace-5.25.5-r3.ebuild              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
new file mode 100644
index 000000000000..457470f0807c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
@@ -0,0 +1,33 @@
+From 9c7ac7061c5c85d63875eaee70793ba04334c1d0 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 16 Sep 2022 14:34:27 +0000
+Subject: [PATCH] Revert "Revert "Prevent panel going out of screen
+ boundaries""
+
+This reverts commit 17774bc4c673294a7c8a6e80660d83cce1ba8891
+
+There is still a known culprit (duplicate display names) so the hack shouldn't be reverted.
+
+CCBUG: 353975
+CCBUG: 438114
+---
+ shell/panelview.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index b5c87bbf71..4be1e26ca4 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
+     updateEnabledBorders();
+     m_strutsTimer.start(STRUTSTIMERDELAY);
+     PlasmaQuick::ContainmentView::moveEvent(ev);
++    if (m_screenToFollow && !m_screenToFollow->geometry().contains(geometry())) {
++        positionPanel();
++    }
+ }
+ 
+ void PanelView::keyPressEvent(QKeyEvent *event)
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
index 5e8c8067b58e..212a7c1e7178 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild
@@ -159,6 +159,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html
 	"${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
 	"${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140
+	"${FILESDIR}/${P}-prevent-panel-go-out-of-screen.patch" # git master and Plasma/5.24 branch double revert
 )
 
 src_prepare() {