[gnome-tetravex] Improve code.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-tetravex] Improve code.
- Date: Sat, 28 Sep 2019 22:20:42 +0000 (UTC)
commit 140d81865efd000446ffabfc7444d5c5c4eb45dc
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Sun Sep 29 00:20:30 2019 +0200
Improve code.
src/gnome-tetravex.vala | 4 ++--
src/puzzle-view.vala | 23 ++++++++++++-----------
2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/src/gnome-tetravex.vala b/src/gnome-tetravex.vala
index 34e21e5..fd4176a 100644
--- a/src/gnome-tetravex.vala
+++ b/src/gnome-tetravex.vala
@@ -449,8 +449,8 @@ private class Tetravex : Gtk.Application
scores_dialog_visible = true;
ScoreDialog dialog = new ScoreDialog (history, puzzle.size, selected_entry, show_quit);
- dialog.modal = true;
- dialog.transient_for = window;
+ dialog.set_modal (true);
+ dialog.set_transient_for (window);
int result = dialog.run ();
dialog.destroy ();
diff --git a/src/puzzle-view.vala b/src/puzzle-view.vala
index 26979b3..7514207 100644
--- a/src/puzzle-view.vala
+++ b/src/puzzle-view.vala
@@ -52,24 +52,25 @@ private class PuzzleView : Gtk.DrawingArea
private const double half_animation_duration = 0.15;
/* Puzzle being rendered */
- private Puzzle? _puzzle = null;
- [CCode (notify = false)] private bool puzzle_init_done { get { return _puzzle != null; }}
+ private Puzzle _puzzle;
+ private bool puzzle_init_done = false;
[CCode (notify = false)] internal Puzzle puzzle
{
- private get { if (!puzzle_init_done) assert_not_reached (); return (!) _puzzle; }
+ private get { if (!puzzle_init_done) assert_not_reached (); return _puzzle; }
internal set
{
if (puzzle_init_done)
- SignalHandler.disconnect_by_func ((!) _puzzle, null, this);
+ SignalHandler.disconnect_by_func (_puzzle, null, this);
_puzzle = value;
+ puzzle_init_done = true;
last_selected_tile = null;
tiles.remove_all ();
- for (uint8 y = 0; y < ((!) _puzzle).size; y++)
+ for (uint8 y = 0; y < _puzzle.size; y++)
{
- for (uint8 x = 0; x < ((!) _puzzle).size * 2; x++)
+ for (uint8 x = 0; x < _puzzle.size * 2; x++)
{
- Tile? tile = ((!) _puzzle).get_tile (x, y);
+ Tile? tile = _puzzle.get_tile (x, y);
if (tile == null)
continue;
@@ -78,11 +79,11 @@ private class PuzzleView : Gtk.DrawingArea
tiles.insert ((!) tile, image);
}
}
- sockets_xs = new double [2 * ((!) _puzzle).size, ((!) _puzzle).size];
- sockets_ys = new double [2 * ((!) _puzzle).size, ((!) _puzzle).size];
+ sockets_xs = new double [2 * _puzzle.size, _puzzle.size];
+ sockets_ys = new double [2 * _puzzle.size, _puzzle.size];
- ((!) _puzzle).tile_moved.connect (tile_moved_cb);
- ((!) _puzzle).notify ["paused"].connect (() => { queue_draw (); });
+ _puzzle.tile_moved.connect (tile_moved_cb);
+ _puzzle.notify ["paused"].connect (queue_draw);
queue_resize ();
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]