[five-or-more/arnaudb/code-improvements: 3/10] Clean window init.
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [five-or-more/arnaudb/code-improvements: 3/10] Clean window init.
- Date: Sat, 9 May 2020 16:13:03 +0000 (UTC)
commit aa08107417749ff337a1bc72d58149951ead480f
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Fri May 8 21:22:31 2020 +0200
Clean window init.
src/main.vala | 3 ++-
src/window.vala | 14 ++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/main.vala b/src/main.vala
index 2a9019e..41a2b3d 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -70,7 +70,8 @@ private class FiveOrMoreApp: Gtk.Application
base.startup ();
settings = new Settings ("org.gnome.five-or-more");
- window = new GameWindow (this, settings);
+ window = new GameWindow (settings);
+ add_window (window);
add_action_entries (action_entries, this);
set_accels_for_action ("win.new-game", { "<Primary>n" });
diff --git a/src/window.vala b/src/window.vala
index eac7a33..6f4a816 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -35,7 +35,7 @@ private class GameWindow : ApplicationWindow
[GtkChild]
private Games.GridFrame grid_frame;
- private GLib.Settings? settings = null;
+ public GLib.Settings settings { private get; protected construct; }
private bool window_tiled;
internal bool window_maximized { internal get; private set; }
internal int window_width { internal get; private set; }
@@ -74,13 +74,6 @@ private class GameWindow : ApplicationWindow
construct
{
add_action_entries (win_actions, this);
- }
-
- internal GameWindow (Gtk.Application app, GLib.Settings settings)
- {
- Object (application: app);
-
- this.settings = settings;
var board_size_action = lookup_action ("change-size");
string board_size_string;
@@ -129,6 +122,11 @@ private class GameWindow : ApplicationWindow
game.game_over.connect (score_cb);
}
+ internal GameWindow (GLib.Settings settings)
+ {
+ Object (settings: settings);
+ }
+
protected override bool window_state_event (Gdk.EventWindowState event)
{
if ((event.changed_mask & Gdk.WindowState.MAXIMIZED) != 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]