[gnome-nibbles/arnaudb/modernize-code: 25/58] Move a method.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-nibbles/arnaudb/modernize-code: 25/58] Move a method.
- Date: Wed, 10 Jun 2020 17:15:02 +0000 (UTC)
commit e82218c785378fca915bb4d8a959b12acbb2bb6a
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Wed May 27 15:41:49 2020 +0200
Move a method.
src/gnome-nibbles.vala | 35 -----------------------------------
src/nibbles-view.vala | 40 +++++++++++++++++++++++++++++++++++++---
2 files changed, 37 insertions(+), 38 deletions(-)
---
diff --git a/src/gnome-nibbles.vala b/src/gnome-nibbles.vala
index af9651a..3adc7f8 100644
--- a/src/gnome-nibbles.vala
+++ b/src/gnome-nibbles.vala
@@ -236,7 +236,6 @@ private class Nibbles : Gtk.Application
/* Create view */
view = new NibblesView (game);
- view.configure_event.connect (configure_event_cb);
view.is_muted = !settings.get_boolean ("sound");
view.show ();
@@ -352,40 +351,6 @@ private class Nibbles : Gtk.Application
return false;
}
- private bool configure_event_cb (Gdk.EventConfigure event)
- {
- int tile_size, ts_x, ts_y;
-
- /* Compute the new tile size based on the size of the
- * drawing area, rounded down.
- */
- ts_x = event.width / NibblesGame.WIDTH;
- ts_y = event.height / NibblesGame.HEIGHT;
- if (ts_x * NibblesGame.WIDTH > event.width)
- ts_x--;
- if (ts_y * NibblesGame.HEIGHT > event.height)
- ts_y--;
- tile_size = int.min (ts_x, ts_y);
-
- if (tile_size == 0 || game.tile_size == 0)
- return true;
-
- if (game.tile_size != tile_size)
- {
- view.get_stage ().set_size (tile_size * NibblesGame.WIDTH, tile_size * NibblesGame.HEIGHT);
-
- view.board_rescale (tile_size);
- view.boni_rescale (tile_size);
- view.warps_rescale (tile_size);
- foreach (var worm in game.worms)
- worm.rescaled (tile_size);
-
- game.tile_size = tile_size;
- }
-
- return false;
- }
-
private void start_game_cb ()
{
settings.set_boolean ("first-run", false);
diff --git a/src/nibbles-view.vala b/src/nibbles-view.vala
index b21662f..83a71e0 100644
--- a/src/nibbles-view.vala
+++ b/src/nibbles-view.vala
@@ -160,6 +160,40 @@ private class NibblesView : GtkClutter.Embed
load_pixmap ();
}
+ protected override bool configure_event (Gdk.EventConfigure event)
+ {
+ int tile_size, ts_x, ts_y;
+
+ /* Compute the new tile size based on the size of the
+ * drawing area, rounded down.
+ */
+ ts_x = event.width / NibblesGame.WIDTH;
+ ts_y = event.height / NibblesGame.HEIGHT;
+ if (ts_x * NibblesGame.WIDTH > event.width)
+ ts_x--;
+ if (ts_y * NibblesGame.HEIGHT > event.height)
+ ts_y--;
+ tile_size = int.min (ts_x, ts_y);
+
+ if (tile_size == 0 || game.tile_size == 0)
+ return true;
+
+ if (game.tile_size != tile_size)
+ {
+ get_stage ().set_size (tile_size * NibblesGame.WIDTH, tile_size * NibblesGame.HEIGHT);
+
+ board_rescale (tile_size);
+ boni_rescale (tile_size);
+ warps_rescale (tile_size);
+ foreach (var worm in game.worms)
+ worm.rescaled (tile_size);
+
+ game.tile_size = tile_size;
+ }
+
+ return false;
+ }
+
/*\
* * Level creationg and loading
\*/
@@ -497,7 +531,7 @@ private class NibblesView : GtkClutter.Embed
}
}
- internal void board_rescale (int tile_size)
+ private void board_rescale (int tile_size)
{
int board_width, board_height;
float x_pos, y_pos;
@@ -824,7 +858,7 @@ private class NibblesView : GtkClutter.Embed
}
}
- internal void boni_rescale (int tile_size)
+ private void boni_rescale (int tile_size)
{
foreach (var bonus in bonus_actors.keys)
{
@@ -861,7 +895,7 @@ private class NibblesView : GtkClutter.Embed
warp_actors.@set (warp, actor);
}
- internal void warps_rescale (int tile_size)
+ private void warps_rescale (int tile_size)
{
foreach (var warp in game.warp_manager.warps)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]