Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "gtkwidget: Ensure unrealization during event dispatching cancels gestures"

Browse Source 
This reverts commit 13873d2c50.
This commit is contained in:
Carlos Garnacho
2015-09-18 12:59:00 +02:00
parent bdb854d92c
commit f860afc92e
1 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkwidget.c
View File

@@ -7356,22 +7356,6 @@ cancel_event_sequence_on_hierarchy (GtkWidget *widget,
} }
} }
static void
event_check_cancel_sequence_on_hierarchy (GtkWidget *widget,
GdkEvent *event)
{
GdkDevice *source_device;
source_device = gdk_event_get_source_device (event);
if (source_device &&
gdk_device_get_source (source_device) != GDK_SOURCE_KEYBOARD &&
event->type != GDK_ENTER_NOTIFY && event->type != GDK_LEAVE_NOTIFY)
cancel_event_sequence_on_hierarchy (widget,
gtk_get_event_widget (event),
gdk_event_get_event_sequence (event));
}
gboolean gboolean
_gtk_widget_captured_event (GtkWidget *widget, _gtk_widget_captured_event (GtkWidget *widget,
GdkEvent *event) GdkEvent *event)
@@ -7402,15 +7386,7 @@ _gtk_widget_captured_event (GtkWidget *widget,
g_object_ref (widget); g_object_ref (widget);
return_val |= handler (widget, event); return_val |= handler (widget, event);
return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event);
if (!WIDGET_REALIZED_FOR_EVENT (widget, event))
{
/* We stop event propagation, but still we must ensure the sequence is
* cancelled across the widget hierarchy.
*/
event_check_cancel_sequence_on_hierarchy (widget, event);
return_val = TRUE;
}
/* The widget that was originally to receive the event /* The widget that was originally to receive the event
* handles motion hints, but the capturing widget might * handles motion hints, but the capturing widget might
@@ -7725,13 +7701,7 @@ gtk_widget_event_internal (GtkWidget *widget,
if (WIDGET_REALIZED_FOR_EVENT (widget, event)) if (WIDGET_REALIZED_FOR_EVENT (widget, event))
g_signal_emit (widget, widget_signals[EVENT_AFTER], 0, event); g_signal_emit (widget, widget_signals[EVENT_AFTER], 0, event);
else else
{ return_val = TRUE;
/* We stop event propagation, but still we must ensure the sequence is
* cancelled across the widget hierarchy.
*/
event_check_cancel_sequence_on_hierarchy (widget, event);
return_val = TRUE;
}
g_object_unref (widget); g_object_unref (widget);