Merge branch 'Plasma/6.7' into 'Plasma/6.7'

Fix aero style highlighted text

See merge request aeroshell/atp/aerothemeplasma!75

plasma/shells/io.gitgud.wackyideas.desktop/contents/lockscreen/AuthUI.qml

@@ -29,8 +29,8 @@ Item {
 
     signal switchUserClicked()
 
-    property list<string> notification: []
-    property list<string> notificationIcon: []
+    property string notification
+    property string notificationIcon
 
     property alias switchUserVisible: switchUser.visible
     property bool  capsLockOn: false
@@ -48,17 +48,12 @@ Item {
     }
 
     function showMessage(message: string, icon: string) {
-        if(icon == "dialog-error") {
-            root.notificationIcon = [icon, ...root.notificationIcon];
-            root.notification = [message, ...root.notification];
-        } else {
-            root.notificationIcon.push(icon);
-            root.notification.push(message);
-        }
         if(!statusPage.visible) {
             pageView.replaceCurrentItem(statusPage);
             k.forceActiveFocus();
         }
+        root.notification = message;
+        root.notificationIcon = icon;
     }
 
     component CorrectedLabel: Text {
@@ -109,10 +104,10 @@ Item {
             showMessage(i18nd("kscreenlocker_greet", "The user name or password is incorrect."), "dialog-error");
         }
         function onBusyChanged() {
-            /*if(!authenticator.busy && !statusPage.visible) {
+            if(!authenticator.busy) {
                 root.notification = "";
                 root.notificationIcon = "";
-            }*/
+            }
         }
         function onInfoMessageChanged() {
             showMessage(authenticator.infoMessage, "dialog-information");
@@ -426,9 +421,7 @@ Item {
                 id: statusPage
 
                 visible: pageView.currentItem == statusPage
-                onVisibleChanged: {
-                    k.forceActiveFocus();
-                }
+                onVisibleChanged: k.forceActiveFocus();
 
                 ColumnLayout {
                     anchors.centerIn: parent
@@ -437,19 +430,17 @@ Item {
                     spacing: 40
 
                     RowLayout {
-                        id: statusLabel
-                        Layout.fillWidth: true
                         Kirigami.Icon {
                             implicitHeight: 32
                             implicitWidth: 32
 
-                            source: root.notificationIcon.length > 0 ? root.notificationIcon[0] : ""
+                            source: root.notificationIcon
                         }
 
                         CorrectedLabel {
                             Layout.alignment: Qt.AlignVCenter
                             color: "white"
-                            text: root.notification.length > 0 ? root.notification[0] : ""
+                            text: root.notification
                         }
                     }
 
@@ -458,16 +449,10 @@ Item {
 
                         signal accepted()
                         onAccepted: {
-                            root.notification.shift();
-                            root.notificationIcon.shift();
-
-                            if(root.notification.length == 0) {
                             pageView.replaceCurrentItem(mainPage);
                             root.resetFocus(true);
                         }
 
-                        }
-
                         Layout.alignment: Qt.AlignHCenter
 
                         implicitWidth: 93