on xenial help sign in
Make SHOW_DASH and HIDE_DASH close the current preview
e571bb9Michał Sawicz
Dash/GenericScopeView.qml+6
@@ -50,6 +50,12 @@ ScopeView {
50 }
50 }
51 }
51 }
52
52
53+ Connections {
54+ target: scopeView.scope
55+ onShowDash: previewLoader.open = false;
56+ onHideDash: previewLoader.open = false;
57+ }
58+
53 ScopeListView {
59 ScopeListView {
54 id: categoryView
60 id: categoryView
55 anchors.fill: parent
61 anchors.fill: parent
tests/mocks/Unity/fake_scope.h+2
@@ -90,6 +90,8 @@ Q_SIGNALS:
90 // signals triggered by activate(..) or preview(..) requests.
90 // signals triggered by activate(..) or preview(..) requests.
91 void previewReady(Preview *preview);
91 void previewReady(Preview *preview);
92 void activateApplication(const QString &desktop);
92 void activateApplication(const QString &desktop);
93+ void showDash();
94+ void hideDash();
93
95
94protected:
96protected:
95
97
tests/qmltests/Dash/tst_GenericScopeView.qml+14
@@ -52,6 +52,20 @@ Item {
52 tryCompare(pageHeader, "searchQuery", "")
52 tryCompare(pageHeader, "searchQuery", "")
53 tryCompare(genericScopeView, "previewShown", false);
53 tryCompare(genericScopeView, "previewShown", false);
54 }
54 }
55+
56+ function test_showDash() {
57+ var previewLoader = findChild(genericScopeView, "previewLoader");
58+ previewLoader.open = true;
59+ scopes.get(0).showDash();
60+ tryCompare(genericScopeView, "previewShown", false);
61+ }
62+
63+ function test_hideDash() {
64+ var previewLoader = findChild(genericScopeView, "previewLoader");
65+ previewLoader.open = true;
66+ scopes.get(0).hideDash();
67+ tryCompare(genericScopeView, "previewShown", false);
68+ }
55 }
69 }
56 }
70 }
57}
71}