Hook the new scope.activationInProgress property
commit8122d43c445f4b057834b3cfb99ca421c8a4271e
authorAlbert Astals Cid <albert.astals@canonical.com>
dateFri 29 Jan 2016, 11:29 (11 years ago)
parentc0d4164
qml/Dash/GenericScopeView.qml+1−1
@@ -47,7 +47,7 @@ FocusScope {
4747 style: scope ? scope.customizations : {}
4848 }
4949
50− readonly property bool processing: scope ? scope.searchInProgress || subPageLoader.processing : false
50+ readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress || subPageLoader.processing) : false
5151
5252 signal backClicked()
5353
qml/Dash/ScopesList.qml+1−1
@@ -24,7 +24,7 @@ Item {
2424 property var scope: null
2525
2626 // Properties used by parent
27− readonly property bool processing: scope ? scope.searchInProgress : false
27+ readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress) : false
2828
2929 // Signals
3030 signal backClicked()
tests/mocks/Unity/fake_scope.cpp+5
@@ -87,6 +87,11 @@ bool Scope::searchInProgress() const
8787 return m_searching;
8888}
8989
90+bool Scope::activationInProgress() const
91+{
92+ return false;
93+}
94+
9095bool Scope::favorite() const
9196{
9297 return m_favorite;
tests/mocks/Unity/fake_scope.h+1
@@ -42,6 +42,7 @@ public:
4242 QString searchHint() const override;
4343 QString shortcut() const override;
4444 bool searchInProgress() const override;
45+ bool activationInProgress() const override;
4546 bool favorite() const override;
4647 unity::shell::scopes::CategoriesInterface* categories() const override;
4748 QString searchQuery() const override;