RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:47:34 +00:00
Code Issues Activity Actions

FontEditor: Remove code duplication when resizing GlyphEditor

Browse source 
The left column now also enforces a minimum width to prevent especially
small fonts from hiding the glyph toolbars and width widgets.
This commit is contained in:
thankyouverycool 2021-11-29 10:05:57 -05:00 • committed by Andreas Kling
parent c1744822a1
commit ae922c67fd
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Applications/FontEditor/FontEditor.cpp
View file

@ -297,22 +297,19 @@ FontEditorWidget::FontEditorWidget()
m_scale_five_action = GUI::Action::create_checkable("500%", { Mod_Ctrl, Key_1 }, [&](auto&) { m_scale_five_action = GUI::Action::create_checkable("500%", { Mod_Ctrl, Key_1 }, [&](auto&) {
m_glyph_editor_widget->set_scale(5); m_glyph_editor_widget->set_scale(5);
m_glyph_editor_container->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height()); did_resize_glyph_editor();
m_left_column_container->set_fixed_width(m_glyph_editor_widget->preferred_width());
}); });
m_scale_five_action->set_checked(false); m_scale_five_action->set_checked(false);
m_scale_five_action->set_status_tip("Scale the editor in proportion to the current font"); m_scale_five_action->set_status_tip("Scale the editor in proportion to the current font");
m_scale_ten_action = GUI::Action::create_checkable("1000%", { Mod_Ctrl, Key_2 }, [&](auto&) { m_scale_ten_action = GUI::Action::create_checkable("1000%", { Mod_Ctrl, Key_2 }, [&](auto&) {
m_glyph_editor_widget->set_scale(10); m_glyph_editor_widget->set_scale(10);
m_glyph_editor_container->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height()); did_resize_glyph_editor();
m_left_column_container->set_fixed_width(m_glyph_editor_widget->preferred_width());
}); });
m_scale_ten_action->set_checked(true); m_scale_ten_action->set_checked(true);
m_scale_ten_action->set_status_tip("Scale the editor in proportion to the current font"); m_scale_ten_action->set_status_tip("Scale the editor in proportion to the current font");
m_scale_fifteen_action = GUI::Action::create_checkable("1500%", { Mod_Ctrl, Key_3 }, [&](auto&) { m_scale_fifteen_action = GUI::Action::create_checkable("1500%", { Mod_Ctrl, Key_3 }, [&](auto&) {
m_glyph_editor_widget->set_scale(15); m_glyph_editor_widget->set_scale(15);
m_glyph_editor_container->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height()); did_resize_glyph_editor();
m_left_column_container->set_fixed_width(m_glyph_editor_widget->preferred_width());
}); });
m_scale_fifteen_action->set_checked(false); m_scale_fifteen_action->set_checked(false);
m_scale_fifteen_action->set_status_tip("Scale the editor in proportion to the current font"); m_scale_fifteen_action->set_status_tip("Scale the editor in proportion to the current font");
@ -500,9 +497,7 @@ void FontEditorWidget::initialize(const String& path, RefPtr<Gfx::BitmapFont>&&
m_glyph_map_widget->initialize(*m_edited_font); m_glyph_map_widget->initialize(*m_edited_font);
m_glyph_editor_widget->initialize(*m_edited_font); m_glyph_editor_widget->initialize(*m_edited_font);
did_resize_glyph_editor();
m_glyph_editor_container->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height());
m_left_column_container->set_fixed_width(m_glyph_editor_widget->preferred_width());
m_glyph_editor_width_spinbox->set_visible(!m_edited_font->is_fixed_width()); m_glyph_editor_width_spinbox->set_visible(!m_edited_font->is_fixed_width());
m_glyph_editor_width_spinbox->set_max(m_edited_font->max_glyph_width(), GUI::AllowCallback::No); m_glyph_editor_width_spinbox->set_max(m_edited_font->max_glyph_width(), GUI::AllowCallback::No);
@ -769,3 +764,10 @@ void FontEditorWidget::drop_event(GUI::DropEvent& event)
open_file(urls.first().path()); open_file(urls.first().path());
} }
} }
void FontEditorWidget::did_resize_glyph_editor()
{
constexpr int glyph_toolbars_width = 100;
m_glyph_editor_container->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height());
m_left_column_container->set_fixed_width(max(m_glyph_editor_widget->preferred_width(), glyph_toolbars_width));
}

1
Userland/Applications/FontEditor/FontEditor.h
View file

@ -43,6 +43,7 @@ private:
void undo(); void undo();
void redo(); void redo();
void did_modify_font(); void did_modify_font();
void did_resize_glyph_editor();
void update_statusbar(); void update_statusbar();
void update_preview(); void update_preview();