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

gtkentrycompletion: Move focus out handling to key controller

Browse Source 
We can use the already present key controller to handle focus out.
This commit is contained in:
Carlos Garnacho 2018-06-08 13:26:26 +02:00
parent 5f8fea08ff
commit 2c0d2d332f
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkentrycompletion.c
View File

@ -2445,19 +2445,6 @@ completion_insert_text_callback (GtkEntry *entry,
} }
} }
static gboolean
maybe_accept_completion (GtkEntry *entry,
GdkEvent *event)
{
gboolean focus_in;
if (gdk_event_get_event_type (event) == GDK_FOCUS_CHANGE &&
gdk_event_get_focus_in (event, &focus_in) && !focus_in)
accept_completion_callback (entry);
return GDK_EVENT_PROPAGATE;
}
static void static void
connect_completion_signals (GtkEntryCompletion *completion) connect_completion_signals (GtkEntryCompletion *completion)
{ {
@ -2466,6 +2453,9 @@ connect_completion_signals (GtkEntryCompletion *completion)
controller = gtk_event_controller_key_new (); controller = gtk_event_controller_key_new ();
g_signal_connect (controller, "key-pressed", g_signal_connect (controller, "key-pressed",
G_CALLBACK (gtk_entry_completion_key_pressed), completion); G_CALLBACK (gtk_entry_completion_key_pressed), completion);
g_signal_connect_swapped (controller, "focus-out",
G_CALLBACK (accept_completion_callback),
completion->priv->entry);
gtk_widget_add_controller (completion->priv->entry, controller); gtk_widget_add_controller (completion->priv->entry, controller);
completion->priv->changed_id = completion->priv->changed_id =
@ -2479,8 +2469,6 @@ connect_completion_signals (GtkEntryCompletion *completion)
G_CALLBACK (clear_completion_callback), completion); G_CALLBACK (clear_completion_callback), completion);
g_signal_connect (completion->priv->entry, "activate", g_signal_connect (completion->priv->entry, "activate",
G_CALLBACK (accept_completion_callback), completion); G_CALLBACK (accept_completion_callback), completion);
g_signal_connect (completion->priv->entry, "event",
G_CALLBACK (maybe_accept_completion), completion);
} }
static void static void
@ -2538,8 +2526,6 @@ disconnect_completion_signals (GtkEntryCompletion *completion)
G_CALLBACK (clear_completion_callback), completion); G_CALLBACK (clear_completion_callback), completion);
g_signal_handlers_disconnect_by_func (completion->priv->entry, g_signal_handlers_disconnect_by_func (completion->priv->entry,
G_CALLBACK (accept_completion_callback), completion); G_CALLBACK (accept_completion_callback), completion);
g_signal_handlers_disconnect_by_func (completion->priv->entry,
G_CALLBACK (maybe_accept_completion), completion);
} }
void void