AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 11:20:12 +00:00
Code Issues Projects Releases Wiki Activity

window: update to gesture widget-level API changes

Browse Source
This commit is contained in:
Carlos Garnacho 2014-04-08 21:03:07 +02:00
parent 6350f58c1c
commit ff627511b7
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkmain.c
View File

@ -1558,6 +1558,12 @@ gtk_main_do_event (GdkEvent *event)
event_widget = gtk_get_event_widget (event); event_widget = gtk_get_event_widget (event);
} }
if (GTK_IS_WINDOW (event_widget))
{
if (_gtk_window_check_handle_wm_event (event))
return;
}
window_group = gtk_main_get_window_group (event_widget); window_group = gtk_main_get_window_group (event_widget);
device = gdk_event_get_device (event); device = gdk_event_get_device (event);

46
gtk/gtkwindow.c
View File

@ -1395,22 +1395,26 @@ multipress_gesture_pressed_cb (GtkGestureMultiPress *gesture,
priv = gtk_window_get_instance_private (window); priv = gtk_window_get_instance_private (window);
sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence); event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence);
if (!event)
return;
region = get_active_region_type (window, (GdkEventAny*) event, x, y); region = get_active_region_type (window, (GdkEventAny*) event, x, y);
priv->drag_possible = FALSE; priv->drag_possible = FALSE;
if (button == GDK_BUTTON_SECONDARY && region == GTK_WINDOW_REGION_TITLE) if (button == GDK_BUTTON_SECONDARY && region == GTK_WINDOW_REGION_TITLE)
{ {
gtk_window_do_popup (window, (GdkEventButton*) event); gtk_window_do_popup (window, (GdkEventButton*) event);
gtk_widget_set_sequence_state (widget, sequence, GTK_EVENT_SEQUENCE_CLAIMED); gtk_gesture_set_sequence_state (GTK_GESTURE (gesture),
sequence, GTK_EVENT_SEQUENCE_CLAIMED);
return; return;
} }
else if (button == GDK_BUTTON_MIDDLE && region == GTK_WINDOW_REGION_TITLE) else if (button == GDK_BUTTON_MIDDLE && region == GTK_WINDOW_REGION_TITLE)
{ {
gdk_window_lower (gtk_widget_get_window (GTK_WIDGET (window))); gdk_window_lower (gtk_widget_get_window (GTK_WIDGET (window)));
gtk_widget_set_sequence_state (widget, sequence, GTK_EVENT_SEQUENCE_CLAIMED); gtk_gesture_set_sequence_state (GTK_GESTURE (gesture),
sequence, GTK_EVENT_SEQUENCE_CLAIMED);
return; return;
} }
else if (button != GDK_BUTTON_PRIMARY) else if (button != GDK_BUTTON_PRIMARY)
@ -1428,8 +1432,8 @@ multipress_gesture_pressed_cb (GtkGestureMultiPress *gesture,
case GTK_WINDOW_REGION_TITLE: case GTK_WINDOW_REGION_TITLE:
if (!window_drag && event_widget != widget) if (!window_drag && event_widget != widget)
{ {
gtk_widget_set_sequence_state (widget, sequence, gtk_gesture_set_sequence_state (GTK_GESTURE (gesture),
GTK_EVENT_SEQUENCE_DENIED); sequence, GTK_EVENT_SEQUENCE_DENIED);
return; return;
} }
@ -1453,10 +1457,12 @@ multipress_gesture_pressed_cb (GtkGestureMultiPress *gesture,
x_root, y_root, x_root, y_root,
gdk_event_get_time (event)); gdk_event_get_time (event));
} }
break; break;
} }
gtk_widget_set_sequence_state (widget, sequence, GTK_EVENT_SEQUENCE_CLAIMED); gtk_gesture_set_sequence_state (GTK_GESTURE (gesture),
sequence, GTK_EVENT_SEQUENCE_CLAIMED);
} }
static void static void
@ -1491,6 +1497,7 @@ multipress_gesture_stopped_cb (GtkGestureMultiPress *gesture,
gdk_event_get_time (event)); gdk_event_get_time (event));
} }
gtk_event_controller_reset (GTK_EVENT_CONTROLLER (gesture));
priv->drag_possible = FALSE; priv->drag_possible = FALSE;
} }
@ -1565,13 +1572,15 @@ gtk_window_init (GtkWindow *window)
priv->scale = gtk_widget_get_scale_factor (widget); priv->scale = gtk_widget_get_scale_factor (widget);
priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (window)); priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (window));
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->multipress_gesture),
GTK_PHASE_CAPTURE);
gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->multipress_gesture), FALSE); gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->multipress_gesture), FALSE);
g_signal_connect (priv->multipress_gesture, "pressed", g_signal_connect (priv->multipress_gesture, "pressed",
G_CALLBACK (multipress_gesture_pressed_cb), window); G_CALLBACK (multipress_gesture_pressed_cb), window);
g_signal_connect (priv->multipress_gesture, "stopped", g_signal_connect (priv->multipress_gesture, "stopped",
G_CALLBACK (multipress_gesture_stopped_cb), window); G_CALLBACK (multipress_gesture_stopped_cb), window);
gtk_widget_add_gesture (GTK_WIDGET (window), priv->multipress_gesture, gtk_widget_add_controller (GTK_WIDGET (window),
GTK_PHASE_CAPTURE); GTK_EVENT_CONTROLLER (priv->multipress_gesture));
} }
static void static void
@ -7848,6 +7857,27 @@ get_active_region_type (GtkWindow *window, GdkEventAny *event, gint x, gint y)
return GTK_WINDOW_REGION_CONTENT; return GTK_WINDOW_REGION_CONTENT;
} }
gboolean
_gtk_window_check_handle_wm_event (GdkEvent *event)
{
GtkWindowPrivate *priv;
GtkWidget *widget;
widget = gtk_get_event_widget (event);
if (GTK_IS_WINDOW (widget) &&
(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;
return gtk_event_controller_handle_event (GTK_EVENT_CONTROLLER (priv->multipress_gesture),
(const GdkEvent*) event);
}
return FALSE;
}
static void static void
gtk_window_real_activate_default (GtkWindow *window) gtk_window_real_activate_default (GtkWindow *window)
{ {