on xenial help sign in
Make SHOW_DASH and HIDE_DASH close the current preview. Fixes: https://bugs.launchpad.net/bugs/1231404.

Approved by PS Jenkins bot, Michał Sawicz, Diego Sarmentero.

commit392b686202b567f0afd22b92c529d0eb427a0f60 authorMichał Sawicz <michal.sawicz@canonical.com> dateThu 26 Sep 2013, 15:55 (13 years ago) parente323b42e571bb9
3 files changed+22
Dash/GenericScopeView.qml+6 tests/mocks/Unity/fake_scope.h+2 tests/qmltests/Dash/tst_GenericScopeView.qml+14
Dash/GenericScopeView.qml+6
@@ -50,6 +50,12 @@ ScopeView {
5050 }
5151 }
5252
53+ Connections {
54+ target: scopeView.scope
55+ onShowDash: previewLoader.open = false;
56+ onHideDash: previewLoader.open = false;
57+ }
58+
5359 ScopeListView {
5460 id: categoryView
5561 anchors.fill: parent
tests/mocks/Unity/fake_scope.h+2
@@ -90,6 +90,8 @@ Q_SIGNALS:
9090 // signals triggered by activate(..) or preview(..) requests.
9191 void previewReady(Preview *preview);
9292 void activateApplication(const QString &desktop);
93+ void showDash();
94+ void hideDash();
9395
9496protected:
9597
tests/qmltests/Dash/tst_GenericScopeView.qml+14
@@ -52,6 +52,20 @@ Item {
5252 tryCompare(pageHeader, "searchQuery", "")
5353 tryCompare(genericScopeView, "previewShown", false);
5454 }
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+ }
5569 }
5670 }
5771}