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

Solitaire: Port to GML compilation

Browse source
This commit is contained in:
hanaa12G 2023-10-23 04:30:04 +07:00 • committed by Sam Atkins
parent df0dd26ce2
commit 10428fc7ce
5 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Games/Solitaire/CMakeLists.txt
View file

@ -4,16 +4,13 @@ serenity_component(
TARGETS Solitaire TARGETS Solitaire
) )
stringify_gml(Solitaire.gml SolitaireGML.h solitaire_gml) compile_gml(Solitaire.gml SolitaireGML.cpp solitaire_gml)
set(SOURCES set(SOURCES
Game.cpp Game.cpp
SolitaireGML.cpp
main.cpp main.cpp
) )
set(GENERATED_SOURCES
SolitaireGML.h
)
serenity_app(Solitaire ICON app-solitaire) serenity_app(Solitaire ICON app-solitaire)
target_link_libraries(Solitaire PRIVATE LibCards LibConfig LibGUI LibDesktop LibGfx LibCore LibMain) target_link_libraries(Solitaire PRIVATE LibCards LibConfig LibGUI LibDesktop LibGfx LibCore LibMain)

2
Userland/Games/Solitaire/Game.cpp
View file

@ -12,8 +12,6 @@
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
REGISTER_WIDGET(Solitaire, Game);
namespace Solitaire { namespace Solitaire {
static constexpr uint8_t new_game_animation_delay = 2; static constexpr uint8_t new_game_animation_delay = 2;

23
Userland/Games/Solitaire/MainWidget.h Normal file
View file

@ -0,0 +1,23 @@
/*
* Copyright (c) 2023, the SerenityOS developers
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibGUI/Widget.h>
namespace Solitaire {
class MainWidget : public GUI::Widget {
C_OBJECT_ABSTRACT(MainWidget)
public:
static ErrorOr<NonnullRefPtr<Solitaire::MainWidget>> try_create();
virtual ~MainWidget() override = default;
private:
MainWidget() = default;
};
}

2
Userland/Games/Solitaire/Solitaire.gml
View file

@ -1,4 +1,4 @@
@GUI::Widget { @Solitaire::MainWidget {
fill_with_background_color: true fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {} layout: @GUI::VerticalBoxLayout {}

6
Userland/Games/Solitaire/main.cpp
View file

@ -7,9 +7,9 @@
*/ */
#include "Game.h" #include "Game.h"
#include "MainWidget.h"
#include <AK/NumberFormat.h> #include <AK/NumberFormat.h>
#include <AK/URL.h> #include <AK/URL.h>
#include <Games/Solitaire/SolitaireGML.h>
#include <LibConfig/Client.h> #include <LibConfig/Client.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
@ -84,8 +84,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (mode >= Solitaire::Mode::__Count) if (mode >= Solitaire::Mode::__Count)
update_mode(Solitaire::Mode::SingleCardDraw); update_mode(Solitaire::Mode::SingleCardDraw);
auto widget = window->set_main_widget<GUI::Widget>(); auto widget = TRY(Solitaire::MainWidget::try_create());
TRY(widget->load_from_gml(solitaire_gml)); window->set_main_widget(widget);
auto& game = *widget->find_descendant_of_type_named<Solitaire::Game>("game"); auto& game = *widget->find_descendant_of_type_named<Solitaire::Game>("game");
game.set_focus(true); game.set_focus(true);