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

781 lines
25 KiB
C
Raw Normal View History

Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
/* gtkemojichooser.c: An Emoji chooser widget
* Copyright 2017, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkemojichooser.h"
emojichooser: animate the adjustment ... instead of doing a dance with the scrolled window to get it to scroll the adjustment.
2017-11-05 15:12:35 +00:00
#include "gtkadjustmentprivate.h"
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
#include "gtkbox.h"
#include "gtkbutton.h"
#include "gtkcssprovider.h"
#include "gtkentry.h"
#include "gtkflowbox.h"
#include "gtkstack.h"
#include "gtklabel.h"
#include "gtkgesturelongpress.h"
emoji chooser: handle right-click Whereever we handle long-press for touch, it makes sense to handle right-click as a faster alternative for mouse-based interaction. This commit makes right-click work to bring up the variation selector for Emojis.
2017-11-19 21:18:28 +00:00
#include "gtkgesturemultipress.h"
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
#include "gtkpopover.h"
#include "gtkscrolledwindow.h"
#include "gtkintl.h"
#include "gtkprivate.h"
emoji chooser: Don't use entry api on search entries Use editable api, and cut through to the text widget where necessary.
2019-02-20 15:32:12 +00:00
#include "gtksearchentryprivate.h"
gtk: Don't include gtkstylecontext.h from gtkcsstypesprivate.h And make sure it's included everywhere it's needed.
2019-03-16 03:48:26 +00:00
#include "gtkstylecontext.h"
emoji chooser: Don't use entry api on search entries Use editable api, and cut through to the text widget where necessary.
2019-02-20 15:32:12 +00:00
#include "gtktext.h"
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji: Improve section scrolling Leave some space above the section heading when scrolling. This is a part of https://gitlab.gnome.org/GNOME/gtk/merge_requests/143 by Julian Sperber.
2018-05-17 15:37:26 +00:00
#define BOX_SPACE 6
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
typedef struct {
GtkWidget *box;
GtkWidget *heading;
GtkWidget *button;
const char *first;
gunichar label;
gboolean empty;
} EmojiSection;
struct _GtkEmojiChooser
{
GtkPopover parent_instance;
GtkWidget *search_entry;
GtkWidget *stack;
GtkWidget *scrolled_window;
emojichooser: Only measure reference emoji once Doing that once for every emoji is pretty slow and unnecessary as the width does not change.
2018-02-27 10:45:34 +00:00
int emoji_max_width;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
EmojiSection recent;
EmojiSection people;
EmojiSection body;
EmojiSection nature;
EmojiSection food;
EmojiSection travel;
EmojiSection activities;
EmojiSection objects;
EmojiSection symbols;
EmojiSection flags;
GVariant *data;
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
GtkWidget *box;
GVariantIter *iter;
guint populate_idle;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
GSettings *settings;
};
struct _GtkEmojiChooserClass {
GtkPopoverClass parent_class;
};
enum {
EMOJI_PICKED,
LAST_SIGNAL
};
static int signals[LAST_SIGNAL];
G_DEFINE_TYPE (GtkEmojiChooser, gtk_emoji_chooser, GTK_TYPE_POPOVER)
static void
gtk_emoji_chooser_finalize (GObject *object)
{
GtkEmojiChooser *chooser = GTK_EMOJI_CHOOSER (object);
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
if (chooser->populate_idle)
g_source_remove (chooser->populate_idle);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
g_variant_unref (chooser->data);
g_object_unref (chooser->settings);
G_OBJECT_CLASS (gtk_emoji_chooser_parent_class)->finalize (object);
}
static void
scroll_to_section (GtkButton *button,
gpointer data)
{
EmojiSection *section = data;
GtkEmojiChooser *chooser;
GtkAdjustment *adj;
GtkAllocation alloc = { 0, 0, 0, 0 };
chooser = GTK_EMOJI_CHOOSER (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_EMOJI_CHOOSER));
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (chooser->scrolled_window));
if (section->heading)
gtk_widget_get_allocation (section->heading, &alloc);
emoji: Improve section scrolling Leave some space above the section heading when scrolling. This is a part of https://gitlab.gnome.org/GNOME/gtk/merge_requests/143 by Julian Sperber.
2018-05-17 15:37:26 +00:00
gtk_adjustment_animate_to_value (adj, alloc.y - BOX_SPACE);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
static void
add_emoji (GtkWidget *box,
gboolean prepend,
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
GVariant *item,
emoji chooser: Make menu key work as expected Whenever we have a right-click action, we should make the menu key work as a keyboard-accessible alternative.
2017-11-19 23:03:07 +00:00
gunichar modifier,
GtkEmojiChooser *chooser);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
#define MAX_RECENT (7*3)
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
static void
populate_recent_section (GtkEmojiChooser *chooser)
{
GVariant *variant;
GVariant *item;
GVariantIter iter;
emoji: Hide recent section when empty This is part of https://gitlab.gnome.org/GNOME/gtk/merge_requests/143 by Julian Sperber.
2018-05-17 15:48:34 +00:00
gboolean empty = FALSE;
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
variant = g_settings_get_value (chooser->settings, "recent-emoji");
g_variant_iter_init (&iter, variant);
while ((item = g_variant_iter_next_value (&iter)))
{
GVariant *emoji_data;
gunichar modifier;
emoji_data = g_variant_get_child_value (item, 0);
g_variant_get_child (item, 1, "u", &modifier);
emoji chooser: Make menu key work as expected Whenever we have a right-click action, we should make the menu key work as a keyboard-accessible alternative.
2017-11-19 23:03:07 +00:00
add_emoji (chooser->recent.box, FALSE, emoji_data, modifier, chooser);
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
g_variant_unref (emoji_data);
g_variant_unref (item);
emoji: Hide recent section when empty This is part of https://gitlab.gnome.org/GNOME/gtk/merge_requests/143 by Julian Sperber.
2018-05-17 15:48:34 +00:00
empty = FALSE;
}
emoji chooser: Fix handling of no recent Emoji If the recent section is empty, we want to hide it, make its button insensitive, and select the next section, initially. This was not working properly, since nothing was ever setting the section box to invisible.
2019-05-04 16:19:43 +00:00
gtk_widget_set_visible (chooser->recent.box, !empty);
gtk_widget_set_sensitive (chooser->recent.button, !empty);
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
g_variant_unref (variant);
}
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
static void
add_recent_item (GtkEmojiChooser *chooser,
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
GVariant *item,
gunichar modifier)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
GList *children, *l;
int i;
GVariantBuilder builder;
g_variant_ref (item);
Handle emoji data change in emoji chooser Update the settings schema to follow the change in Emoji data, and make the emoji chooser code handle the new format.
2017-08-19 18:05:48 +00:00
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a((auss)u)"));
g_variant_builder_add (&builder, "(@(auss)u)", item, modifier);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
children = gtk_container_get_children (GTK_CONTAINER (chooser->recent.box));
for (l = children, i = 1; l; l = l->next, i++)
{
GVariant *item2 = g_object_get_data (G_OBJECT (l->data), "emoji-data");
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
gunichar modifier2 = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (l->data), "modifier"));
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
if (modifier == modifier2 && g_variant_equal (item, item2))
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
gtk_widget_destroy (GTK_WIDGET (l->data));
i--;
continue;
}
if (i >= MAX_RECENT)
{
gtk_widget_destroy (GTK_WIDGET (l->data));
continue;
}
Handle emoji data change in emoji chooser Update the settings schema to follow the change in Emoji data, and make the emoji chooser code handle the new format.
2017-08-19 18:05:48 +00:00
g_variant_builder_add (&builder, "(@(auss)u)", item2, modifier2);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
g_list_free (children);
emoji chooser: Make menu key work as expected Whenever we have a right-click action, we should make the menu key work as a keyboard-accessible alternative.
2017-11-19 23:03:07 +00:00
add_emoji (chooser->recent.box, TRUE, item, modifier, chooser);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji: Hide recent section when empty This is part of https://gitlab.gnome.org/GNOME/gtk/merge_requests/143 by Julian Sperber.
2018-05-17 15:48:34 +00:00
/* Enable recent */
gtk_widget_show (chooser->recent.box);
gtk_widget_set_sensitive (chooser->recent.button, TRUE);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
g_settings_set_value (chooser->settings, "recent-emoji", g_variant_builder_end (&builder));
g_variant_unref (item);
}
static void
emoji_activated (GtkFlowBox *box,
GtkFlowBoxChild *child,
gpointer data)
{
GtkEmojiChooser *chooser = data;
char *text;
GtkWidget *label;
GVariant *item;
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
gunichar modifier;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_popover_popdown (GTK_POPOVER (chooser));
label = gtk_bin_get_child (GTK_BIN (child));
text = g_strdup (gtk_label_get_label (GTK_LABEL (label)));
item = (GVariant*) g_object_get_data (G_OBJECT (child), "emoji-data");
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
modifier = (gunichar) GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (child), "modifier"));
add_recent_item (chooser, item, modifier);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
g_signal_emit (data, signals[EMOJI_PICKED], 0, text);
g_free (text);
}
emoji chooser: break out a helper function This is just a small cleanup.
2017-11-20 03:40:07 +00:00
static gboolean
has_variations (GVariant *emoji_data)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
GVariant *codes;
int i;
gboolean has_variations;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
has_variations = FALSE;
codes = g_variant_get_child_value (emoji_data, 0);
for (i = 0; i < g_variant_n_children (codes); i++)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
gunichar code;
g_variant_get_child (codes, i, "u", &code);
if (code == 0)
{
has_variations = TRUE;
break;
}
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
g_variant_unref (codes);
emoji chooser: break out a helper function This is just a small cleanup.
2017-11-20 03:40:07 +00:00
return has_variations;
}
static void
show_variations (GtkEmojiChooser *chooser,
GtkWidget *child)
{
GtkWidget *popover;
GtkWidget *view;
GtkWidget *box;
GVariant *emoji_data;
GtkWidget *parent_popover;
gunichar modifier;
if (!child)
return;
emoji_data = (GVariant*) g_object_get_data (G_OBJECT (child), "emoji-data");
if (!emoji_data)
return;
if (!has_variations (emoji_data))
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
return;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
parent_popover = gtk_widget_get_ancestor (child, GTK_TYPE_POPOVER);
popover = gtk_popover_new (child);
view = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_style_context_add_class (gtk_widget_get_style_context (view), "view");
box = gtk_flow_box_new ();
gtk_flow_box_set_homogeneous (GTK_FLOW_BOX (box), TRUE);
gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (box), 6);
gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (box), 6);
gtk_flow_box_set_activate_on_single_click (GTK_FLOW_BOX (box), TRUE);
gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (box), GTK_SELECTION_NONE);
emoji: Accept unpaired releases for variations This enables a single long-press-move-release gesture for picking a variation. This is not perfect yet: We don't get hover in this case.
2017-12-31 04:24:22 +00:00
g_object_set (box, "accept-unpaired-release", TRUE, NULL);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_container_add (GTK_CONTAINER (popover), view);
gtk_container_add (GTK_CONTAINER (view), box);
g_signal_connect (box, "child-activated", G_CALLBACK (emoji_activated), parent_popover);
emojichooser: Pass chooser to add_emoji
2018-10-11 10:27:17 +00:00
add_emoji (box, FALSE, emoji_data, 0, chooser);
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
for (modifier = 0x1f3fb; modifier <= 0x1f3ff; modifier++)
emojichooser: Pass chooser to add_emoji
2018-10-11 10:27:17 +00:00
add_emoji (box, FALSE, emoji_data, modifier, chooser);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_popover_popup (GTK_POPOVER (popover));
}
emoji chooser: handle right-click Whereever we handle long-press for touch, it makes sense to handle right-click as a faster alternative for mouse-based interaction. This commit makes right-click work to bring up the variation selector for Emojis.
2017-11-19 21:18:28 +00:00
static void
long_pressed_cb (GtkGesture *gesture,
double x,
double y,
gpointer data)
{
GtkEmojiChooser *chooser = data;
GtkWidget *box;
GtkWidget *child;
box = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
child = GTK_WIDGET (gtk_flow_box_get_child_at_pos (GTK_FLOW_BOX (box), x, y));
show_variations (chooser, child);
}
static void
pressed_cb (GtkGesture *gesture,
int n_press,
double x,
double y,
gpointer data)
{
GtkEmojiChooser *chooser = data;
GtkWidget *box;
GtkWidget *child;
box = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
child = GTK_WIDGET (gtk_flow_box_get_child_at_pos (GTK_FLOW_BOX (box), x, y));
show_variations (chooser, child);
}
emoji chooser: Make menu key work as expected Whenever we have a right-click action, we should make the menu key work as a keyboard-accessible alternative.
2017-11-19 23:03:07 +00:00
static gboolean
popup_menu (GtkWidget *widget,
gpointer data)
{
GtkEmojiChooser *chooser = data;
show_variations (chooser, widget);
return TRUE;
}
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
static void
add_emoji (GtkWidget *box,
gboolean prepend,
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
GVariant *item,
emoji chooser: Make menu key work as expected Whenever we have a right-click action, we should make the menu key work as a keyboard-accessible alternative.
2017-11-19 23:03:07 +00:00
gunichar modifier,
GtkEmojiChooser *chooser)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
GtkWidget *child;
GtkWidget *label;
PangoAttrList *attrs;
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
GVariant *codes;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
char text[64];
char *p = text;
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
int i;
emoji: Skip overly wide fallback rendering Some emoji fonts (such as Emoji One), render Emoji sequences such as some of the family variations using multiple individual glyphs. This rendering is too wide and breaks our grid layout. Therefore, we will just skip any sequence whose rendering is more than twice as wide as a simple smiley.
2017-12-18 03:09:08 +00:00
PangoLayout *layout;
PangoRectangle rect;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
codes = g_variant_get_child_value (item, 0);
for (i = 0; i < g_variant_n_children (codes); i++)
{
gunichar code;
g_variant_get_child (codes, i, "u", &code);
if (code == 0)
code = modifier;
if (code != 0)
p += g_unichar_to_utf8 (code, p);
}
emojichooser: Plug a memory leak
2017-09-24 16:15:41 +00:00
g_variant_unref (codes);
emoji chooser: Actually force Emoji presentation The previous commit was using the text presentation selector instead of the Emoji one. Oops.
2018-12-04 02:46:09 +00:00
p += g_unichar_to_utf8 (0xFE0F, p); /* U+FE0F is the Emoji variation selector */
emojichooser: Plug a memory leak
2017-09-24 16:15:41 +00:00
p[0] = 0;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emojichooser: Only measure reference emoji once Doing that once for every emoji is pretty slow and unnecessary as the width does not change.
2018-02-27 10:45:34 +00:00
label = gtk_label_new (text);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
attrs = pango_attr_list_new ();
pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_X_LARGE));
gtk_label_set_attributes (GTK_LABEL (label), attrs);
pango_attr_list_unref (attrs);
emoji: Skip overly wide fallback rendering Some emoji fonts (such as Emoji One), render Emoji sequences such as some of the family variations using multiple individual glyphs. This rendering is too wide and breaks our grid layout. Therefore, we will just skip any sequence whose rendering is more than twice as wide as a simple smiley.
2017-12-18 03:09:08 +00:00
layout = gtk_label_get_layout (GTK_LABEL (label));
pango_layout_get_extents (layout, &rect, NULL);
/* Check for fallback rendering that generates too wide items */
Emoji chooser: Also check for hex boxes We don't want to see those either.
2018-07-19 21:57:19 +00:00
if (pango_layout_get_unknown_glyphs_count (layout) > 0 ||
rect.width >= 1.5 * chooser->emoji_max_width)
emoji: Skip overly wide fallback rendering Some emoji fonts (such as Emoji One), render Emoji sequences such as some of the family variations using multiple individual glyphs. This rendering is too wide and breaks our grid layout. Therefore, we will just skip any sequence whose rendering is more than twice as wide as a simple smiley.
2017-12-18 03:09:08 +00:00
{
gtk_widget_destroy (label);
return;
}
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
child = gtk_flow_box_child_new ();
gtk_style_context_add_class (gtk_widget_get_style_context (child), "emoji");
g_object_set_data_full (G_OBJECT (child), "emoji-data",
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
g_variant_ref (item),
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
(GDestroyNotify)g_variant_unref);
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
if (modifier != 0)
g_object_set_data (G_OBJECT (child), "modifier", GUINT_TO_POINTER (modifier));
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji chooser: Make menu key work as expected Whenever we have a right-click action, we should make the menu key work as a keyboard-accessible alternative.
2017-11-19 23:03:07 +00:00
if (chooser)
g_signal_connect (child, "popup-menu", G_CALLBACK (popup_menu), chooser);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_container_add (GTK_CONTAINER (child), label);
gtk_flow_box_insert (GTK_FLOW_BOX (box), child, prepend ? 0 : -1);
}
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
static gboolean
populate_emoji_chooser (gpointer data)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
GtkEmojiChooser *chooser = data;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
GVariant *item;
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
guint64 start, now;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
start = g_get_monotonic_time ();
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
if (!chooser->data)
{
GBytes *bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/emoji.data", 0, NULL);
chooser->data = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(auss)"), bytes, TRUE));
g_bytes_unref (bytes);
}
if (!chooser->iter)
{
chooser->iter = g_variant_iter_new (chooser->data);
chooser->box = chooser->people.box;
}
while ((item = g_variant_iter_next_value (chooser->iter)))
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
const char *name;
g_variant_get_child (item, 1, "&s", &name);
if (strcmp (name, chooser->body.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->body.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
else if (strcmp (name, chooser->nature.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->nature.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
else if (strcmp (name, chooser->food.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->food.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
else if (strcmp (name, chooser->travel.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->travel.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
else if (strcmp (name, chooser->activities.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->activities.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
else if (strcmp (name, chooser->objects.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->objects.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
else if (strcmp (name, chooser->symbols.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->symbols.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
else if (strcmp (name, chooser->flags.first) == 0)
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->box = chooser->flags.box;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
add_emoji (chooser->box, FALSE, item, 0, chooser);
emojichooser: Plug memory leak
2017-10-17 06:49:06 +00:00
g_variant_unref (item);
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
now = g_get_monotonic_time ();
if (now > start + 8000)
return G_SOURCE_CONTINUE;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
gtk/gtkemojichooser.c: Don't use g_autoptr() We can't use g_autoptr() on non-GCC-style compilers. https://bugzilla.gnome.org/show_bug.cgi?id=773299
2017-08-15 02:43:01 +00:00
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
g_variant_iter_free (chooser->iter);
chooser->iter = NULL;
chooser->box = NULL;
chooser->populate_idle = 0;
emoji chooser: Fix handling of no recent Emoji If the recent section is empty, we want to hide it, make its button insensitive, and select the next section, initially. This was not working properly, since nothing was ever setting the section box to invisible.
2019-05-04 16:19:43 +00:00
return G_SOURCE_REMOVE;
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
static void
adj_value_changed (GtkAdjustment *adj,
gpointer data)
{
GtkEmojiChooser *chooser = data;
double value = gtk_adjustment_get_value (adj);
EmojiChooser: Ensure always have a selected button We were only selecting a section’s button if the adjustment y coord was within its heading, so scrolling slightly into it unchecked all buttons. This also fixes how we could end up with the first 2 selected, somehow. https://bugzilla.gnome.org/show_bug.cgi?id=787172
2017-09-04 18:56:47 +00:00
EmojiSection const *sections[] = {
&chooser->recent,
&chooser->people,
&chooser->body,
&chooser->nature,
&chooser->food,
&chooser->travel,
&chooser->activities,
&chooser->objects,
&chooser->symbols,
&chooser->flags,
};
EmojiSection const *select_section = sections[0];
gsize i;
/* Figure out which section the current scroll position is within */
for (i = 0; i < G_N_ELEMENTS (sections); ++i)
{
EmojiSection const *section = sections[i];
GtkAllocation alloc;
emoji chooser: Fix handling of no recent Emoji If the recent section is empty, we want to hide it, make its button insensitive, and select the next section, initially. This was not working properly, since nothing was ever setting the section box to invisible.
2019-05-04 16:19:43 +00:00
if (!gtk_widget_get_visible (section->box))
continue;
EmojiChooser: Ensure always have a selected button We were only selecting a section’s button if the adjustment y coord was within its heading, so scrolling slightly into it unchecked all buttons. This also fixes how we could end up with the first 2 selected, somehow. https://bugzilla.gnome.org/show_bug.cgi?id=787172
2017-09-04 18:56:47 +00:00
if (section->heading)
gtk_widget_get_allocation (section->heading, &alloc);
else
gtk_widget_get_allocation (section->box, &alloc);
emoji: Improve section scrolling Leave some space above the section heading when scrolling. This is a part of https://gitlab.gnome.org/GNOME/gtk/merge_requests/143 by Julian Sperber.
2018-05-17 15:37:26 +00:00
if (value < alloc.y - BOX_SPACE)
EmojiChooser: Ensure always have a selected button We were only selecting a section’s button if the adjustment y coord was within its heading, so scrolling slightly into it unchecked all buttons. This also fixes how we could end up with the first 2 selected, somehow. https://bugzilla.gnome.org/show_bug.cgi?id=787172
2017-09-04 18:56:47 +00:00
break;
select_section = section;
}
/* Un/Check the section buttons accordingly */
for (i = 0; i < G_N_ELEMENTS (sections); ++i)
{
EmojiSection const *section = sections[i];
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
EmojiChooser: Ensure always have a selected button We were only selecting a section’s button if the adjustment y coord was within its heading, so scrolling slightly into it unchecked all buttons. This also fixes how we could end up with the first 2 selected, somehow. https://bugzilla.gnome.org/show_bug.cgi?id=787172
2017-09-04 18:56:47 +00:00
if (section == select_section)
gtk_widget_set_state_flags (section->button, GTK_STATE_FLAG_CHECKED, FALSE);
else
gtk_widget_unset_state_flags (section->button, GTK_STATE_FLAG_CHECKED);
}
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
static gboolean
filter_func (GtkFlowBoxChild *child,
gpointer data)
{
EmojiSection *section = data;
GtkEmojiChooser *chooser;
GVariant *emoji_data;
const char *text;
const char *name;
gboolean res;
res = TRUE;
chooser = GTK_EMOJI_CHOOSER (gtk_widget_get_ancestor (GTK_WIDGET (child), GTK_TYPE_EMOJI_CHOOSER));
emoji chooser: Don't use entry api on search entries Use editable api, and cut through to the text widget where necessary.
2019-02-20 15:32:12 +00:00
text = gtk_editable_get_text (GTK_EDITABLE (chooser->search_entry));
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji_data = (GVariant *) g_object_get_data (G_OBJECT (child), "emoji-data");
emoji: Start search on the first character There is no need to wait for a longer prefix here. We already display all the content anyway, it will only get less.
2017-08-13 11:49:13 +00:00
if (text[0] == 0)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
goto out;
if (!emoji_data)
goto out;
g_variant_get_child (emoji_data, 1, "&s", &name);
emoji chooser: Match search terms better Use g_str_match_string for better results.
2018-05-04 00:18:48 +00:00
res = g_str_match_string (text, name, TRUE);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
out:
if (res)
section->empty = FALSE;
return res;
}
static void
invalidate_section (EmojiSection *section)
{
section->empty = TRUE;
gtk_flow_box_invalidate_filter (GTK_FLOW_BOX (section->box));
}
Don't update headings in an idle It is not necessary since flow box invalidation is all synchronous currently. If that ever changes, this code will need adjustment.
2017-08-13 13:27:37 +00:00
static void
update_headings (GtkEmojiChooser *chooser)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
gtk_widget_set_visible (chooser->people.heading, !chooser->people.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->people.box, !chooser->people.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->body.heading, !chooser->body.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->body.box, !chooser->body.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->nature.heading, !chooser->nature.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->nature.box, !chooser->nature.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->food.heading, !chooser->food.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->food.box, !chooser->food.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->travel.heading, !chooser->travel.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->travel.box, !chooser->travel.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->activities.heading, !chooser->activities.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->activities.box, !chooser->activities.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->objects.heading, !chooser->objects.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->objects.box, !chooser->objects.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->symbols.heading, !chooser->symbols.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->symbols.box, !chooser->symbols.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_set_visible (chooser->flags.heading, !chooser->flags.empty);
Avoid empty space in the emoji chooser We need to hide the empty flow boxes as well, to avoid spacing between them. https://bugzilla.gnome.org/show_bug.cgi?id=786966
2017-08-30 12:36:56 +00:00
gtk_widget_set_visible (chooser->flags.box, !chooser->flags.empty);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
if (chooser->recent.empty && chooser->people.empty &&
chooser->body.empty && chooser->nature.empty &&
chooser->food.empty && chooser->travel.empty &&
chooser->activities.empty && chooser->objects.empty &&
chooser->symbols.empty && chooser->flags.empty)
gtk_stack_set_visible_child_name (GTK_STACK (chooser->stack), "empty");
else
gtk_stack_set_visible_child_name (GTK_STACK (chooser->stack), "list");
}
static void
search_changed (GtkEntry *entry,
gpointer data)
{
GtkEmojiChooser *chooser = data;
invalidate_section (&chooser->recent);
invalidate_section (&chooser->people);
invalidate_section (&chooser->body);
invalidate_section (&chooser->nature);
invalidate_section (&chooser->food);
invalidate_section (&chooser->travel);
invalidate_section (&chooser->activities);
invalidate_section (&chooser->objects);
invalidate_section (&chooser->symbols);
invalidate_section (&chooser->flags);
Don't update headings in an idle It is not necessary since flow box invalidation is all synchronous currently. If that ever changes, this code will need adjustment.
2017-08-13 13:27:37 +00:00
update_headings (chooser);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
emoji chooser: Make Escape work again Escape is expected to close the Emoji chooser.
2019-05-04 16:55:52 +00:00
static void
stop_search (GtkEntry *entry,
gpointer data)
{
gtk_popover_popdown (GTK_POPOVER (data));
}
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
static void
setup_section (GtkEmojiChooser *chooser,
EmojiSection *section,
const char *first,
Emoji chooser: Use icons for sections This is more reliable than using text-style Emoji which may not be present. Based on work by Julian Sparber.
2018-07-19 21:24:11 +00:00
const char *icon)
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
{
GtkAdjustment *adj;
section->first = first;
Emoji chooser: Use icons for sections This is more reliable than using text-style Emoji which may not be present. Based on work by Julian Sparber.
2018-07-19 21:24:11 +00:00
gtk_button_set_icon_name (GTK_BUTTON (section->button), icon);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (chooser->scrolled_window));
gtk_container_set_focus_vadjustment (GTK_CONTAINER (section->box), adj);
gtk_flow_box_set_filter_func (GTK_FLOW_BOX (section->box), filter_func, section, NULL);
g_signal_connect (section->button, "clicked", G_CALLBACK (scroll_to_section), section);
}
static void
gtk_emoji_chooser_init (GtkEmojiChooser *chooser)
{
GtkAdjustment *adj;
emoji chooser: Don't use entry api on search entries Use editable api, and cut through to the text widget where necessary.
2019-02-20 15:32:12 +00:00
GtkText *text;
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
Rename all settings schemas to avoid conflict Rename all our settings schemas to the org.gtk.gtk4 prefix to avoid conflicting with the gtk3 schemas.
2019-04-02 19:22:48 +00:00
chooser->settings = g_settings_new ("org.gtk.gtk4.Settings.EmojiChooser");
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
gtk_widget_init_template (GTK_WIDGET (chooser));
emoji chooser: Don't use entry api on search entries Use editable api, and cut through to the text widget where necessary.
2019-02-20 15:32:12 +00:00
text = gtk_search_entry_get_text_widget (GTK_SEARCH_ENTRY (chooser->search_entry));
gtk_text_set_input_hints (text, GTK_INPUT_HINT_NO_EMOJI);
emojichooser: Only measure reference emoji once Doing that once for every emoji is pretty slow and unnecessary as the width does not change.
2018-02-27 10:45:34 +00:00
/* Get a reasonable maximum width for an emoji. We do this to
* skip overly wide fallback rendering for certain emojis the
* font does not contain and therefore end up being rendered
Emoji chooser: Also check for hex boxes We don't want to see those either.
2018-07-19 21:57:19 +00:00
* as multiply glyphs.
*/
emojichooser: Only measure reference emoji once Doing that once for every emoji is pretty slow and unnecessary as the width does not change.
2018-02-27 10:45:34 +00:00
{
PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (chooser), "🙂");
PangoAttrList *attrs;
PangoRectangle rect;
attrs = pango_attr_list_new ();
pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_X_LARGE));
pango_layout_set_attributes (layout, attrs);
pango_attr_list_unref (attrs);
pango_layout_get_extents (layout, &rect, NULL);
chooser->emoji_max_width = rect.width;
g_object_unref (layout);
}
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (chooser->scrolled_window));
g_signal_connect (adj, "value-changed", G_CALLBACK (adj_value_changed), chooser);
Emoji chooser: Use icons for sections This is more reliable than using text-style Emoji which may not be present. Based on work by Julian Sparber.
2018-07-19 21:24:11 +00:00
setup_section (chooser, &chooser->recent, NULL, "emoji-recent-symbolic");
setup_section (chooser, &chooser->people, "grinning face", "emoji-people-symbolic");
setup_section (chooser, &chooser->body, "selfie", "emoji-body-symbolic");
setup_section (chooser, &chooser->nature, "monkey face", "emoji-nature-symbolic");
setup_section (chooser, &chooser->food, "grapes", "emoji-food-symbolic");
setup_section (chooser, &chooser->travel, "globe showing Europe-Africa", "emoji-travel-symbolic");
setup_section (chooser, &chooser->activities, "jack-o-lantern", "emoji-activities-symbolic");
setup_section (chooser, &chooser->objects, "muted speaker", "emoji-objects-symbolic");
setup_section (chooser, &chooser->symbols, "ATM sign", "emoji-symbols-symbolic");
setup_section (chooser, &chooser->flags, "chequered flag", "emoji-flags-symbolic");
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
Redo emoji data slightly No longer store variation sequences explicitly. Instead, put a 0 in the sequence where the modifiers will be inserted. This is more compact, and it allows us to put variations directly into the recent section. Update the type of the recent-emoji setting to match these changes.
2017-08-13 19:16:11 +00:00
populate_recent_section (chooser);
EmojiChooser: Check the 1st button before 1st show We scroll to the top in show() but only ever selected a button when the adjustment changed, which doesn’t happen in init(). Check it manually. https://bugzilla.gnome.org/show_bug.cgi?id=787172
2017-09-02 17:47:47 +00:00
emoji chooser: populate incrementally It takes half a second on my system to initially populate the Emoji chooser. That is too long. Do the work in 8 millisecond chunks to give GTK a chance to get some frames done.
2019-05-04 02:12:02 +00:00
chooser->populate_idle = g_idle_add (populate_emoji_chooser, chooser);
emoji chooser: Name the idle We recently added an idle that does quite a bit of work. It should have a name.
2019-05-07 18:41:22 +00:00
g_source_set_name_by_id (chooser->populate_idle, "[gtk] populate_emoji_chooser");
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
static void
gtk_emoji_chooser_show (GtkWidget *widget)
{
GtkEmojiChooser *chooser = GTK_EMOJI_CHOOSER (widget);
GtkAdjustment *adj;
emoji-chooser: fix subsequent scroll Event handlers on scroll window should only be run once the widget is shown. https://bugzilla.gnome.org/show_bug.cgi?id=786964
2017-08-30 17:55:59 +00:00
GTK_WIDGET_CLASS (gtk_emoji_chooser_parent_class)->show (widget);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (chooser->scrolled_window));
gtk_adjustment_set_value (adj, 0);
emoji chooser: Fix handling of no recent Emoji If the recent section is empty, we want to hide it, make its button insensitive, and select the next section, initially. This was not working properly, since nothing was ever setting the section box to invisible.
2019-05-04 16:19:43 +00:00
adj_value_changed (adj, chooser);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
emoji chooser: Don't use entry api on search entries Use editable api, and cut through to the text widget where necessary.
2019-02-20 15:32:12 +00:00
gtk_editable_set_text (GTK_EDITABLE (chooser->search_entry), "");
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
static void
gtk_emoji_chooser_class_init (GtkEmojiChooserClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->finalize = gtk_emoji_chooser_finalize;
widget_class->show = gtk_emoji_chooser_show;
signals[EMOJI_PICKED] = g_signal_new ("emoji-picked",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
NULL,
G_TYPE_NONE, 1, G_TYPE_STRING|G_SIGNAL_TYPE_STATIC_SCOPE);
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkemojichooser.ui");
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, search_entry);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, stack);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, scrolled_window);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, recent.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, recent.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, people.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, people.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, people.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, body.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, body.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, body.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, nature.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, nature.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, nature.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, food.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, food.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, food.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, travel.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, travel.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, travel.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, activities.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, activities.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, activities.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, objects.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, objects.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, objects.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, symbols.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, symbols.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, symbols.button);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, flags.box);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, flags.heading);
gtk_widget_class_bind_template_child (widget_class, GtkEmojiChooser, flags.button);
gtk_widget_class_bind_template_callback (widget_class, emoji_activated);
gtk_widget_class_bind_template_callback (widget_class, search_changed);
emoji chooser: Make Escape work again Escape is expected to close the Emoji chooser.
2019-05-04 16:55:52 +00:00
gtk_widget_class_bind_template_callback (widget_class, stop_search);
emojichooser: Put event controllers into ui file
2018-03-09 01:10:52 +00:00
gtk_widget_class_bind_template_callback (widget_class, pressed_cb);
gtk_widget_class_bind_template_callback (widget_class, long_pressed_cb);
Add an Emoji chooser widget Add a popover that shows color Emoji, with a search entry. The recently-used Emoji are stored in a GSetting.
2017-08-11 15:54:15 +00:00
}
GtkWidget *
gtk_emoji_chooser_new (void)
{
return GTK_WIDGET (g_object_new (GTK_TYPE_EMOJI_CHOOSER, NULL));
}
Reference in New Issue Copy Permalink