Skip to content
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

WindowManager/workspace switcher: Fix stacking order of moving window #2156

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

WindowManager/workspace switcher: Fix stacking order of moving window #2156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28dda8
WindowManager/workspace switcher: Fix stacking order of moving window
leolost2605 Dec 11, 2024
9cea3f1
Merge branch 'main' into leolost/fix-moving-stacking-order
leolost2605 Dec 21, 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
34 changes: 4 additions & 30 deletions src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,29 +1961,7 @@ namespace Gala {
}
main_container.add_child (static_windows);

// if we have a move action, pack that window to the static ones
if (moving != null) {
unowned var moving_actor = (Meta.WindowActor) moving.get_compositor_private ();

windows.prepend (moving_actor);
parents.prepend (moving_actor.get_parent ());

moving_actor.set_translation (-clone_offset_x, -clone_offset_y, 0);
clutter_actor_reparent (moving_actor, static_windows);
}

unowned var grabbed_window = window_grab_tracker.current_window;

if (grabbed_window != null) {
unowned var moving_actor = (Meta.WindowActor) grabbed_window.get_compositor_private ();

windows.prepend (moving_actor);
parents.prepend (moving_actor.get_parent ());

moving_actor.set_translation (-clone_offset_x, -clone_offset_y, 0);
clutter_actor_reparent (moving_actor, static_windows);
}

var to_has_fullscreened = false;
var from_has_fullscreened = false;

Expand All @@ -1999,15 +1977,11 @@ namespace Gala {
continue;
}

if (!window.showing_on_its_workspace () ||
move_primary_only && !window.is_on_primary_monitor () ||
window == moving ||
window == grabbed_window) {

if (!window.showing_on_its_workspace () || move_primary_only && !window.is_on_primary_monitor ()) {
continue;
}

if (window.on_all_workspaces) {
if (window.on_all_workspaces || window == moving || window == grabbed_window) {
// notifications use their own group and are always on top
if (NotificationStack.is_notification (window)) {
continue;
Expand All @@ -2019,8 +1993,8 @@ namespace Gala {
clutter_actor_reparent (actor, static_windows);
actor.set_translation (-clone_offset_x, -clone_offset_y, 0);

// Don't fade docks they just stay where they are
if (window.window_type == DOCK) {
// Don't fade docks and moving/grabbed windows they just stay where they are
if (window.window_type == DOCK || window == moving || window == grabbed_window) {
continue;
}

Expand Down
Loading