git.iko.soy/unity8
on xenial help sign in
as review
commit138d3fe205647fef5e35b22d79901106a7b81b10 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateThu 12 Feb 2015, 12:20 (12 years ago) parent883eed0
4 files changed+2−9
compare with xenial
unifiedsplit
qml/Dash/Dash.qml−4 tests/mocks/Unity/fake_previewstack.cpp+1−2 tests/mocks/Unity/fake_previewstack.h−1 tests/mocks/Unity/fake_scopes.h+1−2
qml/Dash/Dash.qml−4
@@ -122,7 +122,6 @@ Showable {
122122 dash.setCurrentScope(scopeId, true, false);
123123 }
124124 onOpenScope: {
125− scopeItem.scopeThatOpenedScope = currentScope;
126125 scopeItem.scope = scope;
127126 x = -width;
128127 }
@@ -187,7 +186,6 @@ Showable {
187186 onOpenScope: {
188187 bottomEdgeController.enableAnimation = true;
189188 bottomEdgeController.progress = 0;
190− scopeItem.scopeThatOpenedScope = scopesList.scope;
191189 scopeItem.scope = scope;
192190 dashContent.x = -dashContent.width;
193191 }
@@ -208,8 +206,6 @@ Showable {
208206 id: scopeItem
209207 objectName: "dashTempScopeItem"
210208
211− property var scopeThatOpenedScope: null
212−
213209 x: dashContent.x + width
214210 y: dashContent.y
215211 width: parent.width
tests/mocks/Unity/fake_previewstack.cpp+1−2
@@ -23,9 +23,8 @@
2323
2424PreviewStack::PreviewStack(QObject* parent, Scope *scope)
2525 : unity::shell::scopes::PreviewStackInterface(parent)
26− , m_scope(scope)
2726{
28− m_previews << new PreviewModel(this, m_scope);
27+ m_previews << new PreviewModel(this, scope);
2928}
3029
3130PreviewStack::~PreviewStack()
tests/mocks/Unity/fake_previewstack.h−1
@@ -45,7 +45,6 @@ public:
4545
4646private:
4747 QList<PreviewModel*> m_previews;
48− Scope* m_scope;
4948};
5049
5150Q_DECLARE_METATYPE(PreviewStack*)
tests/mocks/Unity/fake_scopes.h+1−2
@@ -60,9 +60,8 @@ public:
6060 Q_INVOKABLE void setFavorite(const QString& scopeId, bool favorite) override;
6161 Q_INVOKABLE void moveFavoriteTo(const QString& scopeId, int index) override;
6262
63− unity::shell::scopes::ScopeInterface* findTempScope(QString const& id) const;
6463 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;
6665
6766 // This is used as part of implementation of the other C++ code, not API
6867 QList<Scope*> favScopes() const;