Skip to content

Move window to old workspace when destroying the window #2146

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

Closed
wants to merge 2 commits into from
Closed

Move window to old workspace when destroying the window #2146

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743a3a6
Simplify `handle_fullscreen_window`
lenemter Dec 7, 2024
a04d5a7
Move window to old workspace when destroying the window
lenemter Dec 7, 2024
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
44 changes: 6 additions & 38 deletions src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,46 +1174,14 @@ namespace Gala {
*/

private void handle_fullscreen_window (Meta.Window window, Meta.SizeChange which_change) {
// Only handle windows which are located on the primary monitor
if (!window.is_on_primary_monitor () || !behavior_settings.get_boolean ("move-fullscreened-workspace"))
if (!behavior_settings.get_boolean ("move-fullscreened-workspace")) {
return;

// Due to how this is implemented, by relying on the functionality
// offered by the dynamic workspace handler, let's just bail out
// if that's not available.
if (!Meta.Prefs.get_dynamic_workspaces ())
return;

unowned Meta.Display display = get_display ();
var time = display.get_current_time ();
unowned Meta.Workspace win_ws = window.get_workspace ();
unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
}

if (which_change == Meta.SizeChange.FULLSCREEN) {
// Do nothing if the current workspace would be empty
if (Utils.get_n_windows (win_ws) <= 1)
return;

var old_ws_index = win_ws.index ();
var new_ws_index = old_ws_index + 1;
InternalUtils.insert_workspace_with_window (new_ws_index, window);

unowned var new_ws = manager.get_workspace_by_index (new_ws_index);
window.change_workspace (new_ws);
new_ws.activate_with_focus (window, time);

ws_assoc.insert (window, old_ws_index);
} else if (ws_assoc.contains (window)) {
var old_ws_index = ws_assoc.get (window);
var new_ws_index = win_ws.index ();

if (new_ws_index != old_ws_index && old_ws_index < manager.get_n_workspaces ()) {
unowned var old_ws = manager.get_workspace_by_index (old_ws_index);
window.change_workspace (old_ws);
old_ws.activate_with_focus (window, time);
}

ws_assoc.remove (window);
move_window_to_next_ws (window);
} else {
move_window_to_old_ws (window);
}
}

Expand Down Expand Up @@ -1610,7 +1578,7 @@ namespace Gala {
public override void destroy (Meta.WindowActor actor) {
unowned var window = actor.get_meta_window ();

ws_assoc.remove (window);
move_window_to_old_ws (window);

actor.remove_all_transitions ();

Expand Down
Loading