callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window: Refactor _gtk_window_check_handle_wm_event()

Browse Source 
Separate the event widget check from event handling
This commit is contained in:
Carlos Garnacho 2014-06-02 17:53:53 +02:00
parent e1c425a24d
commit 7f33706c12
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtkwindow.c
View File

@ -7877,26 +7877,37 @@ get_active_region_type (GtkWindow *window, GdkEventAny *event, gint x, gint y)
return GTK_WINDOW_REGION_CONTENT; return GTK_WINDOW_REGION_CONTENT;
} }
gboolean static gboolean
_gtk_window_check_handle_wm_event (GdkEvent *event) gtk_window_handle_wm_event (GtkWindow *window,
GdkEvent *event)
{ {
GtkWindowPrivate *priv; GtkWindowPrivate *priv;
GtkWidget *widget;
widget = gtk_get_event_widget (event); if (event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE ||
event->type == GDK_TOUCH_BEGIN || event->type == GDK_TOUCH_UPDATE ||
if (GTK_IS_WINDOW (widget) && event->type == GDK_MOTION_NOTIFY || event->type == GDK_TOUCH_END)
(event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE ||
event->type == GDK_TOUCH_BEGIN || event->type == GDK_TOUCH_UPDATE ||
event->type == GDK_MOTION_NOTIFY || event->type == GDK_TOUCH_END))
{ {
priv = GTK_WINDOW (widget)->priv; priv = window->priv;
if (priv->multipress_gesture) if (priv->multipress_gesture)
return gtk_event_controller_handle_event (GTK_EVENT_CONTROLLER (priv->multipress_gesture), return gtk_event_controller_handle_event (GTK_EVENT_CONTROLLER (priv->multipress_gesture),
(const GdkEvent*) event); (const GdkEvent*) event);
} }
return FALSE; return GDK_EVENT_PROPAGATE;
}
gboolean
_gtk_window_check_handle_wm_event (GdkEvent *event)
{
GtkWidget *widget;
widget = gtk_get_event_widget (event);
if (!GTK_IS_WINDOW (widget))
return GDK_EVENT_PROPAGATE;
return gtk_window_handle_wm_event (GTK_WINDOW (widget), event);
} }
static void static void