diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-09 06:14:59 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2018-04-26 17:59:42 +0200 |
| commit | 4ddc94b293504b56c0106b0177c36c8efd2d3a57 (patch) | |
| tree | b620c608c025e287685a04afa8429d5541e12274 /gtk/gtkexpander.c | |
| parent | 71991270b047c66e7c14a65aaa70703527c978cf (diff) | |
| download | gtk+-4ddc94b293504b56c0106b0177c36c8efd2d3a57.tar.gz | |
multipressgesture: Port to new API model
Diffstat (limited to 'gtk/gtkexpander.c')
| -rw-r--r-- | gtk/gtkexpander.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 0777fc39a6..91aba25726 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -155,8 +155,6 @@ struct _GtkExpanderPrivate GtkWidget *arrow_widget; GtkWidget *child; - GtkGesture *multipress_gesture; - guint expand_timer; guint expanded : 1; @@ -338,6 +336,7 @@ static void gtk_expander_init (GtkExpander *expander) { GtkExpanderPrivate *priv = gtk_expander_get_instance_private (expander); + GtkGesture *gesture; gtk_widget_set_can_focus (GTK_WIDGET (expander), TRUE); gtk_widget_set_has_surface (GTK_WIDGET (expander), FALSE); @@ -367,15 +366,16 @@ gtk_expander_init (GtkExpander *expander) gtk_drag_dest_set (GTK_WIDGET (expander), 0, NULL, 0); gtk_drag_dest_set_track_motion (GTK_WIDGET (expander), TRUE); - priv->multipress_gesture = gtk_gesture_multi_press_new (priv->title_widget); - gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), + gesture = gtk_gesture_multi_press_new (); + gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_PRIMARY); - gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->multipress_gesture), + gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE); - g_signal_connect (priv->multipress_gesture, "released", + g_signal_connect (gesture, "released", G_CALLBACK (gesture_multipress_released_cb), expander); - gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->multipress_gesture), + gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture), GTK_PHASE_BUBBLE); + gtk_widget_add_controller (GTK_WIDGET (priv->title_widget), GTK_EVENT_CONTROLLER (gesture)); } static GtkBuildableIface *parent_buildable_iface; @@ -491,8 +491,6 @@ gtk_expander_destroy (GtkWidget *widget) priv->arrow_widget = NULL; } - g_clear_object (&priv->multipress_gesture); - GTK_WIDGET_CLASS (gtk_expander_parent_class)->destroy (widget); } |