RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:17:45 +00:00
Code Issues Activity Actions

FontEditor: Show recently opened files in File menu

Browse source 
And update GlyphEditorWidget on initialize(). Fixes Editor not showing
the new active glyph when loading recent fonts from a menu.
This commit is contained in:
thankyouverycool 2023-05-16 08:39:06 -04:00 • committed by Andreas Kling
parent c10b1e3aea
commit 19b8b9d187
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Applications/FontEditor/GlyphEditorWidget.cpp
View file

@ -19,6 +19,7 @@ void GlyphEditorWidget::initialize(Gfx::BitmapFont* mutable_font)
if (m_font == mutable_font) if (m_font == mutable_font)
return; return;
m_font = mutable_font; m_font = mutable_font;
update();
} }
void GlyphEditorWidget::set_glyph(int glyph) void GlyphEditorWidget::set_glyph(int glyph)

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

@ -158,9 +158,11 @@ ErrorOr<void> MainWidget::create_actions()
auto response = FileSystemAccessClient::Client::the().save_file(window(), lexical_path.title(), lexical_path.extension()); auto response = FileSystemAccessClient::Client::the().save_file(window(), lexical_path.title(), lexical_path.extension());
if (response.is_error()) if (response.is_error())
return; return;
auto file = response.release_value();
if (auto result = save_file(response.value().filename(), response.value().release_stream()); result.is_error()) if (auto result = save_file(file.filename(), file.release_stream()); result.is_error())
show_error(result.release_error(), "Saving"sv, response.value().filename()); show_error(result.release_error(), "Saving"sv, file.filename());
else
GUI::Application::the()->set_most_recently_open_file(file.filename());
}); });
m_cut_action = GUI::CommonActions::make_cut_action([this](auto&) { m_cut_action = GUI::CommonActions::make_cut_action([this](auto&) {
@ -736,6 +738,16 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_action));
TRY(file_menu->try_add_action(*m_save_as_action)); TRY(file_menu->try_add_action(*m_save_as_action));
TRY(file_menu->try_add_separator()); TRY(file_menu->try_add_separator());
TRY(file_menu->add_recent_files_list([this](auto& action) {
if (!request_close())
return;
auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(this->window(), action.text());
if (response.is_error())
return;
auto file = response.release_value();
if (auto result = open_file(file.filename(), file.release_stream()); result.is_error())
show_error(result.release_error(), "Opening"sv, file.filename());
}));
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([this](auto&) { TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([this](auto&) {
if (!request_close()) if (!request_close())
return; return;
@ -807,6 +819,8 @@ ErrorOr<void> MainWidget::open_file(StringView path, NonnullOwnPtr<Core::File> f
auto mapped_file = TRY(Core::MappedFile::map_from_file(move(file), path)); auto mapped_file = TRY(Core::MappedFile::map_from_file(move(file), path));
auto unmasked_font = TRY(TRY(Gfx::BitmapFont::try_load_from_mapped_file(mapped_file))->unmasked_character_set()); auto unmasked_font = TRY(TRY(Gfx::BitmapFont::try_load_from_mapped_file(mapped_file))->unmasked_character_set());
TRY(initialize(path, move(unmasked_font))); TRY(initialize(path, move(unmasked_font)));
if (!path.is_empty())
GUI::Application::the()->set_most_recently_open_file(TRY(String::from_utf8(path)));
return {}; return {};
} }

1
Userland/Applications/FontEditor/main.cpp
View file

@ -21,6 +21,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio recvfd sendfd thread rpath unix cpath wpath")); TRY(Core::System::pledge("stdio recvfd sendfd thread rpath unix cpath wpath"));
auto app = TRY(GUI::Application::create(arguments)); auto app = TRY(GUI::Application::create(arguments));
app->set_config_domain(TRY("FontEditor"_string));
FontEditor::g_resources = FontEditor::Resources::create(); FontEditor::g_resources = FontEditor::Resources::create();