settingsmaterialtextedit: fix focus changes

Change-Id: I289b610e43317470d061e7ecd6338bfa805c5ce7
GitLab: #1171

src/app/commoncomponents/ModalTextEdit.qml

@@ -75,7 +75,7 @@ Loader {
 
     // Needed to give proper focus to loaded item
     onFocusChanged: {
-        if (root.focus && root.isPersistent) {
+        if (item && root.focus && root.isPersistent) {
             item.forceActiveFocus();
         }
         isEditing = !isEditing;

src/app/settingsview/components/SettingsMaterialTextEdit.qml

@@ -63,6 +63,7 @@ RowLayout {
         }
 
         visible: !root.isPassword
+        focus: visible
         isSettings: true
 
         Layout.alignment: Qt.AlignCenter
@@ -73,7 +74,7 @@ RowLayout {
 
         onAccepted: {
             root.dynamicText = dynamicText;
-            editFinished();
+            root.editFinished();
         }
 
         editMode: false
@@ -82,7 +83,7 @@ RowLayout {
         onActiveFocusChanged: {
             if (!activeFocus) {
                 root.dynamicText = dynamicText;
-                editFinished();
+                root.editFinished();
                 modalTextEdit.editMode = false;
             } else {
                 modalTextEdit.editMode = true;
@@ -94,6 +95,7 @@ RowLayout {
         id: passwordTextEdit
 
         visible: root.isPassword
+        focus: visible
         isSettings: true
 
         Layout.alignment: Qt.AlignCenter
@@ -103,8 +105,16 @@ RowLayout {
 
         onAccepted: {
             root.dynamicText = dynamicText;
-            editFinished();
+            root.editFinished();
             echoMode = TextInput.Password;
         }
+
+        onActiveFocusChanged: {
+            if (!activeFocus) {
+                root.dynamicText = dynamicText;
+                root.editFinished();
+                echoMode = TextInput.Password;
+            }
+        }
     }
 }

tests/qml/src/tst_SettingsMaterialTextEdit.qml

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QtTest
+
+import "../../../src/app/"
+import "../../../src/app/settingsview/components"
+
+ColumnLayout {
+    id: root
+
+    spacing: 0
+    width: 300
+    height: 300
+
+    Item {
+        id: dummy
+    }
+
+    SettingsMaterialTextEdit {
+        id: uut
+
+        property bool focusLeft: false
+        isPassword: true
+
+        TestCase {
+            name: "Test password un-focus"
+            when: windowShown
+
+            function test_unfocusPassword() {
+                // Open the recorder and take a picture
+                uut.forceActiveFocus()
+                dummy.forceActiveFocus()
+                compare(uut.focusLeft, true)
+            }
+        }
+
+        onEditFinished: focusLeft = true
+
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+    }
+}