git.iko.soy/unity8
on xenial help sign in
Hook the new scope.activationInProgress property

Fixes: #1537132 Approved by: Andrea Cimitan

commit1189f5054f0fb6fa1b629657b28d8ad0a844cf8f authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 1 Mar 2016, 10:28 (11 years ago) parent57f68efb6056fe
6 files changed+10−4
compare with xenial
unifiedsplit
debian/control+1−1 qml/Dash/GenericScopeView.qml+1−1 qml/Dash/ScopesList.qml+1−1 tests/mocks/Unity/CMakeLists.txt+1−1 tests/mocks/Unity/fake_scope.cpp+5 tests/mocks/Unity/fake_scope.h+1
debian/control+1−1
@@ -134,7 +134,7 @@ Depends: qml-module-qtquick-layouts,
134134 unity-application-impl-13,
135135 unity-notifications-impl-3,
136136 unity-plugin-scopes | unity-scopes-impl,
137− unity-scopes-impl-9,
137+ unity-scopes-impl-10,
138138 unity8-fake-env | unity-application-impl,
139139 ${misc:Depends},
140140Breaks: unity8 (<< 7.86),
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/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)
88add_subdirectory(Screens)
99
1010pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
11−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=9)
11+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)
1212
1313include_directories(
1414 ${CMAKE_CURRENT_BINARY_DIR}
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;