Skip to content

WorkspaceManager: Fix dynamic workspaces #2286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 2, 2025
Merged

WorkspaceManager: Fix dynamic workspaces #2286

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d558bf3
WorkspaceManager: Don't remove two ws if it's the second last
leolost2605 Mar 1, 2025
d4e98d8
Fix removal once again :(
leolost2605 Mar 1, 2025
aa657cd
Merge branch 'main' into leolost/fix-last-ws
leolost2605 Mar 2, 2025
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
65 changes: 26 additions & 39 deletions src/WorkspaceManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,8 @@ public class Gala.WorkspaceManager : Object {
}

private void workspace_switched (Meta.WorkspaceManager manager, int from, int to, Meta.MotionDirection direction) {
// remove empty workspaces after we switched away from them unless it's the last one
var prev_workspace = manager.get_workspace_by_index (from);
if (Utils.get_n_windows (prev_workspace) < 1
&& from != manager.get_n_workspaces () - 1
) {

// If we're about to remove a workspace, cancel any DnD going on in the multitasking view
// or else things might get broke
DragDropAction.cancel_all_by_id ("multitaskingview-window");

queue_remove_workspace (prev_workspace);
}
// remove empty workspaces after we switched away from them
maybe_remove_workspace (manager.get_workspace_by_index (from), null);
}

private void queue_window_added (Meta.Workspace? workspace, Meta.Window window) {
Expand Down Expand Up @@ -142,11 +132,6 @@ public class Gala.WorkspaceManager : Object {
return;
}

unowned Meta.WorkspaceManager manager = workspace.get_display ().get_workspace_manager ();
bool is_active_workspace = workspace == manager.get_active_workspace ();
var last_workspace_index = manager.get_n_workspaces () - 1;
unowned var last_workspace = manager.get_workspace_by_index (last_workspace_index);

if (window.window_type != Meta.WindowType.NORMAL
&& window.window_type != Meta.WindowType.DIALOG
&& window.window_type != Meta.WindowType.MODAL_DIALOG
Expand All @@ -159,24 +144,7 @@ public class Gala.WorkspaceManager : Object {
return;
}

// remove it right away if it was the active workspace and it's not the very last
// or we are in modal-mode
if ((!is_active_workspace || wm.is_modal ())
&& remove_freeze_count < 1
&& Utils.get_n_windows (workspace, true, window) == 0
&& workspace != last_workspace
) {
queue_remove_workspace (workspace);
}

// if window is the second last and empty, make it the last workspace
if (is_active_workspace
&& remove_freeze_count < 1
&& Utils.get_n_windows (workspace, true, window) == 0
&& workspace.index () == last_workspace_index - 1
) {
queue_remove_workspace (last_workspace);
}
maybe_remove_workspace (workspace, window);
}

private void window_entered_monitor (Meta.Display display, int monitor, Meta.Window window) {
Expand All @@ -198,6 +166,28 @@ public class Gala.WorkspaceManager : Object {
manager.append_new_workspace (false, display.get_current_time ());
}

private void maybe_remove_workspace (Meta.Workspace workspace, Meta.Window? window) {
unowned var manager = workspace.get_display ().get_workspace_manager ();
var is_active_workspace = workspace == manager.get_active_workspace ();
var last_workspace_index = manager.get_n_workspaces () - 1 - workspaces_marked_removed.size;

// remove it right away if it was the active workspace and it's not the very last
// or we are in modal-mode
if ((!is_active_workspace || wm.is_modal ())
&& remove_freeze_count < 1
&& Utils.get_n_windows (workspace, true, window) == 0
&& workspace.index () != last_workspace_index
) {
queue_remove_workspace (workspace);
} else if (is_active_workspace // if window is the second last and empty, make it the last workspace
&& remove_freeze_count < 1
&& Utils.get_n_windows (workspace, true, window) == 0
&& workspace.index () == last_workspace_index - 1
) {
queue_remove_workspace (manager.get_workspace_by_index (last_workspace_index));
}
}

private void queue_remove_workspace (Meta.Workspace workspace) {
// workspace has already been removed
if (workspace in workspaces_marked_removed) {
Expand Down Expand Up @@ -273,10 +263,7 @@ public class Gala.WorkspaceManager : Object {
unowned Meta.WorkspaceManager manager = wm.get_display ().get_workspace_manager ();

foreach (var workspace in manager.get_workspaces ()) {
var last_index = manager.get_n_workspaces () - 1;
if (Utils.get_n_windows (workspace) == 0 && workspace.index () != last_index) {
queue_remove_workspace (workspace);
}
maybe_remove_workspace (workspace, null);
}
}
}