brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

default-plugin: Handle unmanaging windows in switch_workspace

Browse Source 
Also add a regression metatest.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2559
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2782>
This commit is contained in:
Sebastian Wick 2023-01-04 03:46:33 +01:00
parent fbe7a8df3a
commit 17c52854b7
3 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/compositor/plugins/default.c
View File

@ -555,25 +555,32 @@ switch_workspace (MetaPlugin *plugin,
ActorPrivate *apriv = get_actor_private (window_actor); ActorPrivate *apriv = get_actor_private (window_actor);
ClutterActor *actor = CLUTTER_ACTOR (window_actor); ClutterActor *actor = CLUTTER_ACTOR (window_actor);
MetaWindow *window; MetaWindow *window;
MetaWorkspace *workspace;
gint workspace_idx;
window = meta_window_actor_get_meta_window (window_actor); window = meta_window_actor_get_meta_window (window_actor);
workspace = meta_window_get_workspace (window);
if (!workspace)
{
/* unmanaging window */
clutter_actor_hide (actor);
apriv->orig_parent = NULL;
continue;
}
if (meta_window_is_on_all_workspaces (window)) if (meta_window_is_on_all_workspaces (window))
{ {
/* Sticky window */ /* Sticky window */
apriv->orig_parent = NULL; apriv->orig_parent = NULL;
continue;
} }
else
{
MetaWorkspace *workspace;
gint win_workspace;
workspace = meta_window_get_workspace (window); workspace_idx = meta_workspace_index (workspace);
win_workspace = meta_workspace_index (workspace);
if (win_workspace == to || win_workspace == from) if (workspace_idx == to || workspace_idx == from)
{ {
ClutterActor *parent = win_workspace == to ? workspace1 ClutterActor *parent = workspace_idx == to ? workspace1
: workspace2; : workspace2;
apriv->orig_parent = clutter_actor_get_parent (actor); apriv->orig_parent = clutter_actor_get_parent (actor);
@ -583,15 +590,13 @@ switch_workspace (MetaPlugin *plugin,
clutter_actor_add_child (parent, actor); clutter_actor_add_child (parent, actor);
clutter_actor_set_child_below_sibling (parent, actor, NULL); clutter_actor_set_child_below_sibling (parent, actor, NULL);
g_object_unref (actor); g_object_unref (actor);
continue;
} }
else
{
/* Window on some other desktop */ /* Window on some other desktop */
clutter_actor_hide (actor); clutter_actor_hide (actor);
apriv->orig_parent = NULL; apriv->orig_parent = NULL;
} }
}
}
priv->desktop1 = workspace1; priv->desktop1 = workspace1;
priv->desktop2 = workspace2; priv->desktop2 = workspace2;

1
src/tests/meson.build
View File

@ -446,6 +446,7 @@ stacking_tests = [
'workspace-test', 'workspace-test',
'always-on-top', 'always-on-top',
'focus-default-window-globally-active-input', 'focus-default-window-globally-active-input',
'workspace-unmanaging-window',
] ]
foreach stacking_test: stacking_tests foreach stacking_test: stacking_tests

11
src/tests/stacking/workspace-unmanaging-window.metatest Normal file
View File

@ -0,0 +1,11 @@
num_workspaces 2
activate_workspace 0
new_client 1 wayland
create 1/1
show 1/1
wait
quit_client 1
activate_workspace 1
wait