From dcf64540593c3dd21e994930075f6d9315b207f6 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Tue, 5 Jul 2022 05:53:36 -0400 Subject: [PATCH] FontEditor: Hide Widget::set_font() in GlyphEditorWidget We were already doing the same for its getters, and this makes its API more consistent with GlyphMapWidget. --- Userland/Applications/FontEditor/FontEditor.cpp | 2 +- Userland/Applications/FontEditor/GlyphEditorWidget.cpp | 2 +- Userland/Applications/FontEditor/GlyphEditorWidget.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Userland/Applications/FontEditor/FontEditor.cpp b/Userland/Applications/FontEditor/FontEditor.cpp index 805af9cdf0..af7c6317f2 100644 --- a/Userland/Applications/FontEditor/FontEditor.cpp +++ b/Userland/Applications/FontEditor/FontEditor.cpp @@ -553,7 +553,7 @@ ErrorOr FontEditorWidget::initialize(String const& path, RefPtrset_font(*m_edited_font); m_glyph_map_widget->set_font(*m_edited_font); - m_glyph_editor_widget->initialize(*m_edited_font); + m_glyph_editor_widget->set_font(*m_edited_font); m_glyph_editor_widget->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height()); m_glyph_editor_width_spinbox->set_visible(!m_edited_font->is_fixed_width()); diff --git a/Userland/Applications/FontEditor/GlyphEditorWidget.cpp b/Userland/Applications/FontEditor/GlyphEditorWidget.cpp index ef5cce9bd8..feb50f5e20 100644 --- a/Userland/Applications/FontEditor/GlyphEditorWidget.cpp +++ b/Userland/Applications/FontEditor/GlyphEditorWidget.cpp @@ -18,7 +18,7 @@ REGISTER_WIDGET(FontEditor, GlyphEditorWidget); namespace FontEditor { -void GlyphEditorWidget::initialize(Gfx::BitmapFont& mutable_font) +void GlyphEditorWidget::set_font(Gfx::BitmapFont& mutable_font) { if (m_font == mutable_font) return; diff --git a/Userland/Applications/FontEditor/GlyphEditorWidget.h b/Userland/Applications/FontEditor/GlyphEditorWidget.h index dab949cb36..90da616e2b 100644 --- a/Userland/Applications/FontEditor/GlyphEditorWidget.h +++ b/Userland/Applications/FontEditor/GlyphEditorWidget.h @@ -28,8 +28,6 @@ public: virtual ~GlyphEditorWidget() override = default; - void initialize(Gfx::BitmapFont&); - int glyph() const { return m_glyph; } void set_glyph(int); bool is_glyph_empty(); @@ -43,6 +41,7 @@ public: Gfx::BitmapFont& font() { return *m_font; } Gfx::BitmapFont const& font() const { return *m_font; } + void set_font(Gfx::BitmapFont&); int scale() const { return m_scale; } void set_scale(int scale);