Add dynamic grid sizing

Author: timbot1789

.byebug_history

@@ -0,0 +1,44 @@
+quit
+c
+game.height
+game
+c
+game.height
+game
+quit
+game
+c
+n
+c
+n
+@game.width
+@game
+n
+where
+help
+?
+where
+whereami
+@game.width
+@game.height
+@game
+game.width
+game.height
+game
+c
+self.methods
+self.@game
+self.game
+self
+@game.width
+@game
+game.width
+game
+c
+n
+@game
+self
+settings[:settings].num_rows
+settings[:settings].methods
+settings[:settings]
+settings

Gemfile

@@ -11,3 +11,5 @@ group :development do
   gem 'juwelier', '2.4.9'
   gem 'simplecov', '>= 0'
 end
+
+gem "byebug", "~> 11.1"

Gemfile.lock

@@ -18,6 +18,7 @@ GEM
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
+    byebug (11.1.3)
     chunky_png (1.4.0)
     color (1.8)
     concurrent-ruby (1.3.3)
@@ -199,6 +200,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  byebug (~> 11.1)
   glimmer-dsl-libui (~> 0.11.4)
   juwelier (= 2.4.9)
   rspec (~> 3.5.0)

app/rubygo/model/game.rb

@@ -0,0 +1,15 @@
+class Rubygo
+  module Model
+    class Game 
+      
+      attr_accessor :height, :width, :scale, :name
+      
+      def initialize(height = 12, width = 12, scale = 70, name = "Go Game")
+        @height = height
+        @width = width
+        @scale = scale
+        @name = name
+      end
+    end
+  end
+end

app/rubygo/model/greeting.rb

@@ -1,5 +1,105 @@
-require 'rubygo/model/greeting'
-require 'rubygo/model/settings'
+class Rubygo
+  module Model
+    class Game 
+      
+      attr_accessor :height, :width, :scale, :name
+      
+      def initialize(height = 12, width = 12, scale = 70, name = "Go Game")
+        @height = height
+        @width = width
+        @scale = scale
+        @name = name
+      end
+    end
+  end
+end
+
+class Rubygo
+  module View
+    class GameBoard
+      include Glimmer::LibUI::CustomControl
+      option :game
+
+      body{
+        vertical_box {
+          padded false
+          game.height.times.map do |row|
+            horizontal_box {
+              padded false
+
+              game.width.times.map do |column|
+                half = game.scale / 2
+                area {
+                  square(0, 0, game.scale) {
+                    fill r: 240, g: 215, b: 141, a: 1.0
+                  }
+                  line(half,row == 0 ? half : 0, half, row == (game.height - 1)? half : game.scale) {
+                    stroke 0x000000
+                  } 
+                  line(column == 0 ? half : 0, half, column == (game.width - 1) ? half : game.scale, half){
+                    stroke 0x000000
+                  } 
+                }
+              end
+            }
+          end
+        }
+      }
+    end
+  end
+end
+
+class Rubygo
+  module View
+    class NewGameWindow
+      include Glimmer::LibUI::CustomWindow
+      option :on_create, default: lambda { |user| }
+      
+      before_body do
+        @game = Model::Game.new
+      end
+
+      body {
+        window { |new_game_window|
+          title "New Game"
+          margined true
+          vertical_box {
+            group("Game Size") {
+              vertical_box {
+                  horizontal_box {
+                    label('Board Width')
+                    spinbox(2, 20) {
+                      value <=> [@game, :width]
+                    }
+                  }
+                  horizontal_box {
+                    label('Board Height')
+                    spinbox(2, 20) {
+                      value <=> [@game, :height]
+                    }
+                  }
+              }
+            }
+            horizontal_box {
+              stretchy false
+              button("Cancel") {
+                on_clicked do
+                  new_game_window.destroy
+                end
+              }
+              button("New Game") {
+                on_clicked do
+                  on_create.call(@game)
+                  new_game_window.destroy
+                end
+              }
+            }
+          }
+        }
+      }
+    end
+  end
+end
 
 class Rubygo
   module View
@@ -12,19 +112,24 @@ class Rubygo
       # option :width, default: 320
       # option :height, default: 240
 
-      ## Use before_body block to pre-initialize variables to use in body and
+            ## Use before_body block to pre-initialize variables to use in body and
       #  to setup application menu
       #
       before_body do
-        @greeting = Model::Greeting.new
-        @settings = Model::Settings.new
+        @game = Model::Game.new
 
-        menu('File') {
-          menu_item('Preferences...') {
+        menu('Game') {
+          menu_item('New Game') {
             on_clicked do
-              display_preferences_dialog
+              on_create = lambda { |game| 
+                @game.height = game.height
+                @game.width = game.width
+              }
+              new_game_window(on_create: on_create).show
             end
           }
+          menu_item('Edit Current Game')
+          menu_item('Load Game')
 
           # Enables quitting with CMD+Q on Mac with Mac Quit menu item
           quit_menu_item if OS.mac?
@@ -46,51 +151,23 @@ class Rubygo
         }
       end
 
-      ## Use after_body block to setup observers for controls in body
-      #
-      # after_body do
-      #
-      # end
-
-      ## Add control content inside custom window body
-      ## Top-most control must be a window or another custom window
-      #
       body {
         window {
           # Replace example content below with your own custom window content
-          width <= [@settings, :num_cols, on_read: -> (num_cols) {num_cols * @settings.board_scale}] 
-          height <= [@settings, :num_rows, on_read: -> (num_rows){num_rows * @settings.board_scale}]
+          width <= [@game, :width, on_read: -> (width) {width * @game.scale}] 
+          height <= [@game, :height, on_read: -> (height) {height * @game.scale}]
           title 'Ruby Go'
           resizable false
 
           margined true
 
           label {
-            text <= [@greeting, :text]
+            text <= [@game, :name]
           }
           vertical_box {
-            padded false
-            @settings.num_rows.times.map do |row|
-              horizontal_box {
-                padded false
-
-                @settings.num_cols.times.map do |column|
-                  scale = @settings.board_scale
-                  half = scale / 2
-                  area {
-                    square(0, 0, scale) {
-                      fill r: 240, g: 215, b: 141, a: 1.0
-                    }
-                    line(half,row == 0 ? half : 0, half, row == (@settings.num_rows - 1)? half : scale) {
-                      stroke 0x000000
-                    } 
-                    line(column == 0 ? half : 0, half, column == (@settings.num_cols - 1) ? half : scale, half){
-                      stroke 0x000000
-                    } 
-                  }
-                end
-              }
-            end
+            content(@game, :width) {
+              game_board(game: @game)
+            }
           }
         }
       }
@@ -100,28 +177,7 @@ def display_about_dialog
         msg_box('About', message)
       end
 
-      def display_preferences_dialog
-        window {
-          title 'Preferences'
-          content_size 200, 100
-
-          margined true
-
-          vertical_box {
-            padded true
-
-            label('Greeting:') {
-              stretchy false
-            }
-
-            radio_buttons {
-              stretchy false
-
-              items Model::Greeting::GREETINGS
-              selected <=> [@greeting, :text_index]
-            }
-          }
-        }.show
+      def display_new_game_dialog
       end
     end
   end