diff options
author | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-04-12 14:49:21 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-04-26 18:59:22 +0100 |
commit | f04a7203484685e0ed6088927f053133b4079c7c (patch) | |
tree | c1e256d8bc66bbe4de1b6de073296e9ca7a51193 | |
parent | 15482528a588bbe97a898786304da6a883122237 (diff) | |
download | gdk-pixbuf-f04a7203484685e0ed6088927f053133b4079c7c.tar.gz |
widget: Add send_focus_change()
Currently the only users of the GTK_HAS_FOCUS flag are setting it
before sending a focus change event. This is normally needed by
GtkWindow, but there are widgets that require controlling the focus
of widgets that are semantically their children even though they are
parented to another top-level. Case in point: the quick search entry
for GtkTreeView.
Over the years people have been hacking the focus change out of
gtkwindow.c and gtktreeview.c, thus leaking the direct access of the
GTK_HAS_FOCUS flag.
The simplest way to avoid that is to add a function that sends the
focus change event and controls the setting of the flag, thus removing
the need for external widgets to do the same.
https://bugzilla.gnome.org/show_bug.cgi?id=593671
-rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 1 | ||||
-rw-r--r-- | gtk/gtk.symbols | 1 | ||||
-rw-r--r-- | gtk/gtkwidget.c | 66 | ||||
-rw-r--r-- | gtk/gtkwidget.h | 2 |
4 files changed, 70 insertions, 0 deletions
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 780d04e67..196189182 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -5683,6 +5683,7 @@ gtk_widget_class_find_style_property gtk_widget_class_list_style_properties gtk_widget_region_intersect gtk_widget_send_expose +gtk_widget_send_focus_change gtk_widget_style_get gtk_widget_style_get_property gtk_widget_style_get_valist diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 311875f09..b1c047125 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -5196,6 +5196,7 @@ gtk_widget_reparent gtk_widget_reset_rc_styles gtk_widget_reset_shapes gtk_widget_send_expose +gtk_widget_send_focus_change gtk_widget_set_accel_path gtk_widget_set_allocation gtk_widget_set_app_paintable diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 2ee01d970..de85182ad 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -11284,5 +11284,71 @@ gtk_widget_get_window (GtkWidget *widget) return widget->window; } +static void +_gtk_widget_set_has_focus (GtkWidget *widget, + gboolean has_focus) +{ + if (has_focus) + GTK_OBJECT_FLAGS (widget) |= GTK_HAS_FOCUS; + else + GTK_OBJECT_FLAGS (widget) &= ~(GTK_HAS_FOCUS); +} + +/** + * gtk_widget_send_focus_change: + * @widget: a #GtkWidget + * @event: a #GdkEvent of type GDK_FOCUS_CHANGE + * + * Sends the focus change @event to @widget + * + * This function is not meant to be used by applications. The only time it + * should be used is when it is necessary for a #GtkWidget to assign focus + * to a widget that is semantically owned by the first widget even though + * it's not a direct child - for instance, a search entry in a floating + * window similar to the quick search in #GtkTreeView. + * + * An example of its usage is: + * + * |[ + * GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); + * + * fevent->focus_change.type = GDK_FOCUS_CHANGE; + * fevent->focus_change.in = TRUE; + * fevent->focus_change.window = gtk_widget_get_window (widget); + * if (fevent->focus_change.window != NULL) + * g_object_ref (fevent->focus_change.window); + * + * gtk_widget_send_focus_change (widget, fevent); + * + * gdk_event_free (event); + * ]| + * + * Return value: the return value from the event signal emission: %TRUE + * if the event was handled, and %FALSE otherwise + * + * Since: 2.20 + */ +gboolean +gtk_widget_send_focus_change (GtkWidget *widget, + GdkEvent *event) +{ + gboolean res; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + g_return_val_if_fail (event != NULL && event->type == GDK_FOCUS_CHANGE, FALSE); + + g_object_ref (widget); + + _gtk_widget_set_has_focus (widget, event->focus_change.in); + + res = gtk_widget_event (widget, event); + + g_object_notify (G_OBJECT (widget), "has-focus"); + + g_object_unref (widget); + + return res; +} + #define __GTK_WIDGET_C__ #include "gtkaliasdef.c" diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 132079937..bf7c34228 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -897,6 +897,8 @@ gboolean gtk_widget_event (GtkWidget *widget, GdkEvent *event); gint gtk_widget_send_expose (GtkWidget *widget, GdkEvent *event); +gboolean gtk_widget_send_focus_change (GtkWidget *widget, + GdkEvent *event); gboolean gtk_widget_activate (GtkWidget *widget); gboolean gtk_widget_set_scroll_adjustments (GtkWidget *widget, |