Skip to content

Commit

Permalink
Revert "Added resizable Text area item based on AbstractEditor"
Browse files Browse the repository at this point in the history
This reverts commit dd51fa0.
  • Loading branch information
iiLubos committed Dec 18, 2023
1 parent dd51fa0 commit 8f869c9
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 61 deletions.
4 changes: 1 addition & 3 deletions app/qml/inputs/MMAbstractEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ Item {
property bool hasCheckbox: false
property bool checkboxChecked: false

property real innerHeight: 50 * __dp

readonly property real spacing: 15 * __dp

width: parent.width
Expand Down Expand Up @@ -72,7 +70,7 @@ Item {
}

Item {
height: root.innerHeight
height: 50 * __dp
anchors.left: parent.left
anchors.right: parent.right

Expand Down
2 changes: 1 addition & 1 deletion app/qml/inputs/MMPasswordEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MMAbstractEditor {
id: root

property alias placeholderText: textField.placeholderText
property alias text: textField.text
readonly property alias text: textField.text

hasFocus: textField.activeFocus

Expand Down
47 changes: 0 additions & 47 deletions app/qml/inputs/MMTextAreaEditor.qml

This file was deleted.

1 change: 0 additions & 1 deletion gallery/qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,5 @@
<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>
10 changes: 1 addition & 9 deletions gallery/qml/pages/EditorsPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,9 @@ 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"
text: "Password"
parentValue: "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
Expand Down

1 comment on commit 8f869c9

@inputapp-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS - version 23.12.498711 just submitted!

Please sign in to comment.