From 5558b2cf9f4679241ad354cb31f62b4d1c85e833 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Sun, 16 Aug 2020 12:32:27 -0400 Subject: [PATCH] Base: Rename Pebbleton to reflect actual height And update programs loading it from file. --- Applications/Welcome/main.cpp | 2 +- .../fonts/{Pebbleton11.font => Pebbleton14.font} | Bin .../{PebbletonBold11.font => PebbletonBold14.font} | Bin Demos/LibGfxDemo/main.cpp | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename Base/res/fonts/{Pebbleton11.font => Pebbleton14.font} (100%) rename Base/res/fonts/{PebbletonBold11.font => PebbletonBold14.font} (100%) diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp index 2c1e06bb6b4470..51d115951b0387 100644 --- a/Applications/Welcome/main.cpp +++ b/Applications/Welcome/main.cpp @@ -170,7 +170,7 @@ int main(int argc, char** argv) // auto& header = background.add(); - header.set_font(Gfx::Font::load_from_file("/res/fonts/PebbletonBold11.font")); + header.set_font(Gfx::Font::load_from_file("/res/fonts/PebbletonBold14.font")); header.set_text("Welcome to SerenityOS!"); header.set_text_alignment(Gfx::TextAlignment::CenterLeft); header.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); diff --git a/Base/res/fonts/Pebbleton11.font b/Base/res/fonts/Pebbleton14.font similarity index 100% rename from Base/res/fonts/Pebbleton11.font rename to Base/res/fonts/Pebbleton14.font diff --git a/Base/res/fonts/PebbletonBold11.font b/Base/res/fonts/PebbletonBold14.font similarity index 100% rename from Base/res/fonts/PebbletonBold11.font rename to Base/res/fonts/PebbletonBold14.font diff --git a/Demos/LibGfxDemo/main.cpp b/Demos/LibGfxDemo/main.cpp index 1e0e993fa81506..b881074b26e2eb 100644 --- a/Demos/LibGfxDemo/main.cpp +++ b/Demos/LibGfxDemo/main.cpp @@ -165,7 +165,7 @@ void Canvas::draw() painter.draw_text({ 520, 450, 240, 20 }, "Normal text (fixed width)", Gfx::Font::default_fixed_width_font(), Gfx::TextAlignment::CenterLeft, Color::Blue); painter.draw_text({ 520, 465, 240, 20 }, "Bold text (fixed width)", Gfx::Font::default_bold_fixed_width_font(), Gfx::TextAlignment::CenterLeft, Color::Yellow); - auto font = Gfx::Font::load_from_file("/res/fonts/PebbletonBold11.font"); + auto font = Gfx::Font::load_from_file("/res/fonts/PebbletonBold14.font"); painter.draw_rect({ 520, 510, 240, 30 }, Color::DarkGray); painter.draw_text({ 520, 510, 240, 30 }, "Hello friends! :^)", *font, Gfx::TextAlignment::Center, Color::White);