applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Avoid handling map events from other windows

Browse source 
The CcWindow tries to unset the focus when first mapping the window.
However this pretty wide check intercepts mapping events from other
windows than the toplevel (e.g. subsurfaces, for popovers). This
causes the focus to move away from the popover, overriding its
modality.

Check that the event received is addressed to the CcWindow's
GDK window before unsetting the focus, so we don't mess with popover
focus.

Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1327


(cherry picked from commit 7196e8aaea)
This commit is contained in:
Carlos Garnacho 2021-04-21 18:54:06 +00:00 • committed by Georges Basile Stavracas Neto
parent 0da2ef8b0b
commit bd23f743d3
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/cc-window.c
View file

@ -585,12 +585,17 @@ gdk_window_set_cb (CcWindow *self)
}
static gboolean
window_map_event_cb (CcWindow *self)
window_map_event_cb (CcWindow *self,
GdkEvent *event)
{
/* If focus ends up in a category icon view one of the items is
* immediately selected which looks odd when we are starting up, so
* we explicitly unset the focus here. */
gtk_window_set_focus (GTK_WINDOW (self), NULL);
if (event->any.window == gtk_widget_get_window (GTK_WIDGET (self)))
{
/* If focus ends up in a category icon view one of the items is
* immediately selected which looks odd when we are starting up, so
* we explicitly unset the focus here. */
gtk_window_set_focus (GTK_WINDOW (self), NULL);
}
return GDK_EVENT_PROPAGATE;
}