[four-in-a-row/arnaudb/wip/gtk4: 88/92] Fix stack switching.

[Arnaud B. <arnaudb src gnome org>]

commit 1cac26dc6d9ba8059db5b5f32bdc182f8824c968
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Tue Apr 28 13:50:18 2020 +0200

    Fix stack switching.

 data/ui/four-in-a-row.ui | 12 ++++++++----
 src/game-window.vala     |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/data/ui/four-in-a-row.ui b/data/ui/four-in-a-row.ui
index b5d9c3c..27a0bb0 100644
--- a/data/ui/four-in-a-row.ui
+++ b/data/ui/four-in-a-row.ui
@@ -68,11 +68,15 @@
               <object class="GtkStackPage">
                 <property name="name">game-box</property>
                 <property name="child">
-                  <object class="GtkBox" id="game_box">
+                  <object class="GtkBox" id="game_box_1">
                     <property name="orientation">vertical</property>
-                    <style>
-                      <class name="game-box"/>
-                    </style>
+                    <child>
+                      <object class="GtkBox" id="game_box_2">
+                        <style>
+                          <class name="game-box"/>
+                        </style>
+                      </object>
+                    </child>
                   </object>
                 </property>
               </object>
diff --git a/src/game-window.vala b/src/game-window.vala
index 114aa21..3c699f2 100644
--- a/src/game-window.vala
+++ b/src/game-window.vala
@@ -45,7 +45,8 @@ private class GameWindow : AdaptativeWindow, AdaptativeWidget
     [GtkChild] private Button back_button;
     [GtkChild] private Button unfullscreen_button;
 
-    [GtkChild] private Box game_box;
+    [GtkChild] private Box game_box_1;
+    [GtkChild] private Box game_box_2;
     [GtkChild] private Box new_game_box;
 
     private Widget view;
@@ -98,7 +99,7 @@ private class GameWindow : AdaptativeWindow, AdaptativeWidget
         overlay.add_overlay (actionbar);
 
         GameActionBarPlaceHolder actionbar_placeholder = new GameActionBarPlaceHolder (actionbar);
-        actionbar_placeholder.insert_after (game_box, /* insert first */ null);
+        actionbar_placeholder.insert_after (game_box_1, game_box_2);
 
         new_game_screen.hexpand = true;
         new_game_screen.vexpand = true;
@@ -125,8 +126,7 @@ private class GameWindow : AdaptativeWindow, AdaptativeWidget
 
         view.hexpand = true;
         view.vexpand = true;
-        view.insert_before (game_box, actionbar_placeholder);
-        game_box.set_focus_child (view);            // TODO test if necessary; note: view could grab focus 
from application
+        view.insert_after (game_box_2, /* insert first */ null);
         view.halign = Align.FILL;
         view.can_focus = true;