diff --git a/Userland/Games/Spider/CMakeLists.txt b/Userland/Games/Spider/CMakeLists.txt index 7d899b64188..b4314ee202a 100644 --- a/Userland/Games/Spider/CMakeLists.txt +++ b/Userland/Games/Spider/CMakeLists.txt @@ -4,15 +4,12 @@ serenity_component( TARGETS Spider ) -stringify_gml(Spider.gml SpiderGML.h spider_gml) +compile_gml(Spider.gml SpiderGML.cpp spider_gml) set(SOURCES Game.cpp main.cpp -) - -set(GENERATED_SOURCES - SpiderGML.h + SpiderGML.cpp ) serenity_app(Spider ICON app-spider) diff --git a/Userland/Games/Spider/MainWidget.h b/Userland/Games/Spider/MainWidget.h new file mode 100644 index 00000000000..af4e0d85b60 --- /dev/null +++ b/Userland/Games/Spider/MainWidget.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2023, the SerenityOS developers + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Spider { + +class MainWidget : public GUI::Widget { + C_OBJECT_ABSTRACT(MainWidget) +public: + static ErrorOr> try_create(); + virtual ~MainWidget() override = default; + +private: + MainWidget() = default; +}; + +} diff --git a/Userland/Games/Spider/Spider.gml b/Userland/Games/Spider/Spider.gml index 12c560b0cec..33e17ffcbf4 100644 --- a/Userland/Games/Spider/Spider.gml +++ b/Userland/Games/Spider/Spider.gml @@ -1,4 +1,4 @@ -@GUI::Widget { +@Spider::MainWidget { fill_with_background_color: true layout: @GUI::VerticalBoxLayout {} diff --git a/Userland/Games/Spider/main.cpp b/Userland/Games/Spider/main.cpp index 1ad7caeab25..636e4eee7a9 100644 --- a/Userland/Games/Spider/main.cpp +++ b/Userland/Games/Spider/main.cpp @@ -7,9 +7,9 @@ */ #include "Game.h" +#include "MainWidget.h" #include #include -#include #include #include #include @@ -116,8 +116,8 @@ ErrorOr serenity_main(Main::Arguments arguments) if (statistic_display >= StatisticDisplay::__Count) update_statistic_display(StatisticDisplay::HighScore); - auto widget = window->set_main_widget(); - TRY(widget->load_from_gml(spider_gml)); + auto widget = TRY(Spider::MainWidget::try_create()); + window->set_main_widget(widget); auto& game = *widget->find_descendant_of_type_named("game"); game.set_focus(true);