0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-04 05:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Welcome: Port to GML Compiler

Browse source
This commit is contained in:
Mr.UNIX 2024-01-19 22:09:21 +01:00 committed by Tim Schumacher
parent 0a4ef6f3b7
commit 69ffdd5738
Notes: sideshowbarker 2024-07-17 08:34:29 +09:00 
Author: https://github.com/mrunix00
Commit: https://github.com/SerenityOS/serenity/commit/69ffdd5738
Pull-request: https://github.com/SerenityOS/serenity/pull/22471
Reviewed-by: https://github.com/AtkinsSJ
Reviewed-by: https://github.com/kleinesfilmroellchen ✅
Reviewed-by: https://github.com/timschumi ✅
5 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Userland/Applications/Welcome/CMakeLists.txt
View file

@ -4,16 +4,13 @@ serenity_component(
DEPENDS Help WebContent
)
stringify_gml(WelcomeWindow.gml WelcomeWindowGML.h welcome_window_gml)
compile_gml(WelcomeWindow.gml WelcomeWindowGML.cpp)
set(SOURCES
WelcomeWindowGML.cpp
WelcomeWidget.cpp
main.cpp
)
set(GENERATED_SOURCES
WelcomeWindowGML.h
)
serenity_app(Welcome ICON app-welcome)
target_link_libraries(Welcome PRIVATE LibConfig LibCore LibGfx LibGUI LibWebView LibWeb LibMain)

9
Userland/Applications/Welcome/WelcomeWidget.cpp
View file

@ -7,7 +7,6 @@
#include "WelcomeWidget.h"
#include <AK/Random.h>
#include <AK/String.h>
#include <Applications/Welcome/WelcomeWindowGML.h>
#include <LibConfig/Client.h>
#include <LibCore/StandardPaths.h>
#include <LibGUI/Application.h>
@ -19,9 +18,10 @@
#include <LibGUI/Process.h>
#include <LibGfx/Palette.h>
ErrorOr<NonnullRefPtr<WelcomeWidget>> WelcomeWidget::try_create()
namespace Welcome {
ErrorOr<NonnullRefPtr<WelcomeWidget>> WelcomeWidget::create()
{
auto welcome_widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) WelcomeWidget()));
auto welcome_widget = TRY(WelcomeWidget::try_create());
TRY(welcome_widget->create_widgets());
return welcome_widget;
@ -29,8 +29,6 @@ ErrorOr<NonnullRefPtr<WelcomeWidget>> WelcomeWidget::try_create()
ErrorOr<void> WelcomeWidget::create_widgets()
{
TRY(load_from_gml(welcome_window_gml));
m_banner_widget = find_descendant_of_type_named<GUI::Widget>("welcome_banner");
m_banner_font = TRY(Gfx::BitmapFont::try_load_from_uri("resource://fonts/MarietaRegular24.font"sv));
@ -130,3 +128,4 @@ void WelcomeWidget::paint_event(GUI::PaintEvent& event)
rect.set_x(rect.x() + static_cast<int>(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());
}
}

5
Userland/Applications/Welcome/WelcomeWidget.h
View file

@ -10,16 +10,18 @@
#include <LibGfx/Font/BitmapFont.h>
#include <LibWebView/OutOfProcessWebView.h>
namespace Welcome {
class WelcomeWidget final : public GUI::Widget {
C_OBJECT(WelcomeWidget);
public:
static ErrorOr<NonnullRefPtr<WelcomeWidget>> try_create();
static ErrorOr<NonnullRefPtr<WelcomeWidget>> create();
virtual ~WelcomeWidget() override = default;
private:
WelcomeWidget() = default;
ErrorOr<void> create_widgets();
static ErrorOr<NonnullRefPtr<WelcomeWidget>> try_create();
virtual void paint_event(GUI::PaintEvent&) override;
@ -41,3 +43,4 @@ private:
size_t m_tip_index { 0 };
Vector<String> m_tips;
};
}

8
Userland/Applications/Welcome/WelcomeWindow.gml
View file

@ -1,4 +1,4 @@
@GUI::Widget {
@Welcome::WelcomeWidget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]
@ -56,7 +56,7 @@
@GUI::Label {
name: "tip_label"
text_alignment: "TopLeft"
word_wrap: true
text_wrapping: "Wrap"
font_size: 12
}
}
@ -91,13 +91,13 @@
@GUI::Button {
name: "help_button"
text: "Help Contents"
icon: "/res/icons/16x16/book-open.png"
icon_from_path: "/res/icons/16x16/book-open.png"
}
@GUI::Button {
name: "next_button"
text: "Next Tip"
icon: "/res/icons/16x16/go-forward.png"
icon_from_path: "/res/icons/16x16/go-forward.png"
}
@GUI::Layout::Spacer {}

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

@ -32,7 +32,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->center_on_screen();
window->set_title("Welcome");
window->set_icon(app_icon.bitmap_for_size(16));
auto welcome_widget = TRY(WelcomeWidget::try_create());
auto welcome_widget = TRY(Welcome::WelcomeWidget::create());
window->set_main_widget(welcome_widget);
window->show();