0373f3c · unity8 · git.iko.soy

git.iko.soy/unity8

allow qml access to move

commit0373f3c012ee062e4ef86f5fa684dca9984d5916 authorNick Dedekind <nick.dedekind@canonical.com> dateThu 2 Mar 2017, 17:24 (10 years ago) parent47aff7b

2 files changed+9−1

compare with xenial

unifiedsplit

plugins/WindowManager/WorkspaceModel.cpp+5 plugins/WindowManager/WorkspaceModel.h+4−1

plugins/WindowManager/WorkspaceModel.cpp+5

@@ -180,3 +180,8 @@ WorkspaceModelProxy::~WorkspaceModelProxy()

180180 qDeleteAll(m_workspaces.toList()); // make a copy so the list doesnt edit itself during delete.

181181 m_workspaces.clear();

182182}

183+

184+void WorkspaceModelProxy::move(int from, int to)

185+{

186+ WorkspaceModel::move(from, to);

187+}

plugins/WindowManager/WorkspaceModel.h+4−1

@@ -45,7 +45,7 @@ public:

4545 void append(Workspace *workspace);

4646 void insert(int index, Workspace *workspace);

4747 void remove(Workspace* workspace);

48− void move(int from, int to);

48+ virtual void move(int from, int to);

4949

5050 int indexOf(Workspace *workspace) const;

5151 Workspace* get(int index) const;

@@ -74,10 +74,13 @@ protected:

7474

7575class WorkspaceModelProxy : public WorkspaceModel

7676{

77+ Q_OBJECT

7778public:

7879 WorkspaceModelProxy(WorkspaceModel*const model);

7980 ~WorkspaceModelProxy();

8081

82+ Q_INVOKABLE void move(int from, int to) override;

83+

8184private:

8285 const QPointer<WorkspaceModel> m_original;

8386};