AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix hover state handling

Browse Source 
We were not paying enough attention to detail when updating
hover and focus state while generating crossing events. The
invariant that we need to preserve here is that when a widget
has focus or hover, its parent does too.
This commit is contained in:
Matthias Clasen 2019-03-22 16:33:53 -04:00
parent 81658105f7
commit 1ada7bbc02
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkmain.c
View File

@ -1403,6 +1403,42 @@ get_virtual_notify_type (GdkNotifyType notify_type)
}
}
/* Determine from crossing mode details whether the ultimate
* target is us or a descendant. Keep this code in sync with
* gtkeventcontrollerkey.c:update_focus
*/
static gboolean
is_or_contains (gboolean enter,
GdkNotifyType detail)
{
gboolean is = FALSE;
gboolean contains = FALSE;
switch (detail)
{
case GDK_NOTIFY_VIRTUAL:
case GDK_NOTIFY_NONLINEAR_VIRTUAL:
is = FALSE;
contains = enter;
break;
case GDK_NOTIFY_ANCESTOR:
case GDK_NOTIFY_NONLINEAR:
is = enter;
contains = FALSE;
break;
case GDK_NOTIFY_INFERIOR:
is = enter;
contains = !enter;
break;
case GDK_NOTIFY_UNKNOWN:
default:
g_warning ("Unknown focus change detail");
return;
}
return is || contains;
}
static void
synth_crossing (GtkWidget *widget,
GtkWidget *toplevel,
@ -1451,7 +1487,7 @@ synth_crossing (GtkWidget *widget,
if (event->any.surface)
g_object_ref (event->any.surface);
if (enter)
if (is_or_contains (enter, notify_type))
gtk_widget_set_state_flags (widget, flags, FALSE);
else
gtk_widget_unset_state_flags (widget, flags);