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

Accepting request 834994 from home:Vogtinator:plasma5.19

Browse Source 
- Add patch to fix login button appearance with KF 5.74:
  * 0001-sddm-theme-lockscreen-Fix-login-button-size.patch

Untested, but it appears like Kubuntu ended up with an identical diff after
solving the conflict from cherry-picking.

OBS-URL: https://build.opensuse.org/request/show/834994
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=534
This commit is contained in:
Christophe Giboudeaux 2020-09-16 20:38:33 +00:00 committed by Git OBS Bridge
parent 64587fbe14
commit 48d4851cc4
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
0001-sddm-theme-lockscreen-Fix-login-button-size.patch Normal file
View File

@ -0,0 +1,45 @@
From 2f9129410401c2d734aff1602b37be70cebbb74b Mon Sep 17 00:00:00 2001
From: Noah Davis <noahadvs@gmail.com>
Date: Mon, 14 Sep 2020 10:18:57 -0400
Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size
Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue.
(cherry picked from commit 9a8fc811282e303ec2f93c978228a85961dae263)
---
lookandfeel/contents/lockscreen/MainBlock.qml | 3 ++-
sddm-theme/Login.qml | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
index 4bd5df0e5..70b43d959 100644
--- a/lookandfeel/contents/lockscreen/MainBlock.qml
+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
@@ -97,7 +97,8 @@ SessionManagementScreen {
PlasmaComponents.Button {
id: loginButton
Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
+ Layout.preferredHeight: passwordBox.implicitHeight
+ Layout.preferredWidth: loginButton.Layout.preferredHeight
PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
anchors.fill: parent
diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
index 49d6805d8..3daaebf57 100644
--- a/sddm-theme/Login.qml
+++ b/sddm-theme/Login.qml
@@ -112,8 +112,8 @@ SessionManagementScreen {
PlasmaComponents.Button {
id: loginButton
Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")
- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
- Layout.rightMargin: 1 // prevents it from extending beyond the username field
+ Layout.preferredHeight: passwordBox.implicitHeight
+ Layout.preferredWidth: loginButton.Layout.preferredHeight
PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
anchors.fill: parent
--
2.25.1

6
plasma5-workspace.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 16 20:18:17 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix login button appearance with KF 5.74:
* 0001-sddm-theme-lockscreen-Fix-login-button-size.patch
-------------------------------------------------------------------
Fri Sep 4 10:42:01 UTC 2020 - Hans-Peter Jansen <hpj@urpla.net>

1
plasma5-workspace.spec
View File

@ -50,6 +50,7 @@ Patch503: 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
# PATCH-FIX-UPSTREAM
Patch510: 0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch
Patch511: 0001-sddm-theme-lockscreen-Fix-login-button-size.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem