git.iko.soy/unity8
on xenial help sign in
as review
138d3feAndrea Cimitan
qml/Dash/Dash.qml−4
compare with xenial
unifiedsplit
@@ -122,7 +122,6 @@ Showable {
122 dash.setCurrentScope(scopeId, true, false);
122 dash.setCurrentScope(scopeId, true, false);
123 }
123 }
124 onOpenScope: {
124 onOpenScope: {
125− scopeItem.scopeThatOpenedScope = currentScope;
126 scopeItem.scope = scope;
125 scopeItem.scope = scope;
127 x = -width;
126 x = -width;
128 }
127 }
@@ -187,7 +186,6 @@ Showable {
187 onOpenScope: {
186 onOpenScope: {
188 bottomEdgeController.enableAnimation = true;
187 bottomEdgeController.enableAnimation = true;
189 bottomEdgeController.progress = 0;
188 bottomEdgeController.progress = 0;
190− scopeItem.scopeThatOpenedScope = scopesList.scope;
191 scopeItem.scope = scope;
189 scopeItem.scope = scope;
192 dashContent.x = -dashContent.width;
190 dashContent.x = -dashContent.width;
193 }
191 }
@@ -208,8 +206,6 @@ Showable {
208 id: scopeItem
206 id: scopeItem
209 objectName: "dashTempScopeItem"
207 objectName: "dashTempScopeItem"
210
208
211− property var scopeThatOpenedScope: null
212−
213 x: dashContent.x + width
209 x: dashContent.x + width
214 y: dashContent.y
210 y: dashContent.y
215 width: parent.width
211 width: parent.width
tests/mocks/Unity/fake_previewstack.cpp+1−2
@@ -23,9 +23,8 @@
23
23
24PreviewStack::PreviewStack(QObject* parent, Scope *scope)
24PreviewStack::PreviewStack(QObject* parent, Scope *scope)
25 : unity::shell::scopes::PreviewStackInterface(parent)
25 : unity::shell::scopes::PreviewStackInterface(parent)
26− , m_scope(scope)
27{
26{
28− m_previews << new PreviewModel(this, m_scope);
27+ m_previews << new PreviewModel(this, scope);
29}
28}
30
29
31PreviewStack::~PreviewStack()
30PreviewStack::~PreviewStack()
tests/mocks/Unity/fake_previewstack.h−1
@@ -45,7 +45,6 @@ public:
45
45
46private:
46private:
47 QList<PreviewModel*> m_previews;
47 QList<PreviewModel*> m_previews;
48− Scope* m_scope;
49};
48};
50
49
51Q_DECLARE_METATYPE(PreviewStack*)
50Q_DECLARE_METATYPE(PreviewStack*)
tests/mocks/Unity/fake_scopes.h+1−2
@@ -60,9 +60,8 @@ public:
60 Q_INVOKABLE void setFavorite(const QString& scopeId, bool favorite) override;
60 Q_INVOKABLE void setFavorite(const QString& scopeId, bool favorite) override;
61 Q_INVOKABLE void moveFavoriteTo(const QString& scopeId, int index) override;
61 Q_INVOKABLE void moveFavoriteTo(const QString& scopeId, int index) override;
62
62
63− unity::shell::scopes::ScopeInterface* findTempScope(QString const& id) const;
64 void addTempScope(unity::shell::scopes::ScopeInterface* scope);
63 void addTempScope(unity::shell::scopes::ScopeInterface* scope);
65− Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope);
64+ Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
66
65
67 // This is used as part of implementation of the other C++ code, not API
66 // This is used as part of implementation of the other C++ code, not API
68 QList<Scope*> favScopes() const;
67 QList<Scope*> favScopes() const;