status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(StatusBaseInput): ensure clear button has the correct color 

Also only render clear button when input has active focus.

Closes #286
This commit is contained in:
Pascal Precht 2021-07-23 12:02:00 +02:00 committed by Michał Cieślak
parent 3755e1fdd6
commit e966641ed1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/StatusQ/sandbox/StatusInputPage.qml
View File

@ -19,6 +19,11 @@ Column {
enabled: false enabled: false
} }
StatusBaseInput {
placeholderText: "Clearable"
clearable: true
}
StatusBaseInput { StatusBaseInput {
multiline: true multiline: true
placeholderText: "Multiline" placeholderText: "Multiline"

6
ui/StatusQ/src/StatusQ/Controls/StatusBaseInput.qml
View File

@ -147,7 +147,10 @@ Item {
StatusFlatRoundButton { StatusFlatRoundButton {
id: clearButtton id: clearButtton
visible: edit.text.length != 0 && statusBaseInput.clearable && !statusBaseInput.multiline visible: edit.text.length != 0 &&
statusBaseInput.clearable &&
!statusBaseInput.multiline &&
edit.activeFocus
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 11 anchors.rightMargin: 11
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -157,6 +160,7 @@ Item {
icon.name: "clear" icon.name: "clear"
icon.width: 14 icon.width: 14
icon.height: 14 icon.height: 14
icon.color: Theme.palette.baseColor1
onClicked: { onClicked: {
edit.clear() edit.clear()
} }