callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'carlosgc/no-emoji-hint' into 'gtk-3-24'

Browse Source 
emojichooser: never show emoji chooser when input hint no-emoji is present

See merge request GNOME/gtk!1272
This commit is contained in:
Matthias Clasen 2019-12-30 15:18:12 +00:00
commit d9a9ede7a2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkentry.c
View File

@ -11093,6 +11093,9 @@ gtk_entry_insert_emoji (GtkEntry *entry)
GtkWidget *chooser;
GdkRectangle rect;
if (gtk_entry_get_input_hints (entry) & GTK_INPUT_HINT_NO_EMOJI)
return;
if (gtk_widget_get_ancestor (GTK_WIDGET (entry), GTK_TYPE_EMOJI_CHOOSER) != NULL)
return;

3
gtk/gtktextview.c
View File

@ -11462,6 +11462,9 @@ gtk_text_view_insert_emoji (GtkTextView *text_view)
GdkRectangle rect;
GtkTextBuffer *buffer;
if (gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_NO_EMOJI)
return;
if (gtk_widget_get_ancestor (GTK_WIDGET (text_view), GTK_TYPE_EMOJI_CHOOSER) != NULL)
return;