[gtk] widget: Revert the event translation change
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] widget: Revert the event translation change
- Date: Mon, 6 May 2019 22:24:22 +0000 (UTC)
commit c6a42e92bb5b5af94e080d72555caa9b0df0ea2f
Author: Matthias Clasen <mclasen redhat com>
Date: Mon May 6 22:20:51 2019 +0000
widget: Revert the event translation change
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
gtk/gtkwidget.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 4eedd5a96c..bbc5ada6f6 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5255,11 +5255,7 @@ _gtk_widget_captured_event (GtkWidget *widget,
return TRUE;
event_copy = gdk_event_copy (event);
- if (!translate_event_coordinates (event_copy, widget))
- {
- g_object_unref (event_copy);
- return FALSE;
- }
+ translate_event_coordinates (event_copy, widget);
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);
- if (!translate_event_coordinates (event_copy, widget))
- {
- g_object_unref (event_copy);
- return FALSE;
- }
+ translate_event_coordinates (event_copy, widget);
if (widget == gtk_get_event_target (event_copy))
return_val |= gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_TARGET);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]