summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-06-27 03:18:37 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-06-27 03:19:07 +1000
commit1143b8d33309489ded30c7ea409a47c6b01efb72 (patch)
treee1cb864404e6ac1c8334bcd7a38ffe15764db543 /kde-plasma/plasma-workspace/files
parentdev-util/xxdiff: remove old (diff)
downloadgentoo-1143b8d33309489ded30c7ea409a47c6b01efb72.tar.gz
gentoo-1143b8d33309489ded30c7ea409a47c6b01efb72.tar.bz2
gentoo-1143b8d33309489ded30c7ea409a47c6b01efb72.zip
kde-plasma/plasma-workspace: backport patch from upstream to fix panel geometry
This resolves a regression introduced by plasma-workspace-5.6.5-drop-kscreen-dep.patch. Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-plasma/plasma-workspace/files')
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch
new file mode 100644
index 000000000000..4fc7bd202335
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch
@@ -0,0 +1,29 @@
+From b866bbe75e04584f0a54980c2c21cba2eadc123b Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 13 Jun 2016 14:23:43 +0200
+Subject: [PATCH] use the whole geometry for the struts
+
+screen()->virtualSize() is the union of the sizes
+of all screens
+screen()->geometry().size() is the size of just the
+single screen
+---
+ shell/panelview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index fb965e8..b27c18b 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -856,7 +856,7 @@ void PanelView::updateStruts()
+ if (m_visibilityMode == NormalPanel) {
+ const QRect thisScreen = screen()->geometry();
+ // QScreen::virtualGeometry() is very unreliable (Qt 5.5)
+- const QRect wholeScreen = QRect(QPoint(0, 0), screen()->geometry().size());
++ const QRect wholeScreen = QRect(QPoint(0, 0), screen()->virtualSize());
+
+ //Extended struts against a screen edge near to another screen are really harmful, so windows maximized under the panel is a lesser pain
+ //TODO: force "windows can cover" in those cases?
+--
+2.7.3
+