0373f3c · unity8 · git.iko.soy

on xenial help sign in

allow qml access to move

0373f3cNick Dedekind10 years ago

plugins/WindowManager/WorkspaceModel.cpp+5

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

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

181 m_workspaces.clear();

182}

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:

45 void append(Workspace *workspace);

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

47 void remove(Workspace* workspace);

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

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

50 int indexOf(Workspace *workspace) const;

51 Workspace* get(int index) const;

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

75class WorkspaceModelProxy : public WorkspaceModel

76{

77+ Q_OBJECT

77public:

78public:

78 WorkspaceModelProxy(WorkspaceModel*const model);

79 WorkspaceModelProxy(WorkspaceModel*const model);

79 ~WorkspaceModelProxy();

80 ~WorkspaceModelProxy();

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

83+

81private:

84private:

82 const QPointer<WorkspaceModel> m_original;

85 const QPointer<WorkspaceModel> m_original;

83};

86};