git.iko.soy/unity8
on xenial help sign in
fixed move workspace content order
commit421d2a7bc63b67c8bfa2e308d6f9f79b0c8216e9 authorNick Dedekind <nick.dedekind@canonical.com> dateFri 17 Mar 2017, 15:31 (10 years ago) parente174ec3
2 files changed+4−4
compare with xenial
unifiedsplit
plugins/WindowManager/WorkspaceManager.cpp+3−3 plugins/WindowManager/WorkspaceManager.h+1−1
plugins/WindowManager/WorkspaceManager.cpp+3−3
@@ -79,7 +79,7 @@ void WorkspaceManager::destroyWorkspace(Workspace *workspace)
7979 setActiveWorkspace(m_allWorkspaces.count() ? *m_allWorkspaces.begin() : nullptr);
8080 }
8181 if (m_activeWorkspace) {
82− moveWorkspaceContentToWorkspace(workspace, m_activeWorkspace);
82+ moveWorkspaceContentToWorkspace(m_activeWorkspace, workspace);
8383 }
8484
8585 disconnect(workspace, 0, this, 0);
@@ -107,11 +107,11 @@ void WorkspaceManager::moveSurfaceToWorkspace(unity::shell::application::MirSurf
107107 }
108108}
109109
110−void WorkspaceManager::moveWorkspaceContentToWorkspace(Workspace *from, Workspace *to)
110+void WorkspaceManager::moveWorkspaceContentToWorkspace(Workspace *to, Workspace *from)
111111{
112112 auto surfaceManager = WindowManagerObjects::instance()->surfaceManager();
113113 if (surfaceManager) {
114− surfaceManager->moveWorkspaceContentToWorkspace(from->workspace(), to->workspace());
114+ surfaceManager->moveWorkspaceContentToWorkspace(to->workspace(), from->workspace());
115115 }
116116}
117117
plugins/WindowManager/WorkspaceManager.h+1−1
@@ -52,7 +52,7 @@ public:
5252 Q_INVOKABLE void moveSurfaceToWorkspace(unity::shell::application::MirSurfaceInterface* surface,
5353 Workspace* workspace);
5454
55− Q_INVOKABLE void moveWorkspaceContentToWorkspace(Workspace* from, Workspace* to);
55+ Q_INVOKABLE void moveWorkspaceContentToWorkspace(Workspace* to, Workspace* from);
5656
5757Q_SIGNALS:
5858 void activeWorkspaceChanged();