Skip to content
Snippets Groups Projects
Commit b6116856 authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk
Browse files

settingsmaterialtextedit: fix focus changes

Change-Id: I289b610e43317470d061e7ecd6338bfa805c5ce7
GitLab: #1171
parent 26d16c38
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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;
}
}
}
}
/*
* 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
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment