git.iko.soy/unity8
on xenial help sign in
Merge
commit39f1a2c0cf96924344cb3b68e85fd4b4789802b2 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 2 Oct 2015, 11:10 (11 years ago) parente298198149f243
2 files changed+23−2
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+3−2 tests/qmltests/Dash/tst_DashContent.qml+20
qml/Dash/GenericScopeView.qml+3−2
@@ -637,11 +637,12 @@ FocusScope {
637637 onSettingsClicked: subPageLoader.openSubPage("settings")
638638 onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite
639639 onSearchTextFieldFocused: scopeView.showHeader()
640− onClearSearch: {
640+ onClearSearch: { // keepPanelOpen
641+ var panelOpen = peExtraPanel.visible;
641642 resetSearch(keepPanelOpen);
642643 scopeView.scope.resetPrimaryNavigationTag();
643644 peExtraPanel.resetNavigation();
644− if (keepPanelOpen) {
645+ if (panelOpen && keepPanelOpen) {
645646 openPopup();
646647 }
647648 }
tests/qmltests/Dash/tst_DashContent.qml+20
@@ -495,6 +495,26 @@ Item {
495495 compare(peExtraPanel.visible, true);
496496 }
497497
498+ function test_clearSearchWithNavigationClosed() {
499+ var dashContentList = findChild(dashContent, "dashContentList");
500+ var searchButton = findChild(dashContentList.currentItem, "search_header_button");
501+ var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
502+ var searchTextField = findChild(dashContentList.currentItem, "searchTextField");
503+
504+ compare(peExtraPanel.visible, false);
505+ mouseClick(searchButton);
506+ tryCompare(peExtraPanel, "visible", true);
507+
508+ typeString("A");
509+ compare(peExtraPanel.visible, false);
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);
516+ }
517+
498518 function test_searchHint() {
499519 var dashContentList = findChild(dashContent, "dashContentList");
500520 verify(dashContentList !== null);