diff --git a/Userland/Applications/Welcome/WelcomeWidget.cpp b/Userland/Applications/Welcome/WelcomeWidget.cpp index 42b4bbc3c9..c93177aefc 100644 --- a/Userland/Applications/Welcome/WelcomeWidget.cpp +++ b/Userland/Applications/Welcome/WelcomeWidget.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include ErrorOr> WelcomeWidget::try_create() @@ -33,6 +32,9 @@ ErrorOr WelcomeWidget::create_widgets() { TRY(load_from_gml(welcome_window_gml)); + m_banner_widget = find_descendant_of_type_named("welcome_banner"); + m_banner_font = TRY(Gfx::BitmapFont::try_load_from_file("/res/fonts/MarietaRegular24.font"sv)); + m_web_view = find_descendant_of_type_named("web_view"); auto path = TRY(String::formatted("{}/README.md", Core::StandardPaths::home_directory())); m_web_view->load(URL::create_with_file_scheme(path.to_deprecated_string())); @@ -121,8 +123,10 @@ void WelcomeWidget::paint_event(GUI::PaintEvent& event) GUI::Painter painter(*this); painter.add_clip_rect(event.rect()); - static auto font = Gfx::BitmapFont::load_from_file("/res/fonts/MarietaRegular24.font"sv); - painter.draw_text(Gfx::IntRect { 12, 4, 1, 30 }, "Welcome to "sv, *font, Gfx::TextAlignment::CenterLeft, palette().base_text()); - painter.draw_text(Gfx::IntRect { 12 + static_cast(ceilf(font->width("Welcome to "sv))), 4, 1, 30 }, "Serenity"sv, font->bold_variant(), Gfx::TextAlignment::CenterLeft, palette().base_text()); - painter.draw_text(Gfx::IntRect { 12 + static_cast(ceilf(font->width("Welcome to "sv))) + static_cast(ceilf(font->bold_variant().width("Serenity"sv))), 4, 1, 30 }, "OS"sv, font->bold_variant(), Gfx::TextAlignment::CenterLeft, palette().base() == palette().window() ? palette().base_text() : palette().base()); + auto rect = m_banner_widget->relative_rect(); + painter.draw_text(rect, "Welcome to "sv, *m_banner_font, Gfx::TextAlignment::CenterLeft, palette().base_text()); + rect.set_x(rect.x() + static_cast(ceilf(m_banner_font->width("Welcome to "sv)))); + painter.draw_text(rect, "Serenity"sv, m_banner_font->bold_variant(), Gfx::TextAlignment::CenterLeft, palette().base_text()); + rect.set_x(rect.x() + static_cast(ceilf(m_banner_font->bold_variant().width("Serenity"sv)))); + painter.draw_text(rect, "OS"sv, m_banner_font->bold_variant(), Gfx::TextAlignment::CenterLeft, palette().tray_text()); } diff --git a/Userland/Applications/Welcome/WelcomeWidget.h b/Userland/Applications/Welcome/WelcomeWidget.h index 0306b333a3..7f657d94bd 100644 --- a/Userland/Applications/Welcome/WelcomeWidget.h +++ b/Userland/Applications/Welcome/WelcomeWidget.h @@ -7,6 +7,7 @@ #pragma once #include +#include #include class WelcomeWidget final : public GUI::Widget { @@ -25,6 +26,9 @@ private: void set_random_tip(); ErrorOr open_and_parse_tips_file(); + RefPtr m_banner_font; + RefPtr m_banner_widget; + RefPtr m_close_button; RefPtr m_next_button; RefPtr m_help_button;