Adapt to mimic previous behaviour
commit030154068d7420a38cb5bf9532ec64d070c111d9
authorAlbert Astals Cid <albert.astals@canonical.com>
dateTue 13 Oct 2015, 15:58 (11 years ago)
parent8c01dd1
qml/Dash/GenericScopeView.qml+1−1
@@ -640,7 +640,7 @@ FocusScope {
640640 resetSearch(keepPanelOpen);
641641 scopeView.scope.resetPrimaryNavigationTag();
642642 peExtraPanel.resetNavigation();
643− if (panelOpen && keepPanelOpen) {
643+ if ((panelOpen || searchHistory.count > 0) && keepPanelOpen) {
644644 openPopup();
645645 }
646646 }
qml/Dash/PageHeader.qml+1−1
@@ -77,7 +77,7 @@ Item {
7777 } else if (!keepFocus) {
7878 unfocus();
7979 }
80− if (!searchTextField.text && !root.navigationTag) {
80+ if (!searchTextField.text && !root.navigationTag && searchHistory.count == 0) {
8181 headerContainer.showSearch = false;
8282 }
8383 }
tests/qmltests/Dash/tst_DashContent.qml−2
@@ -510,8 +510,6 @@ Item {
510510
511511 var clearIcon = findChild(searchTextField, "clearIcon");
512512 mouseClick(clearIcon);
513−
514− expectFail("", "Extra panel should not be visible after clearing search if it was not visible before");
515513 tryCompare(peExtraPanel, "visible", true);
516514 }
517515