From 855b023349e33b1d09afd39da6f0c294be9378d3 Mon Sep 17 00:00:00 2001
From: lcoursodon <liam.coursodon@savoirfairelinux.com>
Date: Tue, 7 Nov 2023 15:53:05 -0500
Subject: [PATCH] TextEdit: disable persistent mode and made right clickable
the text
Change-Id: If8f92dfdba20005fe8430bfbe880167061301b95
---
src/app/commoncomponents/MaterialTextField.qml | 4 ++++
src/app/commoncomponents/ModalTextEdit.qml | 4 ++++
src/app/mainview/components/SwarmDetailsPanel.qml | 4 +---
src/app/settingsview/components/CustomizeProfilePage.qml | 9 +++------
.../settingsview/components/SettingsMaterialTextEdit.qml | 1 -
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/app/commoncomponents/MaterialTextField.qml b/src/app/commoncomponents/MaterialTextField.qml
index 129a2212e..9ac60261b 100644
--- a/src/app/commoncomponents/MaterialTextField.qml
+++ b/src/app/commoncomponents/MaterialTextField.qml
@@ -36,6 +36,7 @@ TextField {
}
signal keyPressed
+ signal rejected
property bool inputIsValid: true
@@ -87,6 +88,9 @@ TextField {
root.accepted();
}
event.accepted = true;
+ } else if (event.key === Qt.Key_Escape) {
+ root.focus = false;
+ root.rejected();
} else {
root.keyPressed();
}
diff --git a/src/app/commoncomponents/ModalTextEdit.qml b/src/app/commoncomponents/ModalTextEdit.qml
index 94de2686c..a2330fa80 100644
--- a/src/app/commoncomponents/ModalTextEdit.qml
+++ b/src/app/commoncomponents/ModalTextEdit.qml
@@ -122,6 +122,10 @@ Loader {
echoMode: root.echoMode
placeholderText: root.placeholderText
onAccepted: root.accepted()
+ onRejected: {
+ root.editMode = false;
+ text = staticText;
+ }
onKeyPressed: root.keyPressed()
onTextChanged: dynamicText = text
text: staticText
diff --git a/src/app/mainview/components/SwarmDetailsPanel.qml b/src/app/mainview/components/SwarmDetailsPanel.qml
index 9b818530c..09471a6d5 100644
--- a/src/app/mainview/components/SwarmDetailsPanel.qml
+++ b/src/app/mainview/components/SwarmDetailsPanel.qml
@@ -51,7 +51,6 @@ Rectangle {
anchors.right: parent.right
height: headerRow.implicitHeight + JamiTheme.preferredMarginSize + settingsTabButton.height
-
RowLayout {
id: headerRow
spacing: 15
@@ -105,7 +104,7 @@ Rectangle {
}
editMode: false
- isPersistent: false
+
placeholderText: JamiStrings.title
onActiveFocusChanged: {
@@ -148,7 +147,6 @@ Rectangle {
onAccepted: ConversationsAdapter.updateConversationDescription(LRCInstance.selectedConvUid, dynamicText)
editMode: false
- isPersistent: false
onActiveFocusChanged: {
if (!activeFocus) {
diff --git a/src/app/settingsview/components/CustomizeProfilePage.qml b/src/app/settingsview/components/CustomizeProfilePage.qml
index 6cb2e8695..6fb97804c 100644
--- a/src/app/settingsview/components/CustomizeProfilePage.qml
+++ b/src/app/settingsview/components/CustomizeProfilePage.qml
@@ -76,16 +76,13 @@ SettingsPageBase {
font.pixelSize: JamiTheme.materialLineEditPixelSize
}
- maxCharacters: JamiTheme.maximumCharacters
- placeholderText: JamiStrings.displayName
-
- editMode: false
- isPersistent: false
-
Layout.alignment: Qt.AlignCenter
Layout.preferredHeight: JamiTheme.preferredFieldHeight + 8
Layout.fillWidth: true
+ maxCharacters: JamiTheme.maximumCharacters
+ placeholderText: JamiStrings.displayName
+
staticText: CurrentAccount.alias
elidedText: displayNameLineEditTextSize.elidedText
diff --git a/src/app/settingsview/components/SettingsMaterialTextEdit.qml b/src/app/settingsview/components/SettingsMaterialTextEdit.qml
index 1f638607a..f824c54ed 100644
--- a/src/app/settingsview/components/SettingsMaterialTextEdit.qml
+++ b/src/app/settingsview/components/SettingsMaterialTextEdit.qml
@@ -78,7 +78,6 @@ RowLayout {
}
editMode: false
- isPersistent: false
onActiveFocusChanged: {
if (!activeFocus) {
--
GitLab