RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:08:11 +00:00
Code Issues Activity Actions

LibGUI: Create the emoji buttons only once for EmojiInputDialog

Browse source 
To prevent lag when the displayed code points are redrawn in support of
a search box, only create the GUI::Button objects for the emoji a single
time. Re-use those buttons when adding them to the dialog.
This commit is contained in:
Timothy Flynn 2022-09-06 10:30:37 -04:00 • committed by Linus Groh
parent a511dec5ca
commit 1c32823dd8
2 changed files with 57 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

92
Userland/Libraries/LibGUI/EmojiInputDialog.cpp
View file

@ -20,27 +20,6 @@
namespace GUI {
static Vector<u32> supported_emoji_code_points()
{
Vector<u32> code_points;
Core::DirIterator dt("/res/emoji", Core::DirIterator::SkipDots);
while (dt.has_next()) {
auto filename = dt.next_path();
auto lexical_path = LexicalPath(filename);
if (lexical_path.extension() != "png")
continue;
auto basename = lexical_path.basename();
if (!basename.starts_with("U+"sv))
continue;
// FIXME: Handle multi code point emojis.
if (basename.contains('_'))
continue;
u32 code_point = strtoul(basename.to_string().characters() + 2, nullptr, 16);
code_points.append(code_point);
}
return code_points;
}
EmojiInputDialog::EmojiInputDialog(Window* parent_window)
: Dialog(parent_window)
{
@ -53,7 +32,7 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window)
auto& scrollable_container = *main_widget.find_descendant_of_type_named<GUI::ScrollableContainerWidget>("scrollable_container"sv);
m_emojis_widget = main_widget.find_descendant_of_type_named<GUI::Widget>("emojis"sv);
m_code_points = supported_emoji_code_points();
m_emojis = supported_emoji();
scrollable_container.horizontal_scrollbar().set_visible(false);
update_displayed_emoji();
@ -64,35 +43,64 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window)
};
}
void EmojiInputDialog::update_displayed_emoji()
auto EmojiInputDialog::supported_emoji() -> Vector<Emoji>
{
constexpr int button_size = 20;
Vector<Emoji> code_points;
Core::DirIterator dt("/res/emoji", Core::DirIterator::SkipDots);
while (dt.has_next()) {
auto filename = dt.next_path();
auto lexical_path = LexicalPath(filename);
if (lexical_path.extension() != "png")
continue;
auto basename = lexical_path.basename();
if (!basename.starts_with("U+"sv))
continue;
// FIXME: Handle multi code point emojis.
if (basename.contains('_'))
continue;
u32 code_point = strtoul(basename.to_string().characters() + 2, nullptr, 16);
// FIXME: Also emit U+FE0F for single code point emojis, currently
// they get shown as text glyphs if available.
// This will require buttons to don't calculate their length as 2,
// currently it just shows an ellipsis. It will also require some
// tweaking of the mechanism that is currently being used to insert
// which is a key event with a single code point.
StringBuilder builder;
builder.append(Utf32View(&code_point, 1));
auto emoji_text = builder.to_string();
auto button = Button::construct(move(emoji_text));
button->set_fixed_size(button_size, button_size);
button->set_button_style(Gfx::ButtonStyle::Coolbar);
button->on_click = [this, button = button](auto) {
m_selected_emoji_text = button->text();
done(ExecResult::OK);
};
code_points.empend(code_point, move(button));
}
return code_points;
}
void EmojiInputDialog::update_displayed_emoji()
{
constexpr size_t columns = 18;
size_t rows = ceil_div(m_code_points.size(), columns);
size_t rows = ceil_div(m_emojis.size(), columns);
size_t index = 0;
for (size_t row = 0; row < rows && index < m_code_points.size(); ++row) {
for (size_t row = 0; row < rows && index < m_emojis.size(); ++row) {
auto& horizontal_container = m_emojis_widget->add<Widget>();
auto& horizontal_layout = horizontal_container.set_layout<HorizontalBoxLayout>();
horizontal_layout.set_spacing(0);
for (size_t column = 0; column < columns; ++column) {
if (index < m_code_points.size()) {
// FIXME: Also emit U+FE0F for single code point emojis, currently
// they get shown as text glyphs if available.
// This will require buttons to don't calculate their length as 2,
// currently it just shows an ellipsis. It will also require some
// tweaking of the mechanism that is currently being used to insert
// which is a key event with a single code point.
StringBuilder builder;
builder.append(Utf32View(&m_code_points[index++], 1));
auto emoji_text = builder.to_string();
auto& button = horizontal_container.add<Button>(emoji_text);
button.set_fixed_size(button_size, button_size);
button.set_button_style(Gfx::ButtonStyle::Coolbar);
button.on_click = [this, button = &button](auto) {
m_selected_emoji_text = button->text();
done(ExecResult::OK);
};
if (index < m_emojis.size()) {
auto& emoji = m_emojis[index++];
horizontal_container.add_child(*emoji.button);
} else {
horizontal_container.add<Widget>();
}