0301540 · unity8 · git.iko.soy

qml/Dash/GenericScopeView.qml+1−1

@@ -640,7 +640,7 @@ FocusScope {

640 resetSearch(keepPanelOpen);

641 scopeView.scope.resetPrimaryNavigationTag();

642 peExtraPanel.resetNavigation();

643− if (panelOpen && keepPanelOpen) {

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

644 openPopup();

645 }

646 }

qml/Dash/PageHeader.qml+1−1

@@ -77,7 +77,7 @@ Item {

77 } else if (!keepFocus) {

78 unfocus();

79 }

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

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

81 headerContainer.showSearch = false;

82 }

83 }

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