From dd4176d1f669809cfe9e85b336413365a717d7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= <kcohar@gmail.com>
Date: Sat, 2 Mar 2019 05:52:31 +0100
Subject: [PATCH] [sddm-theme/lock screen] Adjust login screen and lock screen
 font sizes

Summary: This patch increases the font size of the username and action button labels for better readability.

Test Plan:
Before:
{F6645900}
After:
{F6646411}

For reference, level 4:
{F6645901}

Reviewers: #vdg, #plasma, ngraham

Reviewed By: #vdg, ngraham

Subscribers: filipf, ngraham, plasma-devel

Tags: #plasma

Maniphest Tasks: T10325

Differential Revision: https://phabricator.kde.org/D19433
---
 lookandfeel/contents/components/ActionButton.qml |  2 ++
 lookandfeel/contents/components/UserDelegate.qml | 16 ++++++++++++----
 lookandfeel/contents/lockscreen/MainBlock.qml    |  2 ++
 lookandfeel/contents/logout/Logout.qml           |  4 ++++
 sddm-theme/Login.qml                             |  3 +++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
index 098961405..e786f2a2b 100644
--- a/lookandfeel/contents/components/ActionButton.qml
+++ b/lookandfeel/contents/components/ActionButton.qml
@@ -48,8 +48,10 @@ Item {
         colorGroup: PlasmaCore.ColorScope.colorGroup
         active: mouseArea.containsMouse || root.activeFocus
     }
+    
     PlasmaComponents.Label {
         id: label
+        font.pointSize: 11
         anchors {
             top: icon.bottom
             topMargin: units.smallSpacing
diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
index 1afc6a84a..8a997a26c 100644
--- a/lookandfeel/contents/components/UserDelegate.qml
+++ b/lookandfeel/contents/components/UserDelegate.qml
@@ -41,7 +41,7 @@ Item {
     property bool constrainText: true
     signal clicked()
 
-    property real faceSize: Math.min(width, height - usernameDelegate.height - units.largeSpacing)
+    property real faceSize: Math.min(width, height - usernameDelegate.height - units.smallSpacing)
 
     opacity: isCurrent ? 1.0 : 0.5
 
@@ -65,7 +65,11 @@ Item {
 
     Item {
         id: imageSource
-        anchors.horizontalCenter: parent.horizontalCenter
+        anchors {
+            bottom: usernameDelegate.top
+            bottomMargin: units.largeSpacing
+            horizontalCenter: parent.horizontalCenter
+        }
         width: faceSize
         height: faceSize
 
@@ -89,8 +93,11 @@ Item {
     }
 
     ShaderEffect {
-        anchors.top: parent.top
-        anchors.horizontalCenter: parent.horizontalCenter
+        anchors {
+            bottom: usernameDelegate.top
+            bottomMargin: units.largeSpacing
+            horizontalCenter: parent.horizontalCenter
+        }
 
         width: imageSource.width
         height: imageSource.height
@@ -162,6 +169,7 @@ Item {
     
     PlasmaComponents.Label {
         id: usernameDelegate
+        font.pointSize: 12
         anchors {
             bottom: parent.bottom
             horizontalCenter: parent.horizontalCenter
diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
index 97e7e9433..17910ff95 100644
--- a/lookandfeel/contents/lockscreen/MainBlock.qml
+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
@@ -53,6 +53,7 @@ SessionManagementScreen {
 
     PlasmaComponents.TextField {
         id: passwordBox
+        font.pointSize: 11
         Layout.fillWidth: true
 
         placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password")
@@ -92,6 +93,7 @@ SessionManagementScreen {
 
     PlasmaComponents.Button {
         id: loginButton
+        font.pointSize: 11
         Layout.fillWidth: true
 
         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
index d3eff2f10..97a6a8cd2 100644
--- a/lookandfeel/contents/logout/Logout.qml
+++ b/lookandfeel/contents/logout/Logout.qml
@@ -141,6 +141,7 @@ PlasmaCore.ColorScope {
         width: Math.max(implicitWidth, units.gridUnit * 16)
 
         PlasmaComponents.Label {
+            font.pointSize: 11
             Layout.maximumWidth: units.gridUnit * 16
             Layout.alignment: Qt.AlignHCenter
             Layout.fillWidth: true
@@ -208,6 +209,7 @@ PlasmaCore.ColorScope {
         }
 
         PlasmaComponents.Label {
+            font.pointSize: 11
             Layout.alignment: Qt.AlignHCenter
             //opacity, as visible would re-layout
             opacity: countDownTimer.running ? 1 : 0
@@ -232,11 +234,13 @@ PlasmaCore.ColorScope {
         RowLayout {
             Layout.alignment: Qt.AlignHCenter
             PlasmaComponents.Button {
+                font.pointSize: 11
                 enabled: root.currentAction != null
                 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "OK")
                 onClicked: root.currentAction()
             }
             PlasmaComponents.Button {
+                font.pointSize: 11
                 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel")
                 onClicked: root.cancelRequested()
             }
diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
index cebf10e89..c710b6a2f 100644
--- a/sddm-theme/Login.qml
+++ b/sddm-theme/Login.qml
@@ -44,6 +44,7 @@ SessionManagementScreen {
 
     PlasmaComponents.TextField {
         id: userNameInput
+        font.pointSize: 11
         Layout.fillWidth: true
 
         text: lastUserName
@@ -59,6 +60,7 @@ SessionManagementScreen {
 
     PlasmaComponents.TextField {
         id: passwordBox
+        font.pointSize: 11
         Layout.fillWidth: true
 
         placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password")
@@ -99,6 +101,7 @@ SessionManagementScreen {
     }
     PlasmaComponents.Button {
         id: loginButton
+        font.pointSize: 11
         Layout.fillWidth: true
 
         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")