12
0

- Add fix-logout-button-sizing.patch: Upstream fix to ensure that

logout/shutdown and cancel buttons on the logout screen have 
  all the same size.

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=113
This commit is contained in:
Luca Beltrame
2015-09-16 18:41:38 +00:00
committed by Git OBS Bridge
parent 72ae3e7e02
commit af8e63318d
3 changed files with 41 additions and 0 deletions

View File

@@ -0,0 +1,30 @@
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 15 Sep 2015 09:16:16 +0000
Subject: Make sure the cancel and shutdown/logout button have the same size
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=93bf81eea152e2b8261ac4a854207af448ed7c43
---
Make sure the cancel and shutdown/logout button have the same size
REVIEW: 125235
---
--- a/lookandfeel/contents/components/LogoutScreen.qml
+++ b/lookandfeel/contents/components/LogoutScreen.qml
@@ -130,12 +130,15 @@
anchors.centerIn: parent
PlasmaComponents.Button {
+ id: cancelButton
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Cancel")
onClicked: root.cancel()
+ Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
}
PlasmaComponents.Button {
id: commitButton
+ Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
onClicked: root.currentAction()
focus: true

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 16 18:39:29 UTC 2015 - lbeltrame@kde.org
- Add fix-logout-button-sizing.patch: Upstream fix to ensure that
logout/shutdown and cancel buttons on the logout screen have
all the same size.
-------------------------------------------------------------------
Thu Sep 10 17:19:32 UTC 2015 - hrvoje.senjan@gmail.com

View File

@@ -31,8 +31,11 @@ Source99: %{name}-rpmlintrc
Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
Patch1: create_kdehome.patch
# PATCH-FIX-UPSTREAM: fix-logout-button-sizing.patch lbeltrame@kde.org -- Ensure all logout buttons have the same size
Patch2: fix-logout-button-sizing.patch
# PATCHES 100-200 and above are from upstream 5.3 branch
# PATCHES 201-300 and above are from upstream master/5.4 branch
BuildRequires: alsa-devel
BuildRequires: baloo5-devel >= %{version}
BuildRequires: kactivities5-devel >= 5.12.0
@@ -189,6 +192,7 @@ workspace. Development files.
%setup -q -n plasma-workspace-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5