pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 293613 from KDE:Frameworks5

Browse Source 
- Added 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch
  (kde#339323, kde#340549, boo#924074)

OBS-URL: https://build.opensuse.org/request/show/293613
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2015-03-30 17:33:42 +00:00 committed by Git OBS Bridge
commit 67fb590b7c
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch Normal file
View File

@ -0,0 +1,63 @@
From e4c083449aee849cf316f9bd18b06e2d37684608 Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Thu, 26 Mar 2015 21:20:11 +0530
Subject: [PATCH 1/1] Fix one pixel gap between screenedge and right placed
vertical panel
Appearantly right() / bottomRight() / topRight() returns values with 1
pixel x off for historical reasons and hence 1px gap. This causes the
autohide panel not hiding automatically.
BUG: 339323
BUG: 340549
FIXED-IN: 5.3
REVIEW: 123136
(cherry picked from commit 975e5009c176eb378daa5c8f74cd4cffb64ff459)
---
shell/panelview.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index 48687ba5c2e8d41722fe3be1d078319019cb4d0b..d934da1aeb0c13da0ec25d55e32528635bd135ad 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -426,7 +426,7 @@ QRect PanelView::geometryByDistance(int distance) const
position = QPoint(QPoint(s->geometry().center().x(), s->geometry().top()) + QPoint(m_offset - size().width()/2, distance));
break;
case Qt::AlignRight:
- position = QPoint(s->geometry().topRight() - QPoint(m_offset + size().width(), distance));
+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y()) - QPoint(m_offset + size().width(), distance));
break;
case Qt::AlignLeft:
default:
@@ -440,7 +440,7 @@ QRect PanelView::geometryByDistance(int distance) const
position = QPoint(QPoint(s->geometry().left(), s->geometry().center().y()) + QPoint(distance, m_offset - size().height()/2));
break;
case Qt::AlignRight:
- position = QPoint(s->geometry().bottomLeft() - QPoint(distance, m_offset + size().height()));
+ position = QPoint(QPoint(s->geometry().left(), s->geometry().y() + s->geometry().height()) - QPoint(distance, m_offset + size().height()));
break;
case Qt::AlignLeft:
default:
@@ -451,14 +451,15 @@ QRect PanelView::geometryByDistance(int distance) const
case Plasma::Types::RightEdge:
switch (m_alignment) {
case Qt::AlignCenter:
- position = QPoint(QPoint(s->geometry().right(), s->geometry().center().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset - size().height()/2));
+ // Never use rect.right(); for historical reasons it returns left() + width() - 1; see http://doc.qt.io/qt-5/qrect.html#right
+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().center().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset - size().height()/2));
break;
case Qt::AlignRight:
- position = QPoint(s->geometry().bottomRight() - QPoint(thickness() + distance, 0) - QPoint(0, m_offset + size().height()));
+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y() + s->geometry().height()) - QPoint(thickness() + distance, 0) - QPoint(0, m_offset + size().height()));
break;
case Qt::AlignLeft:
default:
- position = QPoint(s->geometry().topRight() - QPoint(thickness() + distance, 0) + QPoint(0, m_offset));
+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset));
}
break;
--
2.3.3

6
plasma5-workspace.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 27 17:09:18 UTC 2015 - hrvoje.senjan@gmail.com
- Added 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch
(kde#339323, kde#340549, boo#924074)
-------------------------------------------------------------------
Wed Mar 25 16:07:02 UTC 2015 - hrvoje.senjan@gmail.com

2
plasma5-workspace.spec
View File

@ -35,6 +35,7 @@ Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch
# PATCHES 100-1000 and above are from upstream 5.2 branch
Patch100: 0001-Workaround-the-lockscreen-password-field-focus-issue.patch
# PATCHES 1000 and above are from upstream master/5.3 branch
Patch1000: 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch
BuildRequires: alsa-devel
BuildRequires: baloo5-devel >= %{version}
BuildRequires: kactivities5-devel >= 5.6.0
@ -187,6 +188,7 @@ workspace. Development files.
%patch1 -p1
%patch2 -p1
%patch100 -p1
%patch1000 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5