From 3b8c0f0ababd98cc53460063391903a925a22749 Mon Sep 17 00:00:00 2001 From: Filip Fila Date: Fri, 13 Dec 2019 10:38:17 +0100 Subject: [PATCH] Revert "Revert "Revert "[sddm-theme] Fix initial focus after SDDM QQC2 Port""" This reverts commit d46b0186655caca295f7b68da1850cfd0d7f1c56. Due to the looming LTS release date and bugs (415098, 414873, 4145094, 414852) that keep piling up, we are reverting the QQC2 and PC3 port of the SDDM theme. Since this patch was also related to that port, we need to revert it as well. --- lookandfeel/contents/components/SessionManagementScreen.qml | 2 +- lookandfeel/contents/lockscreen/LockScreenUi.qml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lookandfeel/contents/components/SessionManagementScreen.qml b/lookandfeel/contents/components/SessionManagementScreen.qml index 823705e73..5f8826048 100644 --- a/lookandfeel/contents/components/SessionManagementScreen.qml +++ b/lookandfeel/contents/components/SessionManagementScreen.qml @@ -25,7 +25,7 @@ import QtQuick.Controls 1.1 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents -FocusScope { +Item { id: root /* diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml index cac457114..4501bb873 100644 --- a/lookandfeel/contents/lockscreen/LockScreenUi.qml +++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml @@ -233,7 +233,6 @@ PlasmaCore.ColorScope { showUserList: userList.y + mainStack.y > 0 - focus: true // Drop this and hack below when porting this stackview to QQC2 Stack.onStatusChanged: { // prepare for presenting again to the user if (Stack.status == Stack.Activating) {