summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibGUI
diff options
context:
space:
mode:
authorTimothy Flynn <trflynn89@pm.me>2022-09-06 10:59:44 -0400
committerLinus Groh <mail@linusgroh.de>2022-09-07 14:34:02 +0100
commiteeb7b153a27e884bbf7f9d218d64a9628a95044d (patch)
tree12681c16b3429b40b9fade4c2ae6f75b99438dfa /Userland/Libraries/LibGUI
parenta88540651168c9b6f7c4ed2d8f7cc23c8dc5e5f9 (diff)
downloadserenity-eeb7b153a27e884bbf7f9d218d64a9628a95044d.zip
LibGUI: Add a search box to filter EmojiInputDialog by code point names
Diffstat (limited to 'Userland/Libraries/LibGUI')
-rw-r--r--Userland/Libraries/LibGUI/CMakeLists.txt2
-rw-r--r--Userland/Libraries/LibGUI/EmojiInputDialog.cpp30
-rw-r--r--Userland/Libraries/LibGUI/EmojiInputDialog.gml5
-rw-r--r--Userland/Libraries/LibGUI/EmojiInputDialog.h2
4 files changed, 33 insertions, 6 deletions
diff --git a/Userland/Libraries/LibGUI/CMakeLists.txt b/Userland/Libraries/LibGUI/CMakeLists.txt
index 5ebed7250a..367f41cdfc 100644
--- a/Userland/Libraries/LibGUI/CMakeLists.txt
+++ b/Userland/Libraries/LibGUI/CMakeLists.txt
@@ -136,4 +136,4 @@ set(GENERATED_SOURCES
)
serenity_lib(LibGUI gui)
-target_link_libraries(LibGUI LibCore LibGfx LibIPC LibThreading LibRegex LibSyntax LibConfig)
+target_link_libraries(LibGUI LibCore LibGfx LibIPC LibThreading LibRegex LibSyntax LibConfig LibUnicode)
diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp
index 5ae43d410d..9f3d3487b2 100644
--- a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp
+++ b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp
@@ -17,6 +17,8 @@
#include <LibGUI/Event.h>
#include <LibGUI/Frame.h>
#include <LibGUI/ScrollableContainerWidget.h>
+#include <LibGUI/TextBox.h>
+#include <LibUnicode/CharacterTypes.h>
#include <stdlib.h>
namespace GUI {
@@ -32,6 +34,7 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window)
resize(400, 300);
auto& scrollable_container = *main_widget.find_descendant_of_type_named<GUI::ScrollableContainerWidget>("scrollable_container"sv);
+ m_search_box = main_widget.find_descendant_of_type_named<GUI::TextBox>("search_box"sv);
m_emojis_widget = main_widget.find_descendant_of_type_named<GUI::Widget>("emojis"sv);
m_emojis = supported_emoji();
@@ -42,6 +45,10 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window)
if (!is_active_window)
close();
};
+
+ m_search_box->on_change = [this]() {
+ update_displayed_emoji();
+ };
}
auto EmojiInputDialog::supported_emoji() -> Vector<Emoji>
@@ -63,6 +70,7 @@ auto EmojiInputDialog::supported_emoji() -> Vector<Emoji>
continue;
u32 code_point = strtoul(basename.to_string().characters() + 2, nullptr, 16);
+ auto name = Unicode::code_point_display_name(code_point);
// FIXME: Also emit U+FE0F for single code point emojis, currently
// they get shown as text glyphs if available.
@@ -82,7 +90,7 @@ auto EmojiInputDialog::supported_emoji() -> Vector<Emoji>
done(ExecResult::OK);
};
- code_points.empend(code_point, move(button));
+ code_points.empend(code_point, move(name), move(button));
}
return code_points;
@@ -93,20 +101,32 @@ void EmojiInputDialog::update_displayed_emoji()
ScopeGuard guard { [&] { m_emojis_widget->set_updates_enabled(true); } };
m_emojis_widget->set_updates_enabled(false);
+ m_emojis_widget->remove_all_children();
+
constexpr size_t columns = 18;
size_t rows = ceil_div(m_emojis.size(), columns);
size_t index = 0;
for (size_t row = 0; row < rows && index < m_emojis.size(); ++row) {
auto& horizontal_container = m_emojis_widget->add<Widget>();
+ horizontal_container.set_preferred_height(SpecialDimension::Fit);
+
auto& horizontal_layout = horizontal_container.set_layout<HorizontalBoxLayout>();
horizontal_layout.set_spacing(0);
+
for (size_t column = 0; column < columns; ++column) {
- if (index < m_emojis.size()) {
+ bool found_match = false;
+
+ while (!found_match && (index < m_emojis.size())) {
auto& emoji = m_emojis[index++];
- horizontal_container.add_child(*emoji.button);
- } else {
- horizontal_container.add<Widget>();
+
+ if (emoji.name.has_value())
+ found_match = emoji.name->contains(m_search_box->text(), CaseSensitivity::CaseInsensitive);
+ else
+ found_match = m_search_box->text().is_empty();
+
+ if (found_match)
+ horizontal_container.add_child(*emoji.button);
}
}
}
diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.gml b/Userland/Libraries/LibGUI/EmojiInputDialog.gml
index 132e54880b..6da0d01301 100644
--- a/Userland/Libraries/LibGUI/EmojiInputDialog.gml
+++ b/Userland/Libraries/LibGUI/EmojiInputDialog.gml
@@ -6,6 +6,11 @@
margins: [4]
}
+ @GUI::TextBox {
+ name: "search_box"
+ fixed_height: 22
+ }
+
@GUI::ScrollableContainerWidget {
name: "scrollable_container"
content_widget: @GUI::Widget {
diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.h b/Userland/Libraries/LibGUI/EmojiInputDialog.h
index acf8981270..5374332325 100644
--- a/Userland/Libraries/LibGUI/EmojiInputDialog.h
+++ b/Userland/Libraries/LibGUI/EmojiInputDialog.h
@@ -15,6 +15,7 @@ class EmojiInputDialog final : public Dialog {
struct Emoji {
u32 code_point { 0 };
+ Optional<String> name;
RefPtr<Button> button;
};
@@ -28,6 +29,7 @@ private:
Vector<Emoji> supported_emoji();
void update_displayed_emoji();
+ RefPtr<TextBox> m_search_box;
RefPtr<Widget> m_emojis_widget;
Vector<Emoji> m_emojis;
String m_selected_emoji_text;