8122d43 · unity8 · git.iko.soy

qml/Dash/GenericScopeView.qml+1−1

compare with xenial

unifiedsplit

@@ -47,7 +47,7 @@ FocusScope {

47 style: scope ? scope.customizations : {}

48 }

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

52 signal backClicked()

53

qml/Dash/ScopesList.qml+1−1

@@ -24,7 +24,7 @@ Item {

24 property var scope: null

25

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

29 // Signals

30 signal backClicked()

tests/mocks/Unity/fake_scope.cpp+5

@@ -87,6 +87,11 @@ bool Scope::searchInProgress() const

87 return m_searching;

88}

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;

43 QString shortcut() 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;