beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

FontEditor: Rename FontEditorWidget => FontEditor::MainWidget

Browse source
This commit is contained in:
thankyouverycool 2022-07-05 06:37:06 -04:00 committed by Andreas Kling
parent dcf6454059
commit 69a385f559
Notes: sideshowbarker 2024-07-17 09:39:23 +09:00 
Author: https://github.com/thankyouverycool
Commit: https://github.com/SerenityOS/serenity/commit/69a385f559
Pull-request: https://github.com/SerenityOS/serenity/pull/14490
5 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/FileFormats.md
View file

@ -27,7 +27,7 @@ Requires the metadata-fields `count` (count of glyphs copied) and `first_glyph`
The data contains codepoint (encoded as host-endian u32), width and height (as u8's) and glyph bitmap data. It is encoded in width times height many bytes, either 0 (clear) or 1 (set). The data contains codepoint (encoded as host-endian u32), width and height (as u8's) and glyph bitmap data. It is encoded in width times height many bytes, either 0 (clear) or 1 (set).
Implemented in `FontEditor::copy_selected_glyphs` and `FontEditor::paste_glyphs`, in [`Userland/Applications/FontEditor/FontEditor.cpp`](../Userland/Applications/FontEditor/FontEditor.cpp). Implemented in `FontEditor::copy_selected_glyphs` and `FontEditor::paste_glyphs`, in [`Userland/Applications/FontEditor/MainWidget.cpp`](../Userland/Applications/FontEditor/MainWidget.cpp).
## image/x-serenityos (Clipboard-only) ## image/x-serenityos (Clipboard-only)

2
Userland/Applications/FontEditor/CMakeLists.txt
View file

