diff --git a/libkworkspace/kdisplaymanager.cpp b/libkworkspace/kdisplaymanager.cpp index 57f91d4bf..fee82faad 100644 --- a/libkworkspace/kdisplaymanager.cpp +++ b/libkworkspace/kdisplaymanager.cpp @@ -777,7 +777,7 @@ void KDisplayManager::sess2Str2(const SessEnt &se, QString &user, QString &loc) user = se.user.isEmpty() ? se.session.isEmpty() ? i18nc("… location (TTY or X display)", "Unused") : se.session == QLatin1String("") ? i18n("X login on remote host") : i18nc("… host", "X login on %1", se.session) - : se.session == QLatin1String("") + : se.session == QLatin1String("") ? se.user : i18nc("user: session type", "%1: %2", se.user, se.session); // clang-format on loc = se.vt ? QStringLiteral("%1, vt%2").arg(se.display).arg(se.vt) : se.display; diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml index 618e8e663..09cd4180a 100644 --- a/lookandfeel/contents/lockscreen/LockScreen.qml +++ b/lookandfeel/contents/lockscreen/LockScreen.qml @@ -27,11 +27,11 @@ Item { LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft LayoutMirroring.childrenInherit: true - + implicitWidth: 800 implicitHeight: 600 LockScreenUi { - anchors.fill: parent + anchors.fill: parent } } diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml index 05e1a4f45..2969e7c6c 100644 --- a/lookandfeel/contents/lockscreen/LockScreenUi.qml +++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml @@ -241,10 +241,10 @@ PlasmaCore.ColorScope { id: users Component.onCompleted: { - users.append({name: kscreenlocker_userName, - realName: kscreenlocker_userName, - icon: kscreenlocker_userImage, - + users.append({ + name: kscreenlocker_userName, + realName: kscreenlocker_userName, + icon: kscreenlocker_userImage, }) } } @@ -350,7 +350,8 @@ PlasmaCore.ColorScope { } else { mainStack.push({ item: switchSessionPage, - immediate: true}); + immediate: true, + }); } } }