Added resizable Text area item based on AbstractEditor

MerginMaps · Dec 18, 2023 · 66e0c3d · 66e0c3d · inputapp-bot · Dec 18, 2023
1 parent 8f869c9
commit 66e0c3d
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 3 deletions.
diff --git a/app/qml/inputs/MMAbstractEditor.qml b/app/qml/inputs/MMAbstractEditor.qml
@@ -33,6 +33,8 @@ Item {
   property bool hasCheckbox: false
   property bool checkboxChecked: false
 
+  property real innerHeight: 50 * __dp
+
   readonly property real spacing: 15 * __dp
 
   width: parent.width
@@ -70,7 +72,7 @@ Item {
     }
 
     Item {
-      height: 50 * __dp
+      height: root.innerHeight
       anchors.left: parent.left
       anchors.right: parent.right
 

diff --git a/app/qml/inputs/MMPasswordEditor.qml b/app/qml/inputs/MMPasswordEditor.qml
@@ -18,7 +18,7 @@ MMAbstractEditor {
   id: root
 
   property alias placeholderText: textField.placeholderText
-  readonly property alias text: textField.text
+  property alias text: textField.text
 
   hasFocus: textField.activeFocus
 

diff --git a/app/qml/inputs/MMTextAreaEditor.qml b/app/qml/inputs/MMTextAreaEditor.qml
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Basic
+import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
+import "../components"
+
+MMAbstractEditor {
+  id: root
+
+  property var parentValue: parent.value ?? ""
+  property bool parentValueIsNull: parent.valueIsNull ?? false
+  property bool isReadOnly: parent.readOnly ?? false
+
+  property alias placeholderText: textArea.placeholderText
+  property alias text: textArea.text
+
+  signal editorValueChanged( var newValue, var isNull )
+
+  hasFocus: textArea.activeFocus
+  innerHeight: textArea.vertSpace + textArea.contentHeight + 2 * textArea.vertSpace
+
+  content: TextArea {
+    id: textArea
+
+    property real vertSpace: 11 * __dp
+
+    y: textArea.vertSpace
+    height: contentHeight + textArea.vertSpace
+    width: parent.width
+
+    hoverEnabled: true
+    placeholderTextColor: __style.nightAlphaColor
+    color: root.enabled ? __style.nightColor : __style.mediumGreenColor
+    font: __style.p5
+    wrapMode: Text.WordWrap
+  }
+}
diff --git a/gallery/qml.qrc b/gallery/qml.qrc
@@ -69,5 +69,6 @@
         <file>../app/qml/components/MMBackButton.qml</file>
         <file>../app/qml/components/MMIconCheckBoxHorizontal.qml</file>
         <file>../app/qml/components/MMIconCheckBoxVertical.qml</file>
+        <file>../app/qml/inputs/MMTextAreaEditor.qml</file>
     </qresource>
 </RCC>
diff --git a/gallery/qml/pages/EditorsPage.qml b/gallery/qml/pages/EditorsPage.qml
@@ -70,9 +70,17 @@ ScrollView {
           warningMsg: text.length > 0 ? "" : "Write something"
         }
 
+        MMTextAreaEditor {
+          title: "MMTextAreaEditor"
+          placeholderText: "Place for multi row text"
+          enabled: checkbox.checked
+          width: parent.width
+          warningMsg: text.length > 0 ? "" : "Write something"
+        }
+
         MMPasswordEditor {
           title: "MMPasswordEditor"
-          parentValue: "Password"
+          text: "Password"
           //regexp: '(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])(?=.{6,})'
           errorMsg: "Password must contain at least 6 characters\nMinimum 1 number, uppercase and lowercase letter and special character"
           enabled: checkbox.checked