@ -11,7 +11,7 @@ compile_gml(NewFontDialogPage1.gml NewFontDialogPage1GML.h new_font_dialog_page_
compile_gml(NewFontDialogPage2.gml NewFontDialogPage2GML.h new_font_dialog_page_2_gml) compile_gml(NewFontDialogPage2.gml NewFontDialogPage2GML.h new_font_dialog_page_2_gml)
set(SOURCES set(SOURCES
FontEditor.cpp MainWidget.cpp
FontEditorWindowGML.h FontEditorWindowGML.h
FontPreviewWindowGML.h FontPreviewWindowGML.h
GlyphEditorWidget.cpp GlyphEditorWidget.cpp

58
Userland/Applications/FontEditor/FontEditor.cpp → Userland/Applications/FontEditor/MainWidget.cpp
View file

@ -5,7 +5,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include "FontEditor.h" #include "MainWidget.h"
#include "GlyphEditorWidget.h" #include "GlyphEditorWidget.h"
#include "NewFontDialog.h" #include "NewFontDialog.h"
#include <AK/Array.h> #include <AK/Array.h>
@ -57,7 +57,7 @@ static constexpr Array pangrams = {
"<fox color=\"brown\" speed=\"quick\" jumps=\"over\">lazy dog</fox>" "<fox color=\"brown\" speed=\"quick\" jumps=\"over\">lazy dog</fox>"
}; };
ErrorOr<RefPtr<GUI::Window>> FontEditorWidget::create_preview_window() ErrorOr<RefPtr<GUI::Window>> MainWidget::create_preview_window()
{ {
auto window = TRY(GUI::Window::try_create(this)); auto window = TRY(GUI::Window::try_create(this));
window->set_window_type(GUI::WindowType::ToolWindow); window->set_window_type(GUI::WindowType::ToolWindow);
@ -90,7 +90,7 @@ ErrorOr<RefPtr<GUI::Window>> FontEditorWidget::create_preview_window()
return window; return window;
} }
ErrorOr<void> FontEditorWidget::create_actions() ErrorOr<void> MainWidget::create_actions()
{ {
m_new_action = GUI::Action::create("&New Font...", { Mod_Ctrl, Key_N }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-font.png")), [&](auto&) { m_new_action = GUI::Action::create("&New Font...", { Mod_Ctrl, Key_N }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-font.png")), [&](auto&) {
if (!request_close()) if (!request_close())
@ -297,7 +297,7 @@ ErrorOr<void> FontEditorWidget::create_actions()
return {}; return {};
} }
ErrorOr<void> FontEditorWidget::create_toolbars() ErrorOr<void> MainWidget::create_toolbars()
{ {
auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar"); auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
(void)TRY(toolbar.try_add_action(*m_new_action)); (void)TRY(toolbar.try_add_action(*m_new_action));
@ -331,7 +331,7 @@ ErrorOr<void> FontEditorWidget::create_toolbars()
return {}; return {};
} }
ErrorOr<void> FontEditorWidget::create_models() ErrorOr<void> MainWidget::create_models()
{ {
for (auto& it : Gfx::font_slope_names) for (auto& it : Gfx::font_slope_names)
TRY(m_font_slope_list.try_append(it.name)); TRY(m_font_slope_list.try_append(it.name));
@ -368,7 +368,7 @@ ErrorOr<void> FontEditorWidget::create_models()
return {}; return {};
} }
ErrorOr<void> FontEditorWidget::create_undo_stack() ErrorOr<void> MainWidget::create_undo_stack()
{ {
m_undo_stack = TRY(try_make<GUI::UndoStack>()); m_undo_stack = TRY(try_make<GUI::UndoStack>());
m_undo_stack->on_state_change = [this] { m_undo_stack->on_state_change = [this] {
@ -381,7 +381,7 @@ ErrorOr<void> FontEditorWidget::create_undo_stack()
return {}; return {};
} }
FontEditorWidget::FontEditorWidget() MainWidget::MainWidget()
{ {
load_from_gml(font_editor_window_gml); load_from_gml(font_editor_window_gml);
@ -542,7 +542,7 @@ FontEditorWidget::FontEditorWidget()
}; };
} }
ErrorOr<void> FontEditorWidget::initialize(String const& path, RefPtr<Gfx::BitmapFont>&& edited_font) ErrorOr<void> MainWidget::initialize(String const& path, RefPtr<Gfx::BitmapFont>&& edited_font)
{ {
if (m_edited_font == edited_font) if (m_edited_font == edited_font)
return {}; return {};
@ -609,7 +609,7 @@ ErrorOr<void> FontEditorWidget::initialize(String const& path, RefPtr<Gfx::Bitma
return {}; return {};
} }
ErrorOr<void> FontEditorWidget::initialize_menubar(GUI::Window& window) ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
{ {
auto file_menu = TRY(window.try_add_menu("&File")); auto file_menu = TRY(window.try_add_menu("&File"));
TRY(file_menu->try_add_action(*m_new_action)); TRY(file_menu->try_add_action(*m_new_action));
@ -663,7 +663,7 @@ ErrorOr<void> FontEditorWidget::initialize_menubar(GUI::Window& window)
return {}; return {};
} }
bool FontEditorWidget::save_file(String const& path) bool MainWidget::save_file(String const& path)
{ {
auto saved_font = m_edited_font->masked_character_set(); auto saved_font = m_edited_font->masked_character_set();
auto ret_val = saved_font->write_to_file(path); auto ret_val = saved_font->write_to_file(path);
@ -678,7 +678,7 @@ bool FontEditorWidget::save_file(String const& path)
return true; return true;
} }
void FontEditorWidget::set_show_font_metadata(bool show) void MainWidget::set_show_font_metadata(bool show)
{ {
if (m_font_metadata == show) if (m_font_metadata == show)
return; return;
@ -686,7 +686,7 @@ void FontEditorWidget::set_show_font_metadata(bool show)
m_font_metadata_groupbox->set_visible(m_font_metadata); m_font_metadata_groupbox->set_visible(m_font_metadata);
} }
void FontEditorWidget::set_show_unicode_blocks(bool show) void MainWidget::set_show_unicode_blocks(bool show)
{ {
if (m_unicode_blocks == show) if (m_unicode_blocks == show)
return; return;
@ -694,7 +694,7 @@ void FontEditorWidget::set_show_unicode_blocks(bool show)
m_unicode_block_container->set_visible(m_unicode_blocks); m_unicode_block_container->set_visible(m_unicode_blocks);
} }
bool FontEditorWidget::open_file(String const& path) bool MainWidget::open_file(String const& path)
{ {
auto bitmap_font = Gfx::BitmapFont::load_from_file(path); auto bitmap_font = Gfx::BitmapFont::load_from_file(path);
if (!bitmap_font) { if (!bitmap_font) {
@ -708,7 +708,7 @@ bool FontEditorWidget::open_file(String const& path)
return true; return true;
} }
void FontEditorWidget::push_undo() void MainWidget::push_undo()
{ {
auto maybe_state = m_undo_selection->save_state(); auto maybe_state = m_undo_selection->save_state();
if (maybe_state.is_error()) { if (maybe_state.is_error()) {
@ -726,7 +726,7 @@ void FontEditorWidget::push_undo()
warnln("Failed to push undo stack: {}", maybe_push.error()); warnln("Failed to push undo stack: {}", maybe_push.error());
} }
void FontEditorWidget::reset_selection_and_push_undo() void MainWidget::reset_selection_and_push_undo()
{ {
auto selection = m_glyph_map_widget->selection().normalized(); auto selection = m_glyph_map_widget->selection().normalized();
if (selection.size() != 1) { if (selection.size() != 1) {
@ -739,7 +739,7 @@ void FontEditorWidget::reset_selection_and_push_undo()
push_undo(); push_undo();
} }
void FontEditorWidget::undo() void MainWidget::undo()
{ {
if (!m_undo_stack->can_undo()) if (!m_undo_stack->can_undo())
return; return;
@ -769,7 +769,7 @@ void FontEditorWidget::undo()
update_statusbar(); update_statusbar();
} }
void FontEditorWidget::redo() void MainWidget::redo()
{ {
if (!m_undo_stack->can_redo()) if (!m_undo_stack->can_redo())
return; return;
@ -799,7 +799,7 @@ void FontEditorWidget::redo()
update_statusbar(); update_statusbar();
} }
bool FontEditorWidget::request_close() bool MainWidget::request_close()
{ {
if (!window()->is_modified()) if (!window()->is_modified())
return true; return true;
@ -814,7 +814,7 @@ bool FontEditorWidget::request_close()
return false; return false;
} }
void FontEditorWidget::update_title() void MainWidget::update_title()
{ {
StringBuilder title; StringBuilder title;
if (m_path.is_empty()) if (m_path.is_empty())
@ -825,7 +825,7 @@ void FontEditorWidget::update_title()
window()->set_title(title.to_string()); window()->set_title(title.to_string());
} }
void FontEditorWidget::did_modify_font() void MainWidget::did_modify_font()
{ {
if (!window() || window()->is_modified()) if (!window() || window()->is_modified())
return; return;
@ -833,7 +833,7 @@ void FontEditorWidget::did_modify_font()
update_title(); update_title();
} }
void FontEditorWidget::update_statusbar() void MainWidget::update_statusbar()
{ {
auto glyph = m_glyph_map_widget->active_glyph(); auto glyph = m_glyph_map_widget->active_glyph();
StringBuilder builder; StringBuilder builder;
@ -863,13 +863,13 @@ void FontEditorWidget::update_statusbar()
m_statusbar->set_text(builder.to_string()); m_statusbar->set_text(builder.to_string());
} }
void FontEditorWidget::update_preview() void MainWidget::update_preview()
{ {
if (m_font_preview_window) if (m_font_preview_window)
m_font_preview_window->update(); m_font_preview_window->update();
} }
void FontEditorWidget::drop_event(GUI::DropEvent& event) void MainWidget::drop_event(GUI::DropEvent& event)
{ {
event.accept(); event.accept();
@ -886,19 +886,19 @@ void FontEditorWidget::drop_event(GUI::DropEvent& event)
} }
} }
void FontEditorWidget::set_scale(i32 scale) void MainWidget::set_scale(i32 scale)
{ {
m_glyph_editor_widget->set_scale(scale); m_glyph_editor_widget->set_scale(scale);
} }
void FontEditorWidget::set_scale_and_save(i32 scale) void MainWidget::set_scale_and_save(i32 scale)
{ {
set_scale(scale); set_scale(scale);
Config::write_i32("FontEditor", "GlyphEditor", "Scale", scale); Config::write_i32("FontEditor", "GlyphEditor", "Scale", scale);
m_glyph_editor_widget->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height()); m_glyph_editor_widget->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height());
} }
void FontEditorWidget::copy_selected_glyphs() void MainWidget::copy_selected_glyphs()
{ {
size_t bytes_per_glyph = Gfx::GlyphBitmap::bytes_per_row() * edited_font().glyph_height(); size_t bytes_per_glyph = Gfx::GlyphBitmap::bytes_per_row() * edited_font().glyph_height();
auto selection = m_glyph_map_widget->selection().normalized(); auto selection = m_glyph_map_widget->selection().normalized();
@ -917,13 +917,13 @@ void FontEditorWidget::copy_selected_glyphs()
GUI::Clipboard::the().set_data(buffer.bytes(), "glyph/x-fonteditor", metadata); GUI::Clipboard::the().set_data(buffer.bytes(), "glyph/x-fonteditor", metadata);
} }
void FontEditorWidget::cut_selected_glyphs() void MainWidget::cut_selected_glyphs()
{ {
copy_selected_glyphs(); copy_selected_glyphs();
delete_selected_glyphs(); delete_selected_glyphs();
} }
void FontEditorWidget::paste_glyphs() void MainWidget::paste_glyphs()
{ {
auto [data, mime_type, metadata] = GUI::Clipboard::the().fetch_data_and_type(); auto [data, mime_type, metadata] = GUI::Clipboard::the().fetch_data_and_type();
if (!mime_type.starts_with("glyph/")) if (!mime_type.starts_with("glyph/"))
@ -968,7 +968,7 @@ void FontEditorWidget::paste_glyphs()
update_statusbar(); update_statusbar();
} }
void FontEditorWidget::delete_selected_glyphs() void MainWidget::delete_selected_glyphs()
{ {
push_undo(); push_undo();

12
Userland/Applications/FontEditor/FontEditor.h → Userland/Applications/FontEditor/MainWidget.h
View file

@ -19,12 +19,12 @@ namespace FontEditor {
class GlyphEditorWidget; class GlyphEditorWidget;
class FontEditorWidget final : public GUI::Widget { class MainWidget final : public GUI::Widget {
C_OBJECT(FontEditorWidget) C_OBJECT(MainWidget)
public: public:
static ErrorOr<NonnullRefPtr<FontEditorWidget>> try_create() static ErrorOr<NonnullRefPtr<MainWidget>> try_create()
{ {
NonnullRefPtr<FontEditorWidget> font_editor = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) FontEditorWidget())); NonnullRefPtr<MainWidget> font_editor = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) MainWidget()));
TRY(font_editor->create_actions()); TRY(font_editor->create_actions());
TRY(font_editor->create_models()); TRY(font_editor->create_models());
TRY(font_editor->create_toolbars()); TRY(font_editor->create_toolbars());
@ -32,7 +32,7 @@ public:
return font_editor; return font_editor;
} }
virtual ~FontEditorWidget() override = default; virtual ~MainWidget() override = default;
ErrorOr<void> initialize(String const& path, RefPtr<Gfx::BitmapFont>&&); ErrorOr<void> initialize(String const& path, RefPtr<Gfx::BitmapFont>&&);
ErrorOr<void> initialize_menubar(GUI::Window&); ErrorOr<void> initialize_menubar(GUI::Window&);
@ -52,7 +52,7 @@ public:
void set_show_unicode_blocks(bool); void set_show_unicode_blocks(bool);
private: private:
FontEditorWidget(); MainWidget();
ErrorOr<void> create_actions(); ErrorOr<void> create_actions();
ErrorOr<void> create_models(); ErrorOr<void> create_models();

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

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include "FontEditor.h" #include "MainWidget.h"
#include <AK/URL.h> #include <AK/URL.h>
#include <LibConfig/Client.h> #include <LibConfig/Client.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
@ -42,7 +42,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->resize(640, 470); window->resize(640, 470);
auto font_editor = TRY(window->try_set_main_widget<FontEditor::FontEditorWidget>()); auto font_editor = TRY(window->try_set_main_widget<FontEditor::MainWidget>());
TRY(font_editor->initialize_menubar(*window)); TRY(font_editor->initialize_menubar(*window));
if (path) { if (path) {