Revert "shell/app: Do not try to activate OR windows"
Now that shell_app_get_windows() itself filters out OR windows, this is
no longer needed.
This reverts commit f9037f5889
.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5233
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2252>
This commit is contained in:
parent
c02ca54943
commit
e4446cd15c
@ -428,19 +428,8 @@ shell_app_activate_window (ShellApp *app,
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
windows = shell_app_get_windows (app);
|
windows = shell_app_get_windows (app);
|
||||||
if (window == NULL)
|
if (window == NULL && windows)
|
||||||
{
|
window = windows->data;
|
||||||
for (GSList *l = windows; l; l = l->next)
|
|
||||||
{
|
|
||||||
MetaWindow *current_window = l->data;
|
|
||||||
|
|
||||||
if (!meta_window_is_override_redirect (current_window))
|
|
||||||
{
|
|
||||||
window = current_window;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!g_slist_find (windows, window))
|
if (!g_slist_find (windows, window))
|
||||||
return;
|
return;
|
||||||
@ -469,9 +458,7 @@ shell_app_activate_window (ShellApp *app,
|
|||||||
{
|
{
|
||||||
MetaWindow *other_window = iter->data;
|
MetaWindow *other_window = iter->data;
|
||||||
|
|
||||||
if (other_window != window &&
|
if (other_window != window && meta_window_get_workspace (other_window) == workspace)
|
||||||
!meta_window_is_override_redirect (other_window) &&
|
|
||||||
meta_window_get_workspace (other_window) == workspace)
|
|
||||||
meta_window_raise (other_window);
|
meta_window_raise (other_window);
|
||||||
}
|
}
|
||||||
g_slist_free (windows_reversed);
|
g_slist_free (windows_reversed);
|
||||||
|
Loading…
Reference in New Issue
Block a user