[gtk: 2/2] Merge branch 'public-emojichooser' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 2/2] Merge branch 'public-emojichooser' into 'master'
- Date: Wed, 5 Feb 2020 18:05:30 +0000 (UTC)
commit 9746b728cac39b98636d8c97cb1054bc6c55e75b
Merge: 0ad791277a ef7172dc1e
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Feb 5 18:04:42 2020 +0000
Merge branch 'public-emojichooser' into 'master'
emojichooser: Make public
See merge request GNOME/gtk!1382
docs/reference/gtk/gtk4-docs.xml | 1 +
docs/reference/gtk/gtk4-sections.txt | 17 +++++++++++++++++
docs/reference/gtk/gtk4.types.in | 1 +
gtk/gtk.h | 1 +
gtk/gtkemojichooser.c | 27 +++++++++++++++++++++++++++
5 files changed, 47 insertions(+)
---
diff --cc gtk/gtkemojichooser.c
index f64ce36557,9703fb91a5..8d1695a3e1
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@@ -35,8 -35,19 +35,20 @@@
#include "gtksearchentryprivate.h"
#include "gtkstylecontext.h"
#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 {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]