73dbe45 · unity8 · git.iko.soy

qml/Dash/GenericScopeView.qml+1−1

@@ -642,7 +642,7 @@ FocusScope {

642 resetSearch(keepPanelOpen);

643 scopeView.scope.resetPrimaryNavigationTag();

644 peExtraPanel.resetNavigation();

645− if (panelOpen && keepPanelOpen) {

645+ if ((panelOpen || searchHistory.count > 0) && keepPanelOpen) {

646 openPopup();

647 }

648 }

qml/Dash/PageHeader.qml+1−1

@@ -78,7 +78,7 @@ Item {

78 } else if (!keepFocus) {

79 unfocus();

80 }

81− if (!searchTextField.text && !root.navigationTag) {

81+ if (!searchTextField.text && !root.navigationTag && searchHistory.count == 0) {

82 headerContainer.showSearch = false;

83 }

84 }

tests/qmltests/Dash/tst_DashContent.qml−2

@@ -510,8 +510,6 @@ Item {

510

511 var clearIcon = findChild(searchTextField, "clearIcon");

512 mouseClick(clearIcon);

513−

514− expectFail("", "Extra panel should not be visible after clearing search if it was not visible before");

515 tryCompare(peExtraPanel, "visible", true);

513 tryCompare(peExtraPanel, "visible", true);

516 }

514 }

517

515