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

Accepting request 949286 from home:Vogtinator:plasma5.24

Browse Source 
- Add patch to fix initial focus in SDDM (kde#447817):
  * 0001-Make-SessionManagementScreen-a-FocusScope.patch
- Add patch to fix initial focus in the lockscreen:
  * 0001-Fix-initial-focus-in-LockScreenUi.patch

OBS-URL: https://build.opensuse.org/request/show/949286
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=626
This commit is contained in:
Luca Beltrame
2022-01-27 09:37:12 +00:00
committed by Git OBS Bridge
parent ae81239647
commit bee4fc0fd6
4 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Fix-initial-focus-in-LockScreenUi.patch Normal file
View File

@@ -0,0 +1,29 @@
From a66dcbdda752aaeda2b6163749ae5eb166180259 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 24 Jan 2022 22:36:38 +0100
Subject: [PATCH] Fix initial focus in LockScreenUi
SessionManagementScreen is a FocusScope and needs focus explicitly assigned
to it. If inside a QQC2 StackView this is taken care of, but for some reason
in a QQC1 StackView this isn't the case for the initial item. Do it explicitly.
---
lookandfeel/contents/lockscreen/LockScreenUi.qml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
index 7e1a96a7f..25b7b2d92 100644
--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
@@ -230,6 +230,9 @@ PlasmaCore.ColorScope {
id: mainBlock
lockScreenUiVisible: lockScreenRoot.uiVisible
+ // This is a focus scope and QQC1 StackView (unlike QQC2) does not set focus to the current item
+ focus: true
+
showUserList: userList.y + mainStack.y > 0
Stack.onStatusChanged: {
--
2.34.0

32
0001-Make-SessionManagementScreen-a-FocusScope.patch Normal file
View File

@@ -0,0 +1,32 @@
From 6b5159dfa03b7b6e34e61b18552fb3405ee8a5e5 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 21 Jan 2022 22:34:39 +0100
Subject: [PATCH] Make SessionManagementScreen a FocusScope
SessionManagementScreen needs to be a FocusScope, so that when it gets focused
directly (through the StackView), it directs it to the proper control inside
instead of stealing it from them.
This fixes initial focus of the controls in the SDDM theme.
BUG: 447817
---
lookandfeel/contents/components/SessionManagementScreen.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lookandfeel/contents/components/SessionManagementScreen.qml b/lookandfeel/contents/components/SessionManagementScreen.qml
index f002e516b..8f3eb2a33 100644
--- a/lookandfeel/contents/components/SessionManagementScreen.qml
+++ b/lookandfeel/contents/components/SessionManagementScreen.qml
@@ -12,7 +12,7 @@ import QtQuick.Controls 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents3
-Item {
+FocusScope {
id: root
/*
--
2.33.1

8
plasma5-workspace.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jan 22 13:09:31 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix initial focus in SDDM (kde#447817):
* 0001-Make-SessionManagementScreen-a-FocusScope.patch
- Add patch to fix initial focus in the lockscreen:
* 0001-Fix-initial-focus-in-LockScreenUi.patch
-------------------------------------------------------------------
Thu Jan 13 20:30:34 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

2
plasma5-workspace.spec
View File

@@ -44,6 +44,8 @@ Source3: xprop-kde-full-session.desktop
# PATCH-FIX-UPSTREAM
Patch1: 0001-sddm-theme-Change-wallpaper-extension-so-that-it-poi.patch
Patch2: 0001-systemdialogs-Remove-leftover-and-broken-components.patch
Patch3: 0001-Make-SessionManagementScreen-a-FocusScope.patch
Patch4: 0001-Fix-initial-focus-in-LockScreenUi.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch