AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkbutton: Use key controller for button (de)activation through keybindings

Browse Source 
And stop using GtkWidget::event for good.
This commit is contained in:
Carlos Garnacho 2018-06-05 14:34:36 +02:00
parent 5c46c81067
commit 5f0ed088e4
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gtk/gtkbutton.c
View File

@ -61,6 +61,7 @@
#include "gtkcheckbutton.h"
#include "gtkcontainerprivate.h"
#include "gtkgesturemultipress.h"
#include "gtkeventcontrollerkey.h"
#include "gtkimage.h"
#include "gtkintl.h"
#include "gtklabel.h"
@ -87,6 +88,7 @@ struct _GtkButtonPrivate
GdkDevice *grab_keyboard;
GtkGesture *gesture;
GtkEventController *key_controller;
guint activate_timeout;
@ -136,7 +138,6 @@ static void gtk_button_get_property (GObject *object,
static void gtk_button_display_changed (GtkWidget *widget,
GdkDisplay *previous_display);
static void gtk_button_unrealize (GtkWidget * widget);
static gint gtk_button_event (GtkWidget * widget, GdkEvent * event);
static void gtk_real_button_clicked (GtkButton * button);
static void gtk_real_button_activate (GtkButton *button);
static void gtk_button_update_state (GtkButton *button);
@ -212,7 +213,6 @@ gtk_button_class_init (GtkButtonClass *klass)
widget_class->display_changed = gtk_button_display_changed;
widget_class->unrealize = gtk_button_unrealize;
widget_class->event = gtk_button_event;
widget_class->state_flags_changed = gtk_button_state_flags_changed;
widget_class->grab_notify = gtk_button_grab_notify;
widget_class->unmap = gtk_button_unmap;
@ -402,6 +402,31 @@ multipress_gesture_cancel_cb (GtkGesture *gesture,
gtk_button_do_release (button, FALSE);
}
static gboolean
key_controller_key_pressed_cb (GtkEventControllerKey *controller,
guint keyval,
guint keycode,
guint modifiers,
GtkButton *button)
{
GtkButtonPrivate *priv = gtk_button_get_instance_private (button);
return priv->activate_timeout != 0;
}
static void
key_controller_key_released_cb (GtkEventControllerKey *controller,
guint keyval,
guint keycode,
guint modifiers,
GtkButton *button)
{
GtkButtonPrivate *priv = gtk_button_get_instance_private (button);
if (priv->activate_timeout)
gtk_button_finish_activate (button, TRUE);
}
static void
gtk_button_set_child_type (GtkButton *button, guint child_type)
{
@ -442,6 +467,11 @@ gtk_button_init (GtkButton *button)
g_signal_connect (priv->gesture, "cancel", G_CALLBACK (multipress_gesture_cancel_cb), button);
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_CAPTURE);
gtk_widget_add_controller (GTK_WIDGET (button), GTK_EVENT_CONTROLLER (priv->gesture));
priv->key_controller = gtk_event_controller_key_new ();
g_signal_connect (priv->key_controller, "key-pressed", G_CALLBACK (key_controller_key_pressed_cb), button);
g_signal_connect (priv->key_controller, "key-released", G_CALLBACK (key_controller_key_released_cb), button);
gtk_widget_add_controller (GTK_WIDGET (button), priv->key_controller);
}
static void
@ -753,27 +783,6 @@ gtk_button_do_release (GtkButton *button,
}
}
static gboolean
gtk_button_event (GtkWidget *widget,
GdkEvent *event)
{
GtkButton *button = GTK_BUTTON (widget);
GtkButtonPrivate *priv = gtk_button_get_instance_private (button);
if (gdk_event_get_event_type (event) != GDK_KEY_RELEASE)
return GDK_EVENT_PROPAGATE;
if (priv->activate_timeout)
{
gtk_button_finish_activate (button, TRUE);
return GDK_EVENT_STOP;
}
else if (GTK_WIDGET_CLASS (gtk_button_parent_class)->event)
return GTK_WIDGET_CLASS (gtk_button_parent_class)->event (widget, event);
else
return GDK_EVENT_PROPAGATE;
}
static void
gtk_real_button_clicked (GtkButton *button)
{