Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/DesktopIntegration.vala
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,15 @@ public class Gala.DesktopIntegration : GLib.Object {

wm.window_overview.open (hints);
}

public void reorder_workspace (int index, int new_index) throws DBusError, IOError {
unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
unowned var workspace = workspace_manager.get_workspace_by_index (index);

if (workspace == null) {
throw new IOError.NOT_FOUND ("Invalid index, workspace not found");
}

workspace_manager.reorder_workspace (workspace, new_index);
}
}
11 changes: 10 additions & 1 deletion src/Widgets/MultitaskingView/MultitaskingView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public class Gala.MultitaskingView : ActorTarget, ActivatableComponent {
unowned var manager = display.get_workspace_manager ();
manager.workspace_added.connect (add_workspace);
manager.workspace_removed.connect (remove_workspace);
manager.workspaces_reordered.connect (() => reposition_icon_groups (false));
manager.workspaces_reordered.connect (on_workspaces_reordered);
manager.workspace_switched.connect (on_workspace_switched);

manager.bind_property (
Expand Down Expand Up @@ -397,6 +397,15 @@ public class Gala.MultitaskingView : ActorTarget, ActivatableComponent {
workspaces_gesture_controller.progress = -manager.get_active_workspace_index ();
}

private void on_workspaces_reordered () {
if (!visible) {
unowned var manager = display.get_workspace_manager ();
workspaces_gesture_controller.progress = -manager.get_active_workspace_index ();
}

reposition_icon_groups (false);
}

private void on_workspace_switched (int from, int to) {
if ((int) (-get_current_commit (SWITCH_WORKSPACE)) != to) {
workspaces_gesture_controller.goto (-to);
Expand Down