glimmer-dsl-swt 4.18.3.0 → 4.18.3.1

data/samples/elaborate/tetris/model/tetromino.rb

@@ -38,31 +38,32 @@ class Tetris
         Z: :red,
       }
       
-      attr_reader :letter, :preview
+      attr_reader :game, :letter, :preview
       alias preview? preview
       attr_accessor :orientation, :blocks, :row, :column
       
-      def initialize
+      def initialize(game)
+        @game = game
         @letter = LETTER_COLORS.keys.sample
         @orientation = :north
         @blocks = default_blocks
         @preview = true
         new_row = 0
-        new_column = (PREVIEW_PLAYFIELD_WIDTH - width)/2
+        new_column = (Model::Game::PREVIEW_PLAYFIELD_WIDTH - width)/2
         update_playfield(new_row, new_column)
       end
       
       def playfield
-        @preview ? Game.preview_playfield : Game.playfield
+        @preview ? game.preview_playfield : game.playfield
       end
       
       def launch!
         remove_from_playfield
         @preview = false
         new_row = 1 - height
-        new_column = (PLAYFIELD_WIDTH - width)/2
+        new_column = (game.playfield_width - width)/2
         update_playfield(new_row, new_column)
-        Game.tetrominoes << self
+        game.tetrominoes << self
       end
       
       def update_playfield(new_row = nil, new_column = nil)
@@ -89,16 +90,16 @@ class Tetris
       
       def stopped?
         return true if @stopped || @preview
-        playfield_remaining_heights = Game.playfield_remaining_heights(self)
+        playfield_remaining_heights = game.playfield_remaining_heights(self)
         result = bottom_most_blocks.any? do |bottom_most_block|
           playfield_column = @column + bottom_most_block[:column_index]
             playfield_remaining_heights[playfield_column] &&
             @row + bottom_most_block[:row] >= playfield_remaining_heights[playfield_column] - 1
         end
-        if result && !Game.hypothetical?
+        if result && !game.hypothetical?
           @stopped = result
-          Game.consider_eliminating_lines
-          Model::Game.consider_adding_tetromino
+          game.consider_eliminating_lines
+          @game.consider_adding_tetromino
         end
         result
       end
@@ -124,9 +125,10 @@ class Tetris
       end
       
       def right_blocked?
-        (@column == PLAYFIELD_WIDTH - width) ||
+        (@column == game.playfield_width - width) ||
           right_most_blocks.any? { |right_most_block|
-            playfield[@row + right_most_block[:row_index]][@column + right_most_block[:column_index] + 1].occupied?
+            (@row + right_most_block[:row_index]) >= 0 &&
+              playfield[@row + right_most_block[:row_index]][@column + right_most_block[:column_index] + 1].occupied?
           }
       end
       
@@ -150,7 +152,8 @@ class Tetris
       def left_blocked?
         (@column == 0) ||
           left_most_blocks.any? { |left_most_block|
-            playfield[@row + left_most_block[:row_index]][@column + left_most_block[:column_index] - 1].occupied?
+            (@row + left_most_block[:row_index]) >= 0 &&
+              playfield[@row + left_most_block[:row_index]][@column + left_most_block[:column_index] - 1].occupied?
           }
       end
 
@@ -179,7 +182,7 @@ class Tetris
         @blocks.size
       end
       
-      def down
+      def down!
         launch! if preview?
         unless stopped?
           new_row = @row + 1
@@ -187,14 +190,14 @@ class Tetris
         end
       end
       
-      def left
+      def left!
         unless left_blocked?
           new_column = @column - 1
           update_playfield(@row, new_column)
         end
       end
       
-      def right
+      def right!
         unless right_blocked?
           new_column = @column + 1
           update_playfield(@row, new_column)
@@ -202,11 +205,11 @@ class Tetris
       end
       
       # Rotate in specified direcation, which can be :right (clockwise) or :left (counterclockwise)
-      def rotate(direction)
+      def rotate!(direction)
         return if stopped?
         can_rotate = nil
         new_blocks = nil
-        Game.hypothetical do
+        game.hypothetical do
           hypothetical_rotated_tetromino = hypothetical_tetromino
           new_blocks = hypothetical_rotated_tetromino.rotate_blocks(direction)
           can_rotate = !hypothetical_rotated_tetromino.stopped? && !hypothetical_rotated_tetromino.right_blocked? && !hypothetical_rotated_tetromino.left_blocked?
@@ -222,13 +225,13 @@ class Tetris
       end
       
       def rotate_blocks(direction)
-          new_blocks = Matrix[*@blocks].transpose.to_a
-          if direction == :right
-            new_blocks = new_blocks.map(&:reverse)
-          else
-            new_blocks = new_blocks.reverse
-          end
-          Matrix[*new_blocks].to_a
+        new_blocks = Matrix[*@blocks].transpose.to_a
+        if direction == :right
+          new_blocks = new_blocks.map(&:reverse)
+        else
+          new_blocks = new_blocks.reverse
+        end
+        Matrix[*new_blocks].to_a
       end
       
       def hypothetical_tetromino

data/samples/elaborate/tetris/view/game_over_dialog.rb

