Clear Unified Search Input Field in a proper way

Signed-off-by: alex-z <blackslayer4@gmail.com>

diff --git a/src/gui/tray/UnifiedSearchInputContainer.qml b/src/gui/tray/UnifiedSearchInputContainer.qml
index 77533395272fa1ba5772a3b29787d503bb8b6c00..e834944abdd773da4b9c920cec096586874f8649 100644 (file)
--- 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 d85615adb8399e60e747984332f898da9656f929..637d727d5f1a4eece2efa6cf012aba0369107afe 100644 (file)
--- 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\r
             isSearchInProgress: UserModel.currentUser.unifiedSearchResultsListModel.isSearchInProgress\r
             onTextEdited: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = trayWindowUnifiedSearchInputContainer.text }\r
+            onClearText: function () { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = "" }\r
         }\r
 \r
         ErrorBox {\r