RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 00:57:44 +00:00
Code Issues Activity Actions

LibGfx: Convert Font APIs to return String instead of DeprecatedString

Browse source
This commit is contained in:
Andreas Kling 2023-09-05 15:32:52 +02:00 • committed by Tim Flynn
parent 4e9dc127ae
commit 545d8336b8
29 changed files with 106 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/CharacterMap/CharacterMapWidget.cpp
View file

@ -176,7 +176,7 @@ ErrorOr<void> CharacterMapWidget::initialize_menubar(GUI::Window& window)
void CharacterMapWidget::did_change_font()
{
m_glyph_map->set_font(font());
m_font_name_label->set_text(String::from_deprecated_string(font().human_readable_name()).release_value_but_fixme_should_propagate_errors());
m_font_name_label->set_text(font().human_readable_name());
m_output_box->set_font(font());
}

8
Userland/Applications/DisplaySettings/FontSettingsWidget.cpp
View file

@ -72,16 +72,16 @@ ErrorOr<void> FontSettingsWidget::setup_interface()
static void update_label_with_font(GUI::Label& label, Gfx::Font const& font)
{
label.set_text(String::from_deprecated_string(font.human_readable_name()).release_value_but_fixme_should_propagate_errors());
label.set_text(font.human_readable_name());
label.set_font(font);
}
void FontSettingsWidget::apply_settings()
{
GUI::ConnectionToWindowServer::the().set_system_fonts(
m_default_font_label->font().qualified_name(),
m_fixed_width_font_label->font().qualified_name(),
m_window_title_font_label->font().qualified_name());
m_default_font_label->font().qualified_name().to_deprecated_string(),
m_fixed_width_font_label->font().qualified_name().to_deprecated_string(),
m_window_title_font_label->font().qualified_name().to_deprecated_string());
}
}

6
Userland/Applications/FileManager/PropertiesWindow.cpp
View file