@@ -19,12 +19,20 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require_relative 'tetris_menu_bar'
+
 class Tetris
   module View
     class GameOverDialog
       include Glimmer::UI::CustomShell
   
-      options :parent_shell
+      options :parent_shell, :game
+      
+      after_body {
+        observe(game, :game_over) do |game_over|
+          hide if !game_over
+        end
+      }
       
       body {
         dialog(parent_shell) {
@@ -34,6 +42,8 @@ class Tetris
           }
           text 'Tetris'
           
+          tetris_menu_bar(game: game)
+          
           label(:center) {
             text 'Game Over!'
             font name: 'Menlo', height: 30, style: :bold
@@ -43,30 +53,16 @@ class Tetris
             text 'Play Again?'
             
             on_widget_selected {
-              Model::Game.restart
-              
-              body_root.close
+              hide
+              game.restart!
             }
           }
           
           on_shell_activated {
-            Model::Game.game_over = true
             display.beep
           }
-          
-          on_shell_closed {
-            exit_game
-          }
-          
-          on_key_pressed { |event|
-            exit_game if event.keyCode == swt(:cr)
-          }
         }
       }
-      
-      def exit_game
-        display.dispose if Model::Game.game_over?
-      end
     end
   end
 end

data/samples/elaborate/tetris/view/score_lane.rb

@@ -27,7 +27,7 @@ class Tetris
     class ScoreLane
       include Glimmer::UI::CustomWidget
   
-      options :block_size
+      options :block_size, :game
       
       before_body {
         @font_name = 'Menlo'
@@ -48,14 +48,14 @@ class Tetris
             text 'Next'
             font name: @font_name, height: @font_height, style: :bold
           }
-          playfield(game_playfield: Model::Game.preview_playfield, playfield_width: PREVIEW_PLAYFIELD_WIDTH, playfield_height: PREVIEW_PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+          playfield(game_playfield: game.preview_playfield, playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: block_size)
 
           label(:center) {
             text 'Score'
             font name: @font_name, height: @font_height, style: :bold
           }
           label(:center) {
-            text bind(Model::Game, :score)
+            text bind(game, :score)
             font height: @font_height
           }
           
@@ -66,7 +66,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: :bold
           }
           label(:center) {
-            text bind(Model::Game, :lines)
+            text bind(game, :lines)
             font height: @font_height
           }
           
@@ -77,7 +77,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: :bold
           }
           label(:center) {
-            text bind(Model::Game, :level)
+            text bind(game, :level)
             font height: @font_height
           }
         }

data/samples/elaborate/tetris/view/tetris_menu_bar.rb

@@ -0,0 +1,72 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Tetris
+  module View
+    class TetrisMenuBar
+      include Glimmer::UI::CustomWidget
+  
+      options :game
+      
+      body {
+        menu_bar {
+          menu {
+            text '&Game'
+            
+            menu_item {
+              text '&Start'
+              enabled bind(game, :game_over)
+              accelerator :command, :s
+              
+              on_widget_selected {
+                game.start!
+              }
+            }
+            menu_item(:check) {
+              text '&Pause'
+              accelerator :command, :p
+              enabled bind(game, :game_over, on_read: :!)
+              selection bind(game, :paused)
+            }
+            menu_item {
+              text '&Restart'
+              accelerator :command, :r
+              enabled bind(game, :game_over, on_read: :!)
+              
+              on_widget_selected {
+                game.restart!
+              }
+            }
+            menu_item(:separator)
+            menu_item {
+              text '&Exit'
+              accelerator :command, :x
+              
+              on_widget_selected {
+                parent_proxy.close
+              }
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/tic_tac_toe.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2021 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -28,7 +28,7 @@ class TicTacToe
     @tic_tac_toe_board = Board.new
     @shell = shell {
       text "Tic-Tac-Toe"
-      minimum_size 150, 178
+      minimum_size 176, 200
       composite {
         grid_layout 3, true
         (1..3).each { |row|

data/samples/hello/hello_canvas_transform.rb

@@ -6,7 +6,7 @@ shell {
   text 'Hello, Canvas Transform!'
   minimum_size 330, 352
   
-  canvas { |canvas_proxy|
+  canvas {
     background :white
 
     image(glimmer_logo, 0, 0) {

data/samples/hello/hello_link.rb

@@ -49,7 +49,7 @@ shell { |main_shell|
     }
     on_mouse_up { |mouse_event|
       unless @selected_link.nil?
-        @help_shell.close unless @help_shell.nil? || @help_shell.is_disposed
+        @help_shell.close unless @help_shell.nil? || @help_shell.disposed?
         @help_shell = shell(:no_trim) {
           grid_layout {
             margin_width 10

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.3.0
+  version: 4.18.3.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.11
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -476,6 +476,7 @@ files:
 - samples/elaborate/tetris/view/game_over_dialog.rb
 - samples/elaborate/tetris/view/playfield.rb
 - samples/elaborate/tetris/view/score_lane.rb
+- samples/elaborate/tetris/view/tetris_menu_bar.rb
 - samples/elaborate/tic_tac_toe.rb
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb