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

a11y: Stop using ::focus-in/out-event

Browse Source 
We can just use the generic ::event signal.
This commit is contained in:
Matthias Clasen 2018-01-06 11:48:53 -05:00
parent 5759bc59c9
commit 144448d18b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/a11y/gtkwidgetaccessible.c
View File

@ -45,18 +45,21 @@ G_DEFINE_TYPE_WITH_CODE (GtkWidgetAccessible, gtk_widget_accessible, GTK_TYPE_AC
/* Translate GtkWidget::focus-in/out-event to AtkObject::focus-event */ /* Translate GtkWidget::focus-in/out-event to AtkObject::focus-event */
static gboolean static gboolean
focus_cb (GtkWidget *widget, focus_cb (GtkWidget *widget,
GdkEventFocus *event) GdkEvent *event)
{ {
AtkObject *obj; if (gdk_event_get_event_type (event) == GDK_FOCUS_CHANGE)
gboolean in; {
AtkObject *obj;
gboolean in;
obj = gtk_widget_get_accessible (widget); obj = gtk_widget_get_accessible (widget);
gdk_event_get_focus_in ((GdkEvent *)event, &in); gdk_event_get_focus_in (event, &in);
g_signal_emit_by_name (obj, "focus-event", in); g_signal_emit_by_name (obj, "focus-event", in);
}
return FALSE; return GDK_EVENT_PROPAGATE;
} }
/* Translate GtkWidget property change notification to the notify_gtk vfunc */ /* Translate GtkWidget property change notification to the notify_gtk vfunc */
@ -134,8 +137,7 @@ gtk_widget_accessible_initialize (AtkObject *obj,
widget = GTK_WIDGET (data); widget = GTK_WIDGET (data);
g_signal_connect_after (widget, "focus-in-event", G_CALLBACK (focus_cb), NULL); g_signal_connect_after (widget, "event", G_CALLBACK (focus_cb), NULL);
g_signal_connect_after (widget, "focus-out-event", G_CALLBACK (focus_cb), NULL);
g_signal_connect (widget, "notify", G_CALLBACK (notify_cb), NULL); g_signal_connect (widget, "notify", G_CALLBACK (notify_cb), NULL);
g_signal_connect (widget, "size-allocate", G_CALLBACK (size_allocate_cb), NULL); g_signal_connect (widget, "size-allocate", G_CALLBACK (size_allocate_cb), NULL);
g_signal_connect (widget, "map", G_CALLBACK (map_cb), NULL); g_signal_connect (widget, "map", G_CALLBACK (map_cb), NULL);
@ -465,7 +467,7 @@ gtk_widget_accessible_notify_gtk (GObject *obj,
if (g_strcmp0 (pspec->name, "has-focus") == 0) if (g_strcmp0 (pspec->name, "has-focus") == 0)
/* /*
* We use focus-in-event and focus-out-event signals to catch * We use focus change events to catch
* focus changes so we ignore this. * focus changes so we ignore this.
*/ */
return; return;