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

widget: Revert the event translation change

Browse Source 
This is a temporary revert to make menus work
in the 3.96 release, until we land the popup
surface work and port menus to it.

Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1755
This commit is contained in:
Matthias Clasen 2019-05-06 22:20:51 +00:00
parent 73ff7baa1b
commit c6a42e92bb
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwidget.c
View File

@ -5255,11 +5255,7 @@ _gtk_widget_captured_event (GtkWidget *widget,
return TRUE; return TRUE;
event_copy = gdk_event_copy (event); event_copy = gdk_event_copy (event);
if (!translate_event_coordinates (event_copy, widget)) translate_event_coordinates (event_copy, widget);
{
g_object_unref (event_copy);
return FALSE;
}
return_val = gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_CAPTURE); return_val = gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_CAPTURE);
@ -5361,11 +5357,7 @@ gtk_widget_event_internal (GtkWidget *widget,
event_copy = gdk_event_copy (event); event_copy = gdk_event_copy (event);
if (!translate_event_coordinates (event_copy, widget)) translate_event_coordinates (event_copy, widget);
{
g_object_unref (event_copy);
return FALSE;
}
if (widget == gtk_get_event_target (event_copy)) if (widget == gtk_get_event_target (event_copy))
return_val |= gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_TARGET); return_val |= gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_TARGET);