git.iko.soy/unity8
on xenial help sign in
Hook the new scope.activationInProgress property
1189f50Albert Astals Cid
debian/control+1−1
compare with xenial
unifiedsplit
@@ -134,7 +134,7 @@ Depends: qml-module-qtquick-layouts,
134 unity-application-impl-13,
134 unity-application-impl-13,
135 unity-notifications-impl-3,
135 unity-notifications-impl-3,
136 unity-plugin-scopes | unity-scopes-impl,
136 unity-plugin-scopes | unity-scopes-impl,
137− unity-scopes-impl-9,
137+ unity-scopes-impl-10,
138 unity8-fake-env | unity-application-impl,
138 unity8-fake-env | unity-application-impl,
139 ${misc:Depends},
139 ${misc:Depends},
140Breaks: unity8 (<< 7.86),
140Breaks: unity8 (<< 7.86),
qml/Dash/GenericScopeView.qml+1−1
@@ -47,7 +47,7 @@ FocusScope {
47 style: scope ? scope.customizations : {}
47 style: scope ? scope.customizations : {}
48 }
48 }
49
49
50− readonly property bool processing: scope ? scope.searchInProgress || subPageLoader.processing : false
50+ readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress || subPageLoader.processing) : false
51
51
52 signal backClicked()
52 signal backClicked()
53
53
qml/Dash/ScopesList.qml+1−1
@@ -24,7 +24,7 @@ Item {
24 property var scope: null
24 property var scope: null
25
25
26 // Properties used by parent
26 // Properties used by parent
27− readonly property bool processing: scope ? scope.searchInProgress : false
27+ readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress) : false
28
28
29 // Signals
29 // Signals
30 signal backClicked()
30 signal backClicked()
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)
8add_subdirectory(Screens)
8add_subdirectory(Screens)
9
9
10pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
10pkg_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)
12
12
13include_directories(
13include_directories(
14 ${CMAKE_CURRENT_BINARY_DIR}
14 ${CMAKE_CURRENT_BINARY_DIR}
tests/mocks/Unity/fake_scope.cpp+5
@@ -87,6 +87,11 @@ bool Scope::searchInProgress() const
87 return m_searching;
87 return m_searching;
88}
88}
89
89
90+bool Scope::activationInProgress() const
91+{
92+ return false;
93+}
94+
90bool Scope::favorite() const
95bool Scope::favorite() const
91{
96{
92 return m_favorite;
97 return m_favorite;
tests/mocks/Unity/fake_scope.h+1
@@ -42,6 +42,7 @@ public:
42 QString searchHint() const override;
42 QString searchHint() const override;
43 QString shortcut() const override;
43 QString shortcut() const override;
44 bool searchInProgress() const override;
44 bool searchInProgress() const override;
45+ bool activationInProgress() const override;
45 bool favorite() const override;
46 bool favorite() const override;
46 unity::shell::scopes::CategoriesInterface* categories() const override;
47 unity::shell::scopes::CategoriesInterface* categories() const override;
47 QString searchQuery() const override;
48 QString searchQuery() const override;