File 2007-sddm.patch of Package plasma6-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 2007-sddm.patch of Package plasma6-workspace

diff --git a/lookandfeel/components/Clock.qml b/lookandfeel/components/Clock.qml
index a6effdefcf619fef6c8f727471238cbbb32481f8..a6242480451864ff2cc406aad0c235be9ba3c294 100644
--- a/lookandfeel/components/Clock.qml
+++ b/lookandfeel/components/Clock.qml
@@ -18,14 +18,14 @@ ColumnLayout {
         text: Qt.formatTime(timeSource.data["Local"]["DateTime"], Qt.locale(), Locale.ShortFormat)
         style: softwareRendering ? Text.Outline : Text.Normal
         styleColor: softwareRendering ? Kirigami.Theme.backgroundColor : "transparent" //no outline, doesn't matter
-        font.pointSize: 48
+        font.pointSize: Kirigami.Theme.defaultFont.pointSize * 4.8
         Layout.alignment: Qt.AlignHCenter
     }
     PlasmaComponents3.Label {
         text: Qt.formatDate(timeSource.data["Local"]["DateTime"], Qt.locale(), Locale.LongFormat)
         style: softwareRendering ? Text.Outline : Text.Normal
         styleColor: softwareRendering ? Kirigami.Theme.backgroundColor : "transparent" //no outline, doesn't matter
-        font.pointSize: 24
+        font.pointSize: Kirigami.Theme.defaultFont.pointSize * 2.4
         Layout.alignment: Qt.AlignHCenter
     }
     P5Support.DataSource {
diff --git a/lookandfeel/sddm-theme/Login.qml b/lookandfeel/sddm-theme/Login.qml
index 4a09aea446b2f6a1de28873a963a27b6fcd79f96..f7405e35f6241890af42ca5c7086628856f17573 100644
--- a/lookandfeel/sddm-theme/Login.qml
+++ b/lookandfeel/sddm-theme/Login.qml
@@ -21,7 +21,7 @@ SessionManagementScreen {
     property int visibleBoundary: mapFromItem(loginButton, 0, 0).y
     onHeightChanged: visibleBoundary = mapFromItem(loginButton, 0, 0).y + loginButton.height + Kirigami.Units.smallSpacing
 
-    property int fontSize: parseInt(config.fontSize)
+    property real fontSize: Kirigami.Theme.defaultFont.pointSize
 
     signal loginRequest(string username, string password)
 
diff --git a/lookandfeel/sddm-theme/Main.qml b/lookandfeel/sddm-theme/Main.qml
index 40853b7f4131313e65607741b9bcc0e2e073ab6d..2a54c2b87ef913e404321a4b9bbd20ef2f7e2933 100644
--- a/lookandfeel/sddm-theme/Main.qml
+++ b/lookandfeel/sddm-theme/Main.qml
@@ -15,11 +15,6 @@ import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.breeze.components
 
-// TODO: Once SDDM 0.19 is released and we are setting the font size using the
-// SDDM KCM's syncing feature, remove the `config.fontSize` overrides here and
-// the fontSize properties in various components, because the theme's default
-// font size will be correctly propagated to the login screen
-
 Item {
     id: root
 
@@ -211,28 +206,28 @@ Item {
                     ActionButton {
                         iconSource: "system-suspend"
                         text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Suspend to RAM", "Sleep")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: sddm.suspend()
                         enabled: sddm.canSuspend
                     },
                     ActionButton {
                         iconSource: "system-reboot"
                         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Restart")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: sddm.reboot()
                         enabled: sddm.canReboot
                     },
                     ActionButton {
                         iconSource: "system-shutdown"
                         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Shut Down")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: sddm.powerOff()
                         enabled: sddm.canPowerOff
                     },
                     ActionButton {
                         iconSource: "system-user-prompt"
                         text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "For switching to a username and password prompt", "Other…")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: mainStack.push(userPromptComponent)
                         enabled: true
                         visible: !userListComponent.showUsernamePrompt
@@ -330,7 +325,7 @@ Item {
                 showUsernamePrompt: true
                 notificationMessage: root.notificationMessage
                 loginScreenUiVisible: loginScreenRoot.uiVisible
-                fontSize: parseInt(config.fontSize) + 2
+                fontSize: Kirigami.Theme.defaultFont.pointSize + 2
 
                 // using a model rather than a QObject list to avoid QTBUG-75900
                 userListModel: ListModel {
@@ -355,28 +350,28 @@ Item {
                     ActionButton {
                         iconSource: "system-suspend"
                         text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Suspend to RAM", "Sleep")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: sddm.suspend()
                         enabled: sddm.canSuspend
                     },
                     ActionButton {
                         iconSource: "system-reboot"
                         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Restart")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: sddm.reboot()
                         enabled: sddm.canReboot
                     },
                     ActionButton {
                         iconSource: "system-shutdown"
                         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Shut Down")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: sddm.powerOff()
                         enabled: sddm.canPowerOff
                     },
                     ActionButton {
                         iconSource: "system-user-list"
                         text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "List Users")
-                        fontSize: parseInt(config.fontSize) + 1
+                        fontSize: Kirigami.Theme.defaultFont.pointSize + 1
                         onClicked: mainStack.pop()
                     }
                 ]
@@ -451,7 +446,6 @@ Item {
                 id: virtualKeyboardButton
 
                 text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Button to show/hide virtual keyboard", "Virtual Keyboard")
-                font.pointSize: config.fontSize
                 icon.name: inputPanel.keyboardActive ? "input-keyboard-virtual-on" : "input-keyboard-virtual-off"
                 onClicked: {
                     // Otherwise the password field loses focus and virtual keyboard
@@ -473,8 +467,6 @@ Item {
             KeyboardButton {
                 id: keyboardButton
 
-                font.pointSize: config.fontSize
-
                 onKeyboardLayoutChanged: {
                     // Otherwise the password field loses focus and virtual keyboard
                     // keystrokes get eaten
@@ -493,8 +485,6 @@ Item {
             SessionButton {
                 id: sessionButton
 
-                font.pointSize: config.fontSize
-
                 onSessionChanged: {
                     // Otherwise the password field loses focus and virtual keyboard
                     // keystrokes get eaten
@@ -515,9 +505,7 @@ Item {
                 Layout.fillWidth: true
             }
 
-            Battery {
-                fontSize: config.fontSize
-            }
+            Battery {}
         }
     }

Places

File 2007-sddm.patch of Package plasma6-workspace

Places