mirror of
https://github.com/RGBCube/serenity
synced 2025-06-01 08:18:12 +00:00
Applications: FontEditor, relocate form items by fonts size
FontEditor widget rewritten for respect to the font size and added fixed width and height header values.
This commit is contained in:
Hüseyin ASLITÜRK
Andreas Kling
parent
e68a08ad7c
commit
3874664752
9 changed files with 243 additions and 88 deletions
|
|
@ -27,75 +27,225 @@
|
|||
#include "FontEditor.h"
|
||||
#include "GlyphEditorWidget.h"
|
||||
#include "GlyphMapWidget.h"
|
||||
#include "UI_FontEditorBottom.h"
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <LibGUI/BoxLayout.h>
|
||||
#include <LibGUI/Button.h>
|
||||
#include <LibGUI/CheckBox.h>
|
||||
#include <LibGUI/GroupBox.h>
|
||||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/Painter.h>
|
||||
#include <LibGUI/SpinBox.h>
|
||||
#include <LibGUI/TextBox.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibGfx/Font.h>
|
||||
#include <LibGfx/Palette.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::Font>&& edited_font)
|
||||
: m_edited_font(move(edited_font))
|
||||
, m_path(path)
|
||||
{
|
||||
set_fill_with_background_color(true);
|
||||
set_layout<GUI::VerticalBoxLayout>();
|
||||
|
||||
if (path.is_empty())
|
||||
m_path = "/tmp/saved.font";
|
||||
else
|
||||
m_path = path;
|
||||
// Top
|
||||
auto& main_container = add<GUI::Widget>();
|
||||
main_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
main_container.layout()->set_margins({ 4, 4, 4, 4 });
|
||||
main_container.set_background_role(Gfx::ColorRole::SyntaxKeyword);
|
||||
main_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
|
||||
m_glyph_map_widget = add<GlyphMapWidget>(*m_edited_font);
|
||||
m_glyph_map_widget->move_to({ 90, 5 });
|
||||
// Top-Left Glyph Ediyor and info
|
||||
auto& editor_container = main_container.add<GUI::Widget>();
|
||||
editor_container.set_layout<GUI::VerticalBoxLayout>();
|
||||
editor_container.layout()->set_margins({ 4, 4, 4, 4 });
|
||||
editor_container.set_background_role(Gfx::ColorRole::SyntaxKeyword);
|
||||
editor_container.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
|
||||
m_glyph_editor_widget = add<GlyphEditorWidget>(*m_edited_font);
|
||||
m_glyph_editor_widget->move_to({ 5, 5 });
|
||||
m_glyph_editor_widget = editor_container.add<GlyphEditorWidget>(*m_edited_font);
|
||||
m_glyph_editor_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
|
||||
m_glyph_editor_widget->set_preferred_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height());
|
||||
|
||||
m_ui = make<UI_FontEditorBottom>();
|
||||
add_child(*m_ui->main_widget);
|
||||
m_ui->main_widget->set_relative_rect(5, 110, 380, 240);
|
||||
editor_container.set_preferred_size(m_glyph_editor_widget->preferred_width(), 0);
|
||||
|
||||
m_ui->name_textbox->set_text(m_edited_font->name());
|
||||
m_ui->name_textbox->on_change = [this] {
|
||||
m_edited_font->set_name(m_ui->name_textbox->text());
|
||||
auto& glyph_width_label = editor_container.add<GUI::Label>();
|
||||
glyph_width_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
glyph_width_label.set_preferred_size(0, 22);
|
||||
glyph_width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
glyph_width_label.set_text("Glyph width:");
|
||||
|
||||
auto& glyph_width_spinbox = editor_container.add<GUI::SpinBox>();
|
||||
glyph_width_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
glyph_width_spinbox.set_preferred_size(0, 22);
|
||||
glyph_width_spinbox.set_min(0);
|
||||
glyph_width_spinbox.set_max(32);
|
||||
glyph_width_spinbox.set_value(0);
|
||||
glyph_width_spinbox.set_enabled(!m_edited_font->is_fixed_width());
|
||||
|
||||
auto& info_label = editor_container.add<GUI::Label>();
|
||||
info_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
info_label.set_preferred_size(0, 22);
|
||||
info_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
info_label.set_text("info_label");
|
||||
|
||||
/// Top-Right glyph map and font meta data
|
||||
|
||||
auto& map_and_test_container = main_container.add<GUI::Widget>();
|
||||
map_and_test_container.set_layout<GUI::VerticalBoxLayout>();
|
||||
map_and_test_container.layout()->set_margins({ 4, 4, 4, 4 });
|
||||
map_and_test_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
|
||||
m_glyph_map_widget = map_and_test_container.add<GlyphMapWidget>(*m_edited_font);
|
||||
m_glyph_map_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
|
||||
m_glyph_map_widget->set_preferred_size(m_glyph_map_widget->preferred_width(), m_glyph_map_widget->preferred_height());
|
||||
|
||||
auto& font_mtest_group_box = map_and_test_container.add<GUI::GroupBox>();
|
||||
font_mtest_group_box.set_layout<GUI::VerticalBoxLayout>();
|
||||
font_mtest_group_box.layout()->set_margins({ 5, 15, 5, 5 });
|
||||
font_mtest_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
font_mtest_group_box.set_preferred_size(0, 2 * m_edited_font->glyph_height() + 50);
|
||||
font_mtest_group_box.set_title("Test");
|
||||
|
||||
auto& demo_label_1 = font_mtest_group_box.add<GUI::Label>();
|
||||
demo_label_1.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
demo_label_1.set_font(m_edited_font);
|
||||
demo_label_1.set_text("quick fox jumps nightly above wizard.");
|
||||
|
||||
auto& demo_label_2 = font_mtest_group_box.add<GUI::Label>();
|
||||
demo_label_2.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
demo_label_2.set_font(m_edited_font);
|
||||
demo_label_2.set_text("QUICK FOX JUMPS NIGHTLY ABOVE WIZARD!");
|
||||
|
||||
auto& font_metadata_group_box = map_and_test_container.add<GUI::GroupBox>();
|
||||
font_metadata_group_box.set_layout<GUI::VerticalBoxLayout>();
|
||||
font_metadata_group_box.layout()->set_margins({ 5, 15, 5, 5 });
|
||||
font_metadata_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
font_metadata_group_box.set_preferred_size(0, 145);
|
||||
font_metadata_group_box.set_title("Font metadata");
|
||||
|
||||
//// Name Row
|
||||
auto& namecontainer = font_metadata_group_box.add<GUI::Widget>();
|
||||
namecontainer.set_layout<GUI::HorizontalBoxLayout>();
|
||||
namecontainer.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
namecontainer.set_preferred_size(0, 22);
|
||||
|
||||
auto& name_label = namecontainer.add<GUI::Label>();
|
||||
name_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
name_label.set_preferred_size(100, 0);
|
||||
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
name_label.set_text("Name:");
|
||||
|
||||
auto& name_textbox = namecontainer.add<GUI::TextBox>();
|
||||
name_textbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
name_textbox.set_text(m_edited_font->name());
|
||||
name_textbox.on_change = [&] {
|
||||
m_edited_font->set_name(name_textbox.text());
|
||||
};
|
||||
|
||||
m_ui->fixed_width_checkbox->set_text("Fixed width");
|
||||
m_ui->fixed_width_checkbox->set_checked(m_edited_font->is_fixed_width());
|
||||
//// Glyph spacing Row
|
||||
auto& glyph_spacing_container = font_metadata_group_box.add<GUI::Widget>();
|
||||
glyph_spacing_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
glyph_spacing_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
glyph_spacing_container.set_preferred_size(0, 22);
|
||||
|
||||
m_ui->spacing_spinbox->set_value(m_edited_font->glyph_spacing());
|
||||
auto& glyph_spacing = glyph_spacing_container.add<GUI::Label>();
|
||||
glyph_spacing.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
glyph_spacing.set_preferred_size(100, 0);
|
||||
glyph_spacing.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
glyph_spacing.set_text("Glyph spacing:");
|
||||
|
||||
m_ui->path_textbox->set_text(m_path);
|
||||
m_ui->path_textbox->on_change = [this] {
|
||||
m_path = m_ui->path_textbox->text();
|
||||
auto& spacing_spinbox = glyph_spacing_container.add<GUI::SpinBox>();
|
||||
spacing_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
spacing_spinbox.set_min(0);
|
||||
spacing_spinbox.set_max(255);
|
||||
spacing_spinbox.set_value(m_edited_font->glyph_spacing());
|
||||
|
||||
//// Glyph Height Row
|
||||
auto& glyph_height_container = font_metadata_group_box.add<GUI::Widget>();
|
||||
glyph_height_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
glyph_height_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
glyph_height_container.set_preferred_size(0, 22);
|
||||
|
||||
auto& glyph_height = glyph_height_container.add<GUI::Label>();
|
||||
glyph_height.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
glyph_height.set_preferred_size(100, 0);
|
||||
glyph_height.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
glyph_height.set_text("Glyph height:");
|
||||
|
||||
auto& glyph_height_spinbox = glyph_height_container.add<GUI::SpinBox>();
|
||||
glyph_height_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
glyph_height_spinbox.set_min(0);
|
||||
glyph_height_spinbox.set_max(255);
|
||||
glyph_height_spinbox.set_value(m_edited_font->glyph_height());
|
||||
glyph_height_spinbox.set_enabled(false);
|
||||
|
||||
//// Glyph width Row
|
||||
auto& glyph_weight_container = font_metadata_group_box.add<GUI::Widget>();
|
||||
glyph_weight_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
glyph_weight_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
glyph_weight_container.set_preferred_size(0, 22);
|
||||
|
||||
auto& glyph_header_width_label = glyph_weight_container.add<GUI::Label>();
|
||||
glyph_header_width_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
glyph_header_width_label.set_preferred_size(100, 0);
|
||||
glyph_header_width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
glyph_header_width_label.set_text("Glyph width:");
|
||||
|
||||
auto& glyph_header_width_spinbox = glyph_weight_container.add<GUI::SpinBox>();
|
||||
glyph_header_width_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
glyph_header_width_spinbox.set_min(0);
|
||||
glyph_header_width_spinbox.set_max(255);
|
||||
glyph_header_width_spinbox.set_value(m_edited_font->glyph_fixed_width());
|
||||
glyph_header_width_spinbox.set_enabled(false);
|
||||
|
||||
//// Fixed checkbox Row
|
||||
auto& fixed_width_checkbox = font_metadata_group_box.add<GUI::CheckBox>();
|
||||
fixed_width_checkbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
fixed_width_checkbox.set_preferred_size(0, 22);
|
||||
fixed_width_checkbox.set_text("Fixed width");
|
||||
fixed_width_checkbox.set_checked(m_edited_font->is_fixed_width());
|
||||
|
||||
// Bottom
|
||||
auto& bottom_container = add<GUI::Widget>();
|
||||
bottom_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
bottom_container.layout()->set_margins({ 8, 0, 8, 8 });
|
||||
bottom_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
bottom_container.set_preferred_size(0, 32);
|
||||
|
||||
bottom_container.layout()->add_spacer();
|
||||
|
||||
auto& save_button = bottom_container.add<GUI::Button>();
|
||||
save_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
save_button.set_preferred_size(80, 0);
|
||||
save_button.set_text("Save");
|
||||
save_button.on_click = [this] {
|
||||
auto ret_val = m_edited_font->write_to_file(m_path);
|
||||
if (!ret_val) {
|
||||
GUI::MessageBox::show("The font file could not be saved.", "Save failed", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window());
|
||||
}
|
||||
};
|
||||
|
||||
m_ui->save_button->set_text("Save");
|
||||
m_ui->save_button->on_click = [this] {
|
||||
dbgprintf("write to file: '%s'\n", m_path.characters());
|
||||
m_edited_font->write_to_file(m_path);
|
||||
};
|
||||
|
||||
m_ui->quit_button->set_text("Quit");
|
||||
m_ui->quit_button->on_click = [] {
|
||||
auto& quit_button = bottom_container.add<GUI::Button>();
|
||||
quit_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
quit_button.set_preferred_size(80, 0);
|
||||
quit_button.set_text("Quit");
|
||||
quit_button.on_click = [this] {
|
||||
exit(0);
|
||||
};
|
||||
|
||||
m_ui->info_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
// Event hanglers
|
||||
auto update_demo = [&] {
|
||||
demo_label_1.update();
|
||||
demo_label_2.update();
|
||||
};
|
||||
|
||||
m_ui->demo_label_1->set_font(m_edited_font);
|
||||
m_ui->demo_label_1->set_text("quick fox jumps nightly above wizard.");
|
||||
auto calculate_prefed_sizes = [&] {
|
||||
int right_site_width = m_edited_font->width("QUICK FOX JUMPS NIGHTLY ABOVE WIZARD!") + 20;
|
||||
right_site_width = max(right_site_width, m_glyph_map_widget->preferred_width());
|
||||
|
||||
m_ui->demo_label_2->set_font(m_edited_font);
|
||||
m_ui->demo_label_2->set_text("QUICK FOX JUMPS NIGHTLY ABOVE WIZARD!");
|
||||
|
||||
auto update_demo = [this] {
|
||||
m_ui->demo_label_1->update();
|
||||
m_ui->demo_label_2->update();
|
||||
m_preferred_width = m_glyph_editor_widget->width() + right_site_width + 20;
|
||||
m_preferred_height = m_glyph_map_widget->relative_rect().height() + 2 * m_edited_font->glyph_height() + 250;
|
||||
};
|
||||
|
||||
m_glyph_editor_widget->on_glyph_altered = [this, update_demo](u8 glyph) {
|
||||
|
|
@ -103,9 +253,9 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::Font>&& edite
|
|||
update_demo();
|
||||
};
|
||||
|
||||
m_glyph_map_widget->on_glyph_selected = [this](u8 glyph) {
|
||||
m_glyph_map_widget->on_glyph_selected = [&](size_t glyph) {
|
||||
m_glyph_editor_widget->set_glyph(glyph);
|
||||
m_ui->width_spinbox->set_value(m_edited_font->glyph_width(m_glyph_map_widget->selected_glyph()));
|
||||
glyph_width_spinbox.set_value(m_edited_font->glyph_width(m_glyph_map_widget->selected_glyph()));
|
||||
StringBuilder builder;
|
||||
builder.appendf("0x%b (", glyph);
|
||||
if (glyph < 128) {
|
||||
|
|
@ -115,28 +265,31 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::Font>&& edite
|
|||
builder.append(128 | (glyph % 64));
|
||||
}
|
||||
builder.append(')');
|
||||
m_ui->info_label->set_text(builder.to_string());
|
||||
info_label.set_text(builder.to_string());
|
||||
};
|
||||
|
||||
m_ui->fixed_width_checkbox->on_checked = [this, update_demo](bool checked) {
|
||||
fixed_width_checkbox.on_checked = [&](bool checked) {
|
||||
m_edited_font->set_fixed_width(checked);
|
||||
m_ui->width_spinbox->set_value(m_edited_font->glyph_width(m_glyph_map_widget->selected_glyph()));
|
||||
glyph_width_spinbox.set_enabled(!m_edited_font->is_fixed_width());
|
||||
glyph_width_spinbox.set_value(m_edited_font->glyph_width(m_glyph_map_widget->selected_glyph()));
|
||||
m_glyph_editor_widget->update();
|
||||
update_demo();
|
||||
};
|
||||
|
||||
m_ui->width_spinbox->on_change = [this, update_demo](int value) {
|
||||
glyph_width_spinbox.on_change = [this, update_demo](int value) {
|
||||
m_edited_font->set_glyph_width(m_glyph_map_widget->selected_glyph(), value);
|
||||
m_glyph_editor_widget->update();
|
||||
m_glyph_map_widget->update_glyph(m_glyph_map_widget->selected_glyph());
|
||||
update_demo();
|
||||
};
|
||||
|
||||
m_ui->spacing_spinbox->on_change = [this, update_demo](int value) {
|
||||
spacing_spinbox.on_change = [this, update_demo](int value) {
|
||||
m_edited_font->set_glyph_spacing(value);
|
||||
update_demo();
|
||||
};
|
||||
|
||||
// init widget
|
||||
calculate_prefed_sizes();
|
||||
m_glyph_map_widget->set_selected_glyph('A');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,13 +32,14 @@
|
|||
class GlyphEditorWidget;
|
||||
class GlyphMapWidget;
|
||||
|
||||
struct UI_FontEditorBottom;
|
||||
|
||||
class FontEditorWidget final : public GUI::Widget {
|
||||
C_OBJECT(FontEditorWidget)
|
||||
public:
|
||||
virtual ~FontEditorWidget() override;
|
||||
|
||||
int preferred_width() { return m_preferred_width; }
|
||||
int preferred_height() { return m_preferred_height; }
|
||||
|
||||
private:
|
||||
FontEditorWidget(const String& path, RefPtr<Gfx::Font>&&);
|
||||
RefPtr<Gfx::Font> m_edited_font;
|
||||
|
|
@ -47,6 +48,6 @@ private:
|
|||
RefPtr<GlyphEditorWidget> m_glyph_editor_widget;
|
||||
|
||||
String m_path;
|
||||
|
||||
OwnPtr<UI_FontEditorBottom> m_ui;
|
||||
int m_preferred_width;
|
||||
int m_preferred_height;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{"name":"FontEditorBottom","widgets":[{"enabled":true,"forecolor":"#000000ff","autofill":false,"x":5,"tooltip":"[null]","name":"info_label","height":16,"width":66,"y":15,"class":"GUI::Label","text":"info_label","backcolor":"#d4d0c8ff","visible":true},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":95,"tooltip":null,"name":"demo_label_1","height":16,"width":276,"y":15,"class":"GUI::Label","text":"demo_label_1","backcolor":"#00000000","visible":true},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":95,"tooltip":null,"name":"demo_label_2","height":16,"width":276,"y":40,"class":"GUI::Label","text":"demo_label_2","backcolor":"#00000000","visible":true},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":5,"tooltip":null,"name":"label1","height":16,"width":66,"y":40,"class":"GUI::Label","text":"Glyph width:","backcolor":"#00000000","visible":true},{"forecolor":"#00000000","name":"width_spinbox","height":21,"backcolor":"#00000000","enabled":true,"value":0,"tooltip":null,"max":32,"visible":true,"y":60,"width":71,"autofill":false,"x":5,"class":"GUI::SpinBox","min":0},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":5,"tooltip":null,"name":"gb1","height":76,"width":300,"y":95,"class":"GUI::GroupBox","backcolor":"#d4d0c8ff","title":"Font metadata","visible":true},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":15,"tooltip":null,"name":"label2","height":16,"width":40,"y":105,"class":"GUI::Label","text":"Name:","backcolor":"#00000000","visible":true},{"tooltip":null,"forecolor":"#00000000","name":"name_textbox","y":120,"autofill":false,"x":15,"class":"GUI::TextBox","backcolor":"#00000000","ruler_visible":false,"height":21,"enabled":true,"text":"","visible":true,"width":196},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":215,"tooltip":null,"name":"label3","height":16,"width":80,"y":105,"class":"GUI::Label","text":"Glyph spacing:","backcolor":"#00000000","visible":true},{"forecolor":"#00000000","name":"spacing_spinbox","height":21,"backcolor":"#00000000","enabled":true,"value":0,"tooltip":null,"max":255,"visible":true,"y":120,"width":80,"autofill":false,"x":215,"class":"GUI::SpinBox","min":0},{"tooltip":null,"checked":false,"forecolor":"#00000000","name":"fixed_width_checkbox","y":145,"autofill":false,"x":15,"class":"GUI::CheckBox","backcolor":"#00000000","height":21,"enabled":true,"text":"Fixed width","visible":true,"width":101},{"tooltip":null,"forecolor":"#00000000","name":"path_textbox","y":175,"autofill":false,"x":5,"class":"GUI::TextBox","backcolor":"#00000000","ruler_visible":false,"height":21,"enabled":true,"text":"","visible":true,"width":216},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":5,"tooltip":null,"name":"save_button","height":21,"width":106,"y":205,"class":"GUI::Button","text":"Save","backcolor":"#00000000","visible":true},{"enabled":true,"forecolor":"#00000000","autofill":false,"x":115,"tooltip":null,"name":"quit_button","height":21,"width":106,"y":205,"class":"GUI::Button","text":"Quit","backcolor":"#00000000","visible":true}]}
|
||||
|
|
@ -39,7 +39,7 @@ GlyphEditorWidget::~GlyphEditorWidget()
|
|||
{
|
||||
}
|
||||
|
||||
void GlyphEditorWidget::set_glyph(u8 glyph)
|
||||
void GlyphEditorWidget::set_glyph(int glyph)
|
||||
{
|
||||
if (m_glyph == glyph)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ class GlyphEditorWidget final : public GUI::Frame {
|
|||
public:
|
||||
virtual ~GlyphEditorWidget() override;
|
||||
|
||||
u8 glyph() const { return m_glyph; }
|
||||
void set_glyph(u8);
|
||||
int glyph() const { return m_glyph; }
|
||||
void set_glyph(int);
|
||||
|
||||
int preferred_width() const;
|
||||
int preferred_height() const;
|
||||
|
|
@ -52,6 +52,6 @@ private:
|
|||
void draw_at_mouse(const GUI::MouseEvent&);
|
||||
|
||||
RefPtr<Gfx::Font> m_font;
|
||||
u8 m_glyph { 0 };
|
||||
int m_glyph { 0 };
|
||||
int m_scale { 10 };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font)
|
||||
: m_font(mutable_font)
|
||||
{
|
||||
m_glyph_count = mutable_font.glyph_count();
|
||||
set_relative_rect({ 0, 0, preferred_width(), preferred_height() });
|
||||
}
|
||||
|
||||
|
|
@ -49,7 +50,7 @@ int GlyphMapWidget::preferred_height() const
|
|||
return rows() * (font().glyph_height() + m_vertical_spacing) + 2 + frame_thickness() * 2;
|
||||
}
|
||||
|
||||
void GlyphMapWidget::set_selected_glyph(u8 glyph)
|
||||
void GlyphMapWidget::set_selected_glyph(int glyph)
|
||||
{
|
||||
if (m_selected_glyph == glyph)
|
||||
return;
|
||||
|
|
@ -59,7 +60,7 @@ void GlyphMapWidget::set_selected_glyph(u8 glyph)
|
|||
update();
|
||||
}
|
||||
|
||||
Gfx::Rect GlyphMapWidget::get_outer_rect(u8 glyph) const
|
||||
Gfx::Rect GlyphMapWidget::get_outer_rect(int glyph) const
|
||||
{
|
||||
int row = glyph / columns();
|
||||
int column = glyph % columns();
|
||||
|
|
@ -72,7 +73,7 @@ Gfx::Rect GlyphMapWidget::get_outer_rect(u8 glyph) const
|
|||
.translated(frame_thickness(), frame_thickness());
|
||||
}
|
||||
|
||||
void GlyphMapWidget::update_glyph(u8 glyph)
|
||||
void GlyphMapWidget::update_glyph(int glyph)
|
||||
{
|
||||
update(get_outer_rect(glyph));
|
||||
}
|
||||
|
|
@ -158,7 +159,8 @@ void GlyphMapWidget::keydown_event(GUI::KeyEvent& event)
|
|||
}
|
||||
if (!event.ctrl() && event.key() == KeyCode::Key_End) {
|
||||
int new_selection = selected_glyph() / m_columns * m_columns + (m_columns - 1);
|
||||
new_selection = clamp(new_selection, 0, m_glyph_count - 1);
|
||||
int max = m_glyph_count - 1;
|
||||
new_selection = clamp(new_selection, 0, max);
|
||||
set_selected_glyph(new_selection);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ class GlyphMapWidget final : public GUI::Frame {
|
|||
public:
|
||||
virtual ~GlyphMapWidget() override;
|
||||
|
||||
u8 selected_glyph() const { return m_selected_glyph; }
|
||||
void set_selected_glyph(u8);
|
||||
int selected_glyph() const { return m_selected_glyph; }
|
||||
void set_selected_glyph(int);
|
||||
|
||||
int rows() const { return ceil_div(m_glyph_count, m_columns); }
|
||||
int columns() const { return m_columns; }
|
||||
|
|
@ -47,9 +47,9 @@ public:
|
|||
Gfx::Font& font() { return *m_font; }
|
||||
const Gfx::Font& font() const { return *m_font; }
|
||||
|
||||
void update_glyph(u8);
|
||||
void update_glyph(int);
|
||||
|
||||
Function<void(u8)> on_glyph_selected;
|
||||
Function<void(int)> on_glyph_selected;
|
||||
|
||||
private:
|
||||
explicit GlyphMapWidget(Gfx::Font&);
|
||||
|
|
@ -58,12 +58,12 @@ private:
|
|||
virtual void mousedown_event(GUI::MouseEvent&) override;
|
||||
virtual void keydown_event(GUI::KeyEvent&) override;
|
||||
|
||||
Gfx::Rect get_outer_rect(u8 glyph) const;
|
||||
Gfx::Rect get_outer_rect(int glyph) const;
|
||||
|
||||
RefPtr<Gfx::Font> m_font;
|
||||
int m_glyph_count { 256 };
|
||||
int m_glyph_count;
|
||||
int m_columns { 32 };
|
||||
int m_horizontal_spacing { 2 };
|
||||
int m_vertical_spacing { 2 };
|
||||
u8 m_selected_glyph { 0 };
|
||||
int m_selected_glyph { 0 };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,4 @@ PROGRAM = FontEditor
|
|||
|
||||
LIB_DEPS = GUI Gfx Core IPC
|
||||
|
||||
FontEditor.cpp: UI_FontEditorBottom.h
|
||||
|
||||
UI_FontEditorBottom.h: FontEditorBottom.frm | FORMCOMPILER
|
||||
$(QUIET) $(FORMCOMPILER) $< > $@
|
||||
|
||||
EXTRA_CLEAN = UI_FontEditorBottom.h
|
||||
|
||||
include ../../Makefile.common
|
||||
|
|
|
|||
|
|
@ -25,11 +25,14 @@
|
|||
*/
|
||||
|
||||
#include "FontEditor.h"
|
||||
#include <LibCore/ArgsParser.h>
|
||||
#include <LibGUI/AboutDialog.h>
|
||||
#include <LibGUI/Action.h>
|
||||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/Icon.h>
|
||||
#include <LibGUI/Menu.h>
|
||||
#include <LibGUI/MenuBar.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibGfx/Bitmap.h>
|
||||
#include <LibGfx/Font.h>
|
||||
|
|
@ -49,30 +52,32 @@ int main(int argc, char** argv)
|
|||
return 1;
|
||||
}
|
||||
|
||||
RefPtr<Gfx::Font> edited_font;
|
||||
String path;
|
||||
const char* path = nullptr;
|
||||
Core::ArgsParser args_parser;
|
||||
args_parser.add_positional_argument(path, "The font file for editing.", "file", Core::ArgsParser::Required::No);
|
||||
args_parser.parse(argc, argv);
|
||||
|
||||
if (argc == 2) {
|
||||
path = argv[1];
|
||||
edited_font = Gfx::Font::load_from_file(path);
|
||||
RefPtr<Gfx::Font> edited_font;
|
||||
if (path == nullptr) {
|
||||
path = "/tmp/saved.font";
|
||||
edited_font = Gfx::Font::default_font().clone();
|
||||
} else {
|
||||
edited_font = Gfx::Font::load_from_file(path)->clone();
|
||||
if (!edited_font) {
|
||||
fprintf(stderr, "Couldn't load font: %s\n", path.characters());
|
||||
String message = String::format("Couldn't load font: %s\n", path);
|
||||
GUI::MessageBox::show(message, "Font Editor", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (edited_font)
|
||||
edited_font = edited_font->clone();
|
||||
else
|
||||
edited_font = Gfx::Font::default_font().clone();
|
||||
auto app_icon = GUI::Icon::default_icon("app-font-editor");
|
||||
|
||||
auto window = GUI::Window::construct();
|
||||
window->set_title("Font Editor");
|
||||
window->set_rect({ 50, 50, 390, 342 });
|
||||
window->set_title(String::format("%s - Font Editor", path));
|
||||
window->set_icon(app_icon.bitmap_for_size(16));
|
||||
|
||||
window->set_main_widget<FontEditorWidget>(path, move(edited_font));
|
||||
window->show();
|
||||
window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-font-editor.png"));
|
||||
auto& font_editor_widget = window->set_main_widget<FontEditorWidget>(path, move(edited_font));
|
||||
window->set_rect({ 50, 50, font_editor_widget.preferred_width(), font_editor_widget.preferred_height() });
|
||||
|
||||
auto menubar = GUI::MenuBar::construct();
|
||||
|
||||
|
|
@ -84,10 +89,12 @@ int main(int argc, char** argv)
|
|||
|
||||
auto& help_menu = menubar->add_menu("Help");
|
||||
help_menu.add_action(GUI::Action::create("About", [&](const GUI::Action&) {
|
||||
GUI::AboutDialog::show("Font Editor", Gfx::Bitmap::load_from_file("/res/icons/FontEditor.png"), window);
|
||||
GUI::AboutDialog::show("Font Editor", app_icon.bitmap_for_size(32), window);
|
||||
}));
|
||||
|
||||
app.set_menubar(move(menubar));
|
||||
|
||||
window->show();
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue