From 0d8375e79804e4036ed7baaecb5e54f1a0e93f86 Mon Sep 17 00:00:00 2001 From: alex-z Date: Thu, 28 Oct 2021 14:29:36 +0300 Subject: [PATCH] Clear Unified Search Input Field in a proper way Signed-off-by: alex-z --- src/gui/tray/UnifiedSearchInputContainer.qml | 7 +++---- src/gui/tray/Window.qml | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/tray/UnifiedSearchInputContainer.qml b/src/gui/tray/UnifiedSearchInputContainer.qml index 7753339527..e834944abd 100644 --- a/src/gui/tray/UnifiedSearchInputContainer.qml +++ b/src/gui/tray/UnifiedSearchInputContainer.qml @@ -17,6 +17,8 @@ TextField { readonly property int textFieldHorizontalPaddingOffset: 14 + property var onClearText: function(){} + leftPadding: trayWindowUnifiedSearchTextFieldSearchIcon.width + trayWindowUnifiedSearchTextFieldSearchIcon.anchors.leftMargin + textFieldHorizontalPaddingOffset rightPadding: trayWindowUnifiedSearchTextFieldClearTextButton.width + trayWindowUnifiedSearchTextFieldClearTextButton.anchors.rightMargin + textFieldHorizontalPaddingOffset @@ -101,10 +103,7 @@ TextField { anchors.fill: parent - onClicked: { - trayWindowUnifiedSearchTextField.text = "" - trayWindowUnifiedSearchTextField.onTextEdited() - } + onClicked: trayWindowUnifiedSearchTextField.onClearText() } } } diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index d85615adb8..637d727d5f 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -588,6 +588,7 @@ Window { readOnly: !UserModel.currentUser.isConnected || UserModel.currentUser.unifiedSearchResultsListModel.currentFetchMoreInProgressProviderId isSearchInProgress: UserModel.currentUser.unifiedSearchResultsListModel.isSearchInProgress onTextEdited: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = trayWindowUnifiedSearchInputContainer.text } + onClearText: function () { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = "" } } ErrorBox {