File tree Expand file tree Collapse file tree 4 files changed +29
-9
lines changed
Userland/Games/GameOfLife Expand file tree Collapse file tree 4 files changed +29
-9
lines changed Original file line number Diff line number Diff line change @@ -4,18 +4,15 @@ serenity_component(
4
4
TARGETS GameOfLife
5
5
)
6
6
7
- stringify_gml (GameOfLife.gml GameOfLifeGML.h game_of_life_gml )
7
+ compile_gml (GameOfLife.gml GameOfLifeGML.cpp )
8
8
9
9
set (SOURCES
10
10
main.cpp
11
11
Board.cpp
12
12
BoardWidget.cpp
13
+ GameOfLifeGML.cpp
13
14
Pattern.cpp
14
15
)
15
16
16
- set (GENERATED_SOURCES
17
- GameOfLifeGML.h
18
- )
19
-
20
17
serenity_app (GameOfLife ICON app-gameoflife )
21
18
target_link_libraries (GameOfLife PRIVATE LibCore LibGfx LibGUI LibMain LibDesktop )
Original file line number Diff line number Diff line change 1
- @GUI::Widget {
1
+ @GameOfLife::MainWidget {
2
2
layout: @GUI::VerticalBoxLayout {}
3
3
4
4
@GUI::ToolbarContainer {
Original file line number Diff line number Diff line change
1
+ /*
2
+ * Copyright (c) 2023, Tim Ledbetter <timledbetter@gmail.com>
3
+ *
4
+ * SPDX-License-Identifier: BSD-2-Clause
5
+ */
6
+
7
+ #pragma once
8
+
9
+ #include < LibGUI/Widget.h>
10
+
11
+ namespace GameOfLife {
12
+
13
+ class MainWidget : public GUI ::Widget {
14
+ C_OBJECT_ABSTRACT (MainWidget)
15
+ public:
16
+ static ErrorOr<NonnullRefPtr<MainWidget>> try_create ();
17
+ virtual ~MainWidget () override = default ;
18
+
19
+ private:
20
+ MainWidget () = default ;
21
+ };
22
+
23
+ }
Original file line number Diff line number Diff line change 6
6
*/
7
7
8
8
#include " BoardWidget.h"
9
+ #include " MainWidget.h"
9
10
#include < AK/Try.h>
10
11
#include < AK/URL.h>
11
- #include < Games/GameOfLife/GameOfLifeGML.h>
12
12
#include < LibCore/System.h>
13
13
#include < LibDesktop/Launcher.h>
14
14
#include < LibGUI/Application.h>
@@ -53,8 +53,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
53
53
window->set_double_buffering_enabled (false );
54
54
window->set_title (" Game of Life" );
55
55
56
- auto main_widget = window-> set_main_widget <GUI::Widget>( );
57
- TRY (main_widget-> load_from_gml (game_of_life_gml) );
56
+ auto main_widget = TRY ( GameOfLife::MainWidget::try_create () );
57
+ window-> set_main_widget (main_widget );
58
58
main_widget->set_fill_with_background_color (true );
59
59
60
60
auto & main_toolbar = *main_widget->find_descendant_of_type_named <GUI::Toolbar>(" toolbar" );
You can’t perform that action at this time.
0 commit comments