[gtk+/wip/matthiasc/emoji-picker: 12/13] emoji completion: Use event API
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/emoji-picker: 12/13] emoji completion: Use event API
- Date: Sun, 19 Nov 2017 23:26:31 +0000 (UTC)
commit a14d3cecb261f338135fa9678176da9d88016371
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Nov 18 22:43:42 2017 -0500
emoji completion: Use event API
Direct access to event structs is no longer possible.
gtk/gtkemojicompletion.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkemojicompletion.c b/gtk/gtkemojicompletion.c
index 1b803d2..a0cecde 100644
--- a/gtk/gtkemojicompletion.c
+++ b/gtk/gtkemojicompletion.c
@@ -195,16 +195,20 @@ entry_key_press (GtkEntry *entry,
GdkEventKey *event,
GtkEmojiCompletion *completion)
{
+ guint keyval;
+
if (!gtk_widget_get_visible (GTK_WIDGET (completion)))
return FALSE;
- if (event->keyval == GDK_KEY_Escape)
+ gdk_event_get_keyval ((GdkEvent*)event, &keyval);
+
+ if (keyval == GDK_KEY_Escape)
{
gtk_popover_popdown (GTK_POPOVER (completion));
return TRUE;
}
- if (event->keyval == GDK_KEY_Tab)
+ if (keyval == GDK_KEY_Tab)
{
guint offset = completion->offset + MAX_ROWS;
if (offset >= completion->n_matches)
@@ -213,21 +217,21 @@ entry_key_press (GtkEntry *entry,
return TRUE;
}
- if (event->keyval == GDK_KEY_Up)
+ if (keyval == GDK_KEY_Up)
{
move_active_row (completion, -1);
return TRUE;
}
- if (event->keyval == GDK_KEY_Down)
+ if (keyval == GDK_KEY_Down)
{
move_active_row (completion, 1);
return TRUE;
}
- if (event->keyval == GDK_KEY_Return ||
- event->keyval == GDK_KEY_KP_Enter ||
- event->keyval == GDK_KEY_ISO_Enter)
+ if (keyval == GDK_KEY_Return ||
+ keyval == GDK_KEY_KP_Enter ||
+ keyval == GDK_KEY_ISO_Enter)
{
activate_active_row (completion);
return TRUE;
@@ -326,7 +330,7 @@ populate_completion (GtkEmojiCompletion *completion,
text = g_strdup (text);
g_free (completion->text);
- completion->text = text;
+ completion->text = g_strdup (text);
completion->length = g_utf8_strlen (text, -1);
completion->offset = offset;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]