[gnome-taquin] Do not store New Game screen.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-taquin] Do not store New Game screen.
- Date: Mon, 30 Dec 2019 11:25:46 +0000 (UTC)
commit f909b4e0deda3c7b66a1c70f3494df5d94529a03
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Thu Dec 19 18:08:06 2019 +0100
Do not store New Game screen.
src/game-window.vala | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/game-window.vala b/src/game-window.vala
index e1428c4..4eaca16 100644
--- a/src/game-window.vala
+++ b/src/game-window.vala
@@ -36,12 +36,11 @@ private class GameWindow : BaseWindow, AdaptativeWidget
private GameHeaderBar headerbar;
private GameView game_view;
private GameActionBar actionbar;
- private Box new_game_screen;
- internal GameWindow (string? css_resource, string name, string about_action_label, bool start_now,
GameWindowFlags flags, Box _new_game_screen, Widget view_content, GLib.Menu? appearance_menu, Widget?
game_widget_1, Widget? game_widget_2, NightLightMonitor night_light_monitor)
+ internal GameWindow (string? css_resource, string name, string about_action_label, bool start_now,
GameWindowFlags flags, Box new_game_screen, Widget view_content, GLib.Menu? appearance_menu, Widget?
game_widget_1, Widget? game_widget_2, NightLightMonitor night_light_monitor)
{
GameHeaderBar _headerbar = new GameHeaderBar (name, about_action_label, flags, appearance_menu,
game_widget_1, night_light_monitor);
- GameView _game_view = new GameView (flags, _new_game_screen, view_content);
+ GameView _game_view = new GameView (flags, new_game_screen, view_content);
GameActionBar _actionbar = new GameActionBar (name, game_widget_2, /* show actionbar */ start_now);
Object (nta_headerbar : (NightTimeAwareHeaderBar) _headerbar,
@@ -54,10 +53,13 @@ private class GameWindow : BaseWindow, AdaptativeWidget
headerbar = _headerbar;
game_view = _game_view;
actionbar = _actionbar;
- new_game_screen = _new_game_screen;
add_to_main_grid (actionbar);
+ add_adaptative_child ((AdaptativeWidget) new_game_screen);
+ add_adaptative_child ((AdaptativeWidget) game_view);
+ add_adaptative_child ((AdaptativeWidget) actionbar);
+
/* CSS */
if (css_resource != null)
{
@@ -81,15 +83,6 @@ private class GameWindow : BaseWindow, AdaptativeWidget
show_new_game_screen ();
}
- protected override void set_window_size (AdaptativeWidget.WindowSize new_size)
- {
- base.set_window_size (new_size);
-
- ((AdaptativeWidget) new_game_screen).set_window_size (new_size);
- ((AdaptativeWidget) game_view).set_window_size (new_size);
- ((AdaptativeWidget) actionbar).set_window_size (new_size);
- }
-
/*\
* * some public calls
\*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]