@ -321,14 +321,14 @@ static ErrorOr<FontInfo> load_font(StringView path, StringView mime_type, Nonnul
{
if (path.ends_with(".font"sv)) {
auto font = TRY(Gfx::BitmapFont::try_load_from_mapped_file(mapped_file));
auto typeface = TRY(try_make_ref_counted<Gfx::Typeface>(font->family(), font->variant()));
auto typeface = TRY(try_make_ref_counted<Gfx::Typeface>(font->family().to_deprecated_string(), font->variant().to_deprecated_string()));
typeface->add_bitmap_font(move(font));
return FontInfo { FontInfo::Format::BitmapFont, move(typeface) };
}
if (mime_type == "font/otf" || mime_type == "font/ttf") {
auto font = TRY(OpenType::Font::try_load_from_externally_owned_memory(mapped_file->bytes()));
auto typeface = TRY(try_make_ref_counted<Gfx::Typeface>(font->family(), font->variant()));
auto typeface = TRY(try_make_ref_counted<Gfx::Typeface>(font->family().to_deprecated_string(), font->variant().to_deprecated_string()));
typeface->set_vector_font(move(font));
return FontInfo {
mime_type == "font/otf" ? FontInfo::Format::OpenType : FontInfo::Format::TrueType,
@ -338,7 +338,7 @@ static ErrorOr<FontInfo> load_font(StringView path, StringView mime_type, Nonnul
if (mime_type == "font/woff" || mime_type == "font/woff2") {
auto font = TRY(WOFF::Font::try_load_from_externally_owned_memory(mapped_file->bytes()));
auto typeface = TRY(try_make_ref_counted<Gfx::Typeface>(font->family(), font->variant()));
auto typeface = TRY(try_make_ref_counted<Gfx::Typeface>(font->family().to_deprecated_string(), font->variant().to_deprecated_string()));
typeface->set_vector_font(move(font));
return FontInfo {
mime_type == "font/woff" ? FontInfo::Format::WOFF : FontInfo::Format::WOFF2,

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

@ -532,13 +532,13 @@ ErrorOr<void> MainWidget::create_widgets()
m_name_textbox = find_descendant_of_type_named<GUI::TextBox>("name_textbox");
m_name_textbox->on_change = [this] {
m_font->set_name(m_name_textbox->text());
m_font->set_name(MUST(String::from_deprecated_string(m_name_textbox->text())));
did_modify_font();
};
m_family_textbox = find_descendant_of_type_named<GUI::TextBox>("family_textbox");
m_family_textbox->on_change = [this] {
m_font->set_family(m_family_textbox->text());
m_font->set_family(MUST(String::from_deprecated_string(m_family_textbox->text())));
did_modify_font();
};

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

@ -218,8 +218,8 @@ NewFontDialog::NewFontDialog(GUI::Window* parent_window)
void NewFontDialog::save_metadata()
{
m_new_font_metadata.name = m_name_textbox->text();
m_new_font_metadata.family = m_family_textbox->text();
m_new_font_metadata.name = MUST(String::from_deprecated_string(m_name_textbox->text()));
m_new_font_metadata.family = MUST(String::from_deprecated_string(m_family_textbox->text()));
m_new_font_metadata.weight = Gfx::name_to_weight(m_weight_combobox->text());
m_new_font_metadata.slope = Gfx::name_to_slope(m_slope_combobox->text());
m_new_font_metadata.presentation_size = m_presentation_spinbox->value();

4
Userland/Applications/FontEditor/NewFontDialog.h
View file

@ -35,8 +35,8 @@ private:
u8 presentation_size;
u16 weight;
u8 slope;
DeprecatedString name;
DeprecatedString family;
String name;
String family;
bool is_fixed_width;
} m_new_font_metadata;

4
Userland/Applications/PixelPaint/Tools/TextTool.cpp
View file

@ -114,13 +114,13 @@ ErrorOr<GUI::Widget*> TextTool::get_properties_widget()
auto font_header = TRY(properties_widget->try_add<GUI::Label>("Current Font:"_string));
font_header->set_text_alignment(Gfx::TextAlignment::CenterLeft);
m_font_label = TRY(properties_widget->try_add<GUI::Label>(TRY(String::from_deprecated_string(m_selected_font->human_readable_name()))));
m_font_label = TRY(properties_widget->try_add<GUI::Label>(m_selected_font->human_readable_name()));
auto change_font_button = TRY(properties_widget->try_add<GUI::Button>("Change Font..."_string));
change_font_button->on_click = [this](auto) {
auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false);
if (picker->exec() == GUI::Dialog::ExecResult::OK) {
m_font_label->set_text(String::from_deprecated_string(picker->font()->human_readable_name()).release_value_but_fixme_should_propagate_errors());
m_font_label->set_text(picker->font()->human_readable_name());
m_selected_font = picker->font();
m_text_editor->set_font(m_selected_font);
m_editor->set_focus(true);

2
Userland/Applications/Terminal/main.cpp
View file

@ -403,7 +403,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto adjust_font_size = [&](float adjustment) {
auto& font = terminal->font();
auto new_size = max(5, font.presentation_size() + adjustment);
if (auto new_font = Gfx::FontDatabase::the().get(font.family(), new_size, font.weight(), font.width(), font.slope())) {
if (auto new_font = Gfx::FontDatabase::the().get(font.family().to_deprecated_string(), new_size, font.weight(), font.width(), font.slope())) {
terminal->set_font_and_resize_to_fit(*new_font);
terminal->apply_size_increments_to_window(*window);
window->resize(terminal->size());

6
Userland/Applications/TerminalSettings/TerminalSettingsWidget.cpp
View file

@ -116,13 +116,13 @@ ErrorOr<void> TerminalSettingsViewWidget::setup()
else
m_font = Gfx::FontDatabase::the().get_by_name(font_name);
m_original_font = m_font;
font_text.set_text(TRY(String::from_deprecated_string(m_font->human_readable_name())));
font_text.set_text(m_font->human_readable_name());
font_text.set_font(m_font);
font_button.on_click = [&](auto) {
auto picker = GUI::FontPicker::construct(window(), m_font.ptr(), true);
if (picker->exec() == GUI::Dialog::ExecResult::OK) {
m_font = picker->font();
font_text.set_text(String::from_deprecated_string(m_font->human_readable_name()).release_value_but_fixme_should_propagate_errors());
font_text.set_text(m_font->human_readable_name());
font_text.set_font(m_font);
Config::write_string("Terminal"sv, "Text"sv, "Font"sv, m_font->qualified_name());
set_modified(true);
@ -135,7 +135,7 @@ ErrorOr<void> TerminalSettingsViewWidget::setup()
if (use_default_font) {
font_selection.set_enabled(false);
m_font = Gfx::FontDatabase::the().default_fixed_width_font();
font_text.set_text(String::from_deprecated_string(m_font->human_readable_name()).release_value_but_fixme_should_propagate_errors());
font_text.set_text(m_font->human_readable_name());
font_text.set_font(m_font);
Config::write_string("Terminal"sv, "Text"sv, "Font"sv, m_font->qualified_name());
} else {