window: Handle layer of DESKTOP windows

Assigning the corresponding stack layer of DESKTOP windows is
currently X11 specific, because there is no way for wayland
clients to set the DESKTOP window type.

This is about to change, so move the code to the generic layer
handling.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3305>
This commit is contained in:
Florian Müllner 2023-09-29 13:34:54 +02:00 committed by Marge Bot
parent 3a5ecca348
commit b9008ee83d
2 changed files with 2 additions and 4 deletions

View File

@ -6137,6 +6137,8 @@ meta_window_get_default_layer (MetaWindow *window)
return META_LAYER_BOTTOM; return META_LAYER_BOTTOM;
else if (window->wm_state_above && !META_WINDOW_MAXIMIZED (window)) else if (window->wm_state_above && !META_WINDOW_MAXIMIZED (window))
return META_LAYER_TOP; return META_LAYER_TOP;
else if (window->type == META_WINDOW_DESKTOP)
return META_LAYER_DESKTOP;
else else
return META_LAYER_NORMAL; return META_LAYER_NORMAL;
} }

View File

@ -1920,10 +1920,6 @@ get_standalone_layer (MetaWindow *window)
switch (window->type) switch (window->type)
{ {
case META_WINDOW_DESKTOP:
layer = META_LAYER_DESKTOP;
break;
case META_WINDOW_DOCK: case META_WINDOW_DOCK:
if (window->wm_state_below || if (window->wm_state_below ||
(window->monitor && window->monitor->in_fullscreen)) (window->monitor && window->monitor->in_fullscreen))