[lightsoff/arnaudb/wip/gtk4: 15/28] Adapt old Container API, part 2.




commit facf4f407095c2601f0acf838dc69c6efa784c1b
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Fri Nov 27 16:33:37 2020 +0100

    Adapt old Container API, part 2.

 src/board-view-gtk.vala | 8 ++++++--
 src/game-view-gtk.vala  | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/board-view-gtk.vala b/src/board-view-gtk.vala
index 37c64b0..7614a71 100644
--- a/src/board-view-gtk.vala
+++ b/src/board-view-gtk.vala
@@ -57,7 +57,9 @@ private class BoardViewGtk : Grid, BoardView
     // Toggle a light and those in each cardinal direction around it.
     internal void toggle_light (int x, int y, bool clicked = true)
     {
-        @foreach((light) => ((ToggleButton)light).toggled.disconnect (handle_toggle));
+        for (uint8 i = 0; i < 5; i++)
+            for (uint8 j = 0; j < 5; j++)
+                lights [i, j].toggled.disconnect (handle_toggle);
 
         if (x>= size || y >= size || x < 0 || y < 0 )
             return;
@@ -73,7 +75,9 @@ private class BoardViewGtk : Grid, BoardView
         if (!clicked)
             lights[(int) x, (int) y].set_active (!lights[(int) x, (int) y ].get_active ());
 
-        @foreach((light) => ((ToggleButton)light).toggled.connect (handle_toggle));
+        for (uint8 i = 0; i < 5; i++)
+            for (uint8 j = 0; j < 5; j++)
+                lights [i, j].toggled.connect (handle_toggle);
     }
 
     internal void clear_level ()
diff --git a/src/game-view-gtk.vala b/src/game-view-gtk.vala
index 4fa161b..8359ed2 100644
--- a/src/game-view-gtk.vala
+++ b/src/game-view-gtk.vala
@@ -49,11 +49,11 @@ private class GtkGameView : Stack, GameView
 
     internal void board_replaced (BoardViewGtk old_board, BoardViewGtk new_board)
     {
-        @foreach((board) => { if (board != get_visible_child ()) remove(board);});
+        remove (old_board);
         new_board.sensitive = true;
         board_view = new_board;
         if (!handlers.is_empty ())
-            disconnect(handlers.pop_head());
+            disconnect (handlers.pop_head());
     }
 
     internal bool hide_cursor ()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]