diff options
author | thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> | 2020-08-16 12:32:27 -0400 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-08-16 19:38:21 +0200 |
commit | 5558b2cf9f4679241ad354cb31f62b4d1c85e833 (patch) | |
tree | e8a69b7b27f4b579cb5d36a376e78ad6800b68e6 | |
parent | f025204dfe38805eed795f11f740f53a545f4451 (diff) | |
download | serenity-5558b2cf9f4679241ad354cb31f62b4d1c85e833.zip |
Base: Rename Pebbleton to reflect actual height
And update programs loading it from file.
-rw-r--r-- | Applications/Welcome/main.cpp | 2 | ||||
-rw-r--r-- | Base/res/fonts/Pebbleton14.font (renamed from Base/res/fonts/Pebbleton11.font) | bin | 14670 -> 14670 bytes | |||
-rw-r--r-- | Base/res/fonts/PebbletonBold14.font (renamed from Base/res/fonts/PebbletonBold11.font) | bin | 14670 -> 14670 bytes | |||
-rw-r--r-- | Demos/LibGfxDemo/main.cpp | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp index 2c1e06bb6b..51d115951b 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<GUI::Label>(); - 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 Binary files differindex 55eb7afa07..55eb7afa07 100644 --- a/Base/res/fonts/Pebbleton11.font +++ b/Base/res/fonts/Pebbleton14.font diff --git a/Base/res/fonts/PebbletonBold11.font b/Base/res/fonts/PebbletonBold14.font Binary files differindex 11c7a3bc26..11c7a3bc26 100644 --- a/Base/res/fonts/PebbletonBold11.font +++ b/Base/res/fonts/PebbletonBold14.font diff --git a/Demos/LibGfxDemo/main.cpp b/Demos/LibGfxDemo/main.cpp index 1e0e993fa8..b881074b26 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); |