Merge branch 'public-emojichooser' into 'master'

emojichooser: Make public

See merge request GNOME/gtk!1382
This commit is contained in:
Matthias Clasen 2020-02-05 18:04:42 +00:00
commit 9746b728ca
5 changed files with 47 additions and 0 deletions

View File

@ -246,6 +246,7 @@
<xi:include href="xml/gtkfontbutton.xml" />
<xi:include href="xml/gtkfontchooserwidget.xml" />
<xi:include href="xml/gtkfontchooserdialog.xml" />
<xi:include href="xml/gtkemojichooser.xml" />
</chapter>
<chapter id="DrawingWidgets">

View File

@ -7139,3 +7139,20 @@ GTK_DRAG_ICON_GET_CLASS
<SUBSECTION Private>
gtk_drag_icon_get_type
</SECTION>
<SECTION>
<FILE>gtkemojichooser</FILE>
GtkEmojiChooser
gtk_emoji_chooser_new
<SUBSECTION Standard>
GTK_TYPE_EMOJI_CHOOSER
GTK_EMOJI_CHOOSER
GTK_EMOJI_CHOOSER_CLASS
GTK_IS_EMOJI_CHOOSER
GTK_IS_EMOJI_CHOOSER_CLASS
GTK_EMOJI_CHOOSER_GET_CLASS
<SUBSECTION Private>
gtk_emoji_chooser_get_type
</SECTION>

View File

@ -62,6 +62,7 @@ gtk_drag_source_get_type
gtk_drawing_area_get_type
gtk_drop_target_get_type
gtk_editable_get_type
gtk_emoji_chooser_get_type
gtk_entry_buffer_get_type
gtk_entry_completion_get_type
gtk_entry_get_type

View File

@ -95,6 +95,7 @@
#include <gtk/gtkdragsource.h>
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtkeditable.h>
#include <gtk/gtkemojichooser.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkentrybuffer.h>
#include <gtk/gtkentrycompletion.h>

View File

@ -37,6 +37,18 @@
#include "gtktext.h"
#include "gdk/gdkprofilerprivate.h"
/**
* SECTION:emojichooser
* @Title: GtkEmojiChooser
* @Short_description: A popover to choose an Emoji character
*
* The #GtkEmojiChooser popover is used by text widgets such as #GtkEntry or
* #GtkTextView to offer users a convenient way to insert Emoji characters.
*
* GtkEmojiChooser emits the #GtkEmojiChooser:emoji-picked signal when an
* Emoji is selected.
*/
#define BOX_SPACE 6
typedef struct {
@ -722,6 +734,14 @@ gtk_emoji_chooser_class_init (GtkEmojiChooserClass *klass)
object_class->finalize = gtk_emoji_chooser_finalize;
widget_class->show = gtk_emoji_chooser_show;
/**
* GtkEmojiChooser::emoji-picked:
* @chooser: the #GtkEmojiChooser
* @text: the Unicode sequence for the picked Emoji, in UTF-8
*
* The ::emoji-picked signal is emitted when the user selects an
* Emoji.
*/
signals[EMOJI_PICKED] = g_signal_new ("emoji-picked",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
@ -782,6 +802,13 @@ gtk_emoji_chooser_class_init (GtkEmojiChooserClass *klass)
gtk_widget_class_bind_template_callback (widget_class, long_pressed_cb);
}
/**
* gtk_emoji_chooser_new:
*
* Creates a new #GtkEmojiChooser.
*
* Returns: a new #GtkEmojiChoser
*/
GtkWidget *
gtk_emoji_chooser_new (void)
{