diff --git a/Userland/Applications/FontEditor/FontEditor.cpp b/Userland/Applications/FontEditor/FontEditor.cpp index 4a0cb13071..21362b7caf 100644 --- a/Userland/Applications/FontEditor/FontEditor.cpp +++ b/Userland/Applications/FontEditor/FontEditor.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -742,6 +743,8 @@ void FontEditorWidget::update_statusbar() if (m_edited_font->contains_raw_glyph(glyph)) builder.appendff(" [{}x{}]", m_edited_font->raw_glyph_width(glyph), m_edited_font->glyph_height()); + else if (Gfx::Emoji::emoji_for_code_point(glyph)) + builder.appendff(" [emoji]"); m_statusbar->set_text(builder.to_string()); } diff --git a/Userland/Applications/FontEditor/GlyphMapWidget.cpp b/Userland/Applications/FontEditor/GlyphMapWidget.cpp index d6180579b6..4e61d3f01f 100644 --- a/Userland/Applications/FontEditor/GlyphMapWidget.cpp +++ b/Userland/Applications/FontEditor/GlyphMapWidget.cpp @@ -8,6 +8,7 @@ #include "GlyphMapWidget.h" #include #include +#include #include GlyphMapWidget::GlyphMapWidget() @@ -102,9 +103,14 @@ void GlyphMapWidget::paint_event(GUI::PaintEvent& event) painter.fill_rect(outer_rect, is_focused() ? palette().selection() : palette().inactive_selection()); if (m_font->contains_raw_glyph(glyph)) painter.draw_glyph(inner_rect.location(), glyph, is_focused() ? palette().selection_text() : palette().inactive_selection_text()); + else if (auto* emoji = Gfx::Emoji::emoji_for_code_point(glyph)) + painter.draw_emoji(inner_rect.location(), *emoji, *m_font); } else if (m_font->contains_raw_glyph(glyph)) { painter.fill_rect(outer_rect, palette().base()); painter.draw_glyph(inner_rect.location(), glyph, palette().base_text()); + } else if (auto* emoji = Gfx::Emoji::emoji_for_code_point(glyph)) { + painter.fill_rect(outer_rect, Gfx::Color { 255, 150, 150 }); + painter.draw_emoji(inner_rect.location(), *emoji, *m_font); } } }