Merge dash navigation
commit73dbe459e54cb4255f03aaaedb0b5fbb511ad142
authorAlbert Astals Cid <albert.astals@canonical.com>
dateTue 13 Oct 2015, 15:59 (11 years ago)
parentdd7410a0301540
qml/Dash/GenericScopeView.qml+1−1
@@ -642,7 +642,7 @@ FocusScope {
642642 resetSearch(keepPanelOpen);
643643 scopeView.scope.resetPrimaryNavigationTag();
644644 peExtraPanel.resetNavigation();
645− if (panelOpen && keepPanelOpen) {
645+ if ((panelOpen || searchHistory.count > 0) && keepPanelOpen) {
646646 openPopup();
647647 }
648648 }
qml/Dash/PageHeader.qml+1−1
@@ -78,7 +78,7 @@ Item {
7878 } else if (!keepFocus) {
7979 unfocus();
8080 }
81− if (!searchTextField.text && !root.navigationTag) {
81+ if (!searchTextField.text && !root.navigationTag && searchHistory.count == 0) {
8282 headerContainer.showSearch = false;
8383 }
8484 }
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