421d2a7 · unity8 · git.iko.soy

on xenial help sign in

fixed move workspace content order

421d2a7Nick Dedekind10 years ago

plugins/WindowManager/WorkspaceManager.cpp+3−3

@@ -79,7 +79,7 @@ void WorkspaceManager::destroyWorkspace(Workspace *workspace)

79 setActiveWorkspace(m_allWorkspaces.count() ? *m_allWorkspaces.begin() : nullptr);

80 }

81 if (m_activeWorkspace) {

82− moveWorkspaceContentToWorkspace(workspace, m_activeWorkspace);

82+ moveWorkspaceContentToWorkspace(m_activeWorkspace, workspace);

83 }

85 disconnect(workspace, 0, this, 0);

@@ -107,11 +107,11 @@ void WorkspaceManager::moveSurfaceToWorkspace(unity::shell::application::MirSurf

107 }

108}

109

110−void WorkspaceManager::moveWorkspaceContentToWorkspace(Workspace *from, Workspace *to)

110+void WorkspaceManager::moveWorkspaceContentToWorkspace(Workspace *to, Workspace *from)

111{

112 auto surfaceManager = WindowManagerObjects::instance()->surfaceManager();

113 if (surfaceManager) {

114− surfaceManager->moveWorkspaceContentToWorkspace(from->workspace(), to->workspace());

114+ surfaceManager->moveWorkspaceContentToWorkspace(to->workspace(), from->workspace());

115 }

116}

117

plugins/WindowManager/WorkspaceManager.h+1−1

@@ -52,7 +52,7 @@ public:

52 Q_INVOKABLE void moveSurfaceToWorkspace(unity::shell::application::MirSurfaceInterface* surface,

53 Workspace* workspace);

55− Q_INVOKABLE void moveWorkspaceContentToWorkspace(Workspace* from, Workspace* to);

55+ Q_INVOKABLE void moveWorkspaceContentToWorkspace(Workspace* to, Workspace* from);

57Q_SIGNALS:

58 void activeWorkspaceChanged();