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

gtkentrycompletion: Stop using ::key-press-event

Browse Source 
Use GtkEventControllerKey for the task
This commit is contained in:
Carlos Garnacho 2018-03-06 17:53:53 +01:00
parent 585aafc2df
commit 80c3ebe3a0
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkentrycompletion.c
View File

@ -2060,16 +2060,17 @@ keyval_is_cursor_move (guint keyval)
} }
static gboolean static gboolean
gtk_entry_completion_key_press (GtkWidget *widget, gtk_entry_completion_key_pressed (GtkEventControllerKey *controller,
GdkEventKey *event, guint keyval,
guint keycode,
GdkModifierType state,
gpointer user_data) gpointer user_data)
{ {
gint matches, actions = 0; gint matches, actions = 0;
GtkEntryCompletion *completion = GTK_ENTRY_COMPLETION (user_data); GtkEntryCompletion *completion = GTK_ENTRY_COMPLETION (user_data);
guint keyval; GtkWidget *widget = completion->priv->entry;
if (!completion->priv->popup_completion || if (!completion->priv->popup_completion)
!gdk_event_get_keyval ((GdkEvent *) event, &keyval))
return FALSE; return FALSE;
if (keyval == GDK_KEY_Return || if (keyval == GDK_KEY_Return ||
@ -2470,11 +2471,14 @@ maybe_accept_completion (GtkEntry *entry,
static void static void
connect_completion_signals (GtkEntryCompletion *completion) connect_completion_signals (GtkEntryCompletion *completion)
{ {
completion->priv->entry_key_controller =
gtk_event_controller_key_new (completion->priv->entry);
g_signal_connect (completion->priv->entry_key_controller, "key-pressed",
G_CALLBACK (gtk_entry_completion_key_pressed), completion);
completion->priv->changed_id = completion->priv->changed_id =
g_signal_connect (completion->priv->entry, "changed", g_signal_connect (completion->priv->entry, "changed",
G_CALLBACK (gtk_entry_completion_changed), completion); G_CALLBACK (gtk_entry_completion_changed), completion);
g_signal_connect (completion->priv->entry, "key-press-event",
G_CALLBACK (gtk_entry_completion_key_press), completion);
completion->priv->insert_text_id = completion->priv->insert_text_id =
g_signal_connect (completion->priv->entry, "insert-text", g_signal_connect (completion->priv->entry, "insert-text",
@ -2520,6 +2524,8 @@ unset_accessible_relation (GtkWidget *window,
static void static void
disconnect_completion_signals (GtkEntryCompletion *completion) disconnect_completion_signals (GtkEntryCompletion *completion)
{ {
g_clear_object (&completion->priv->entry_key_controller);
if (completion->priv->changed_id > 0 && if (completion->priv->changed_id > 0 &&
g_signal_handler_is_connected (completion->priv->entry, g_signal_handler_is_connected (completion->priv->entry,
completion->priv->changed_id)) completion->priv->changed_id))
@ -2528,8 +2534,6 @@ disconnect_completion_signals (GtkEntryCompletion *completion)
completion->priv->changed_id); completion->priv->changed_id);
completion->priv->changed_id = 0; completion->priv->changed_id = 0;
} }
g_signal_handlers_disconnect_by_func (completion->priv->entry,
G_CALLBACK (gtk_entry_completion_key_press), completion);
if (completion->priv->insert_text_id > 0 && if (completion->priv->insert_text_id > 0 &&
g_signal_handler_is_connected (completion->priv->entry, g_signal_handler_is_connected (completion->priv->entry,
completion->priv->insert_text_id)) completion->priv->insert_text_id))

3
gtk/gtkentryprivate.h
View File

@ -25,6 +25,7 @@
#include "gtkliststore.h" #include "gtkliststore.h"
#include "gtktreemodelfilter.h" #include "gtktreemodelfilter.h"
#include "gtktreeviewcolumn.h" #include "gtktreeviewcolumn.h"
#include "gtkeventcontrollerkey.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@ -47,6 +48,8 @@ struct _GtkEntryCompletionPrivate
gchar *case_normalized_key; gchar *case_normalized_key;
GtkEventController *entry_key_controller;
/* only used by GtkEntry when attached: */ /* only used by GtkEntry when attached: */
GtkWidget *popup_window; GtkWidget *popup_window;
GtkWidget *vbox; GtkWidget *vbox;