diff --git a/Userland/Games/Snake/CMakeLists.txt b/Userland/Games/Snake/CMakeLists.txt index 2e8acf1fc8..a888a00509 100644 --- a/Userland/Games/Snake/CMakeLists.txt +++ b/Userland/Games/Snake/CMakeLists.txt @@ -4,7 +4,7 @@ serenity_component( TARGETS Snake ) -stringify_gml(Snake.gml SnakeGML.h snake_gml) +compile_gml(Snake.gml SnakeGML.cpp) set(SOURCES Game.cpp @@ -12,10 +12,7 @@ set(SOURCES Skins/ClassicSkin.cpp Skins/ImageSkin.cpp Skins/SnakeSkin.cpp -) - -set(GENERATED_SOURCES - SnakeGML.h + SnakeGML.cpp ) serenity_app(Snake ICON app-snake) diff --git a/Userland/Games/Snake/Game.cpp b/Userland/Games/Snake/Game.cpp index cb88d340ed..dc8e945aed 100644 --- a/Userland/Games/Snake/Game.cpp +++ b/Userland/Games/Snake/Game.cpp @@ -16,8 +16,6 @@ #include #include -REGISTER_WIDGET(Snake, Game); - namespace Snake { ErrorOr> Game::try_create() diff --git a/Userland/Games/Snake/MainWidget.h b/Userland/Games/Snake/MainWidget.h new file mode 100644 index 0000000000..bcd4364dd6 --- /dev/null +++ b/Userland/Games/Snake/MainWidget.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2023, the SerenityOS developers + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Snake { + +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/Snake/Snake.gml b/Userland/Games/Snake/Snake.gml index bbf142cae7..3857d749d4 100644 --- a/Userland/Games/Snake/Snake.gml +++ b/Userland/Games/Snake/Snake.gml @@ -1,4 +1,4 @@ -@GUI::Widget { +@Snake::MainWidget { layout: @GUI::VerticalBoxLayout {} fill_with_background_color: true diff --git a/Userland/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp index 530b5b07e2..6a25515095 100644 --- a/Userland/Games/Snake/main.cpp +++ b/Userland/Games/Snake/main.cpp @@ -6,9 +6,9 @@ */ #include "Game.h" +#include "MainWidget.h" #include "Skins/SnakeSkin.h" #include -#include #include #include #include @@ -52,8 +52,8 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_title("Snake"); window->resize(324, 345); - auto widget = window->set_main_widget(); - TRY(widget->load_from_gml(snake_gml)); + auto widget = TRY(Snake::MainWidget::try_create()); + window->set_main_widget(widget); auto& game = *widget->find_descendant_of_type_named("game"); game.set_focus(true);