glimmer-dsl-swt 4.18.3.1 → 4.18.4.0

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

@@ -93,8 +93,8 @@ class Tetris
         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
+          playfield_remaining_heights[playfield_column] &&
+            @row + bottom_most_block[:row_index] >= playfield_remaining_heights[playfield_column] - 1
         end
         if result && !game.hypothetical?
           @stopped = result
@@ -114,7 +114,7 @@ class Tetris
           bottom_most_block_row = row_blocks_with_row_index[1]
           {
             block: bottom_most_block,
-            row: bottom_most_block_row,
+            row_index: bottom_most_block_row,
             column_index: column_index
           }
         end
@@ -182,10 +182,15 @@ class Tetris
         @blocks.size
       end
       
-      def down!
+      def down!(instant: false)
         launch! if preview?
         unless stopped?
-          new_row = @row + 1
+          block_count = 1
+          if instant
+            remaining_height, bottom_touching_block = remaining_height_and_bottom_touching_block
+            block_count = remaining_height - @row
+          end
+          new_row = @row + block_count
           update_playfield(new_row, @column)
         end
       end
@@ -245,6 +250,14 @@ class Tetris
         end
       end
       
+      def remaining_height_and_bottom_touching_block
+        playfield_remaining_heights = game.playfield_remaining_heights(self)
+        bottom_most_blocks.map do |bottom_most_block|
+          playfield_column = @column + bottom_most_block[:column_index]
+          [playfield_remaining_heights[playfield_column] - (bottom_most_block[:row_index] + 1), bottom_most_block]
+        end.min_by(&:first)
+      end
+      
       def default_blocks
         case @letter
         when :I

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

@@ -26,36 +26,31 @@ class Tetris
   
       options :game_playfield, :block_size, :row, :column
   
-      before_body {
-        @bevel_constant = 20
-      }
-  
       body {
         canvas {
-          layout nil
           background bind(game_playfield[row][column], :color)
-          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4, fill: true) {
+          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red + 4*@bevel_constant, color.green + 4*@bevel_constant, color.blue + 4*@bevel_constant)
+              rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
             }
           }
-          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size, fill: true) {
+          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
             }
           }
-          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4, fill: true) {
+          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red - 2*@bevel_constant, color.green - 2*@bevel_constant, color.blue - 2*@bevel_constant)
+              rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
             }
           }
-          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4, fill: true) {
+          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
             }
           }
           rectangle(0, 0, block_size, block_size) {

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

@@ -0,0 +1,131 @@
+# 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.
+
+require_relative 'tetris_menu_bar'
+
+class Tetris
+  module View
+    class HighScoreDialog
+      include Glimmer::UI::CustomShell
+  
+      options :parent_shell, :game
+      
+      after_body {
+        @game_over_observer = observe(game, :game_over) do |game_over|
+          close if !game_over
+        end
+      }
+      
+      body {
+        dialog(parent_shell) {
+          row_layout {
+            type :vertical
+            center true
+          }
+          text 'Tetris'
+          
+          tetris_menu_bar(game: game)
+          
+          label(:center) {
+            text bind(game, :game_over) {|game_over| game_over ? 'Game Over!' : 'High Scores'}
+            font name: FONT_NAME, height: FONT_TITLE_HEIGHT, style: FONT_TITLE_STYLE
+          }
+          @high_score_table = table {
+            layout_data {
+              height 100
+            }
+            
+            table_column {
+              text 'Name'
+            }
+            table_column {
+              text 'Score'
+            }
+            table_column {
+              text 'Lines'
+            }
+            table_column {
+              text 'Level'
+            }
+            
+            items bind(game, :high_scores, read_only_sort: true), column_properties(:name, :score, :lines, :level)
+          }
+          composite {
+            row_layout :horizontal
+                        
+            button {
+              text 'Clear'
+              
+              on_widget_selected {
+                game.clear_high_scores!
+              }
+            }
+            @play_close_button = button {
+              text bind(game, :game_over) {|game_over| game_over ? 'Play Again?' : 'Close'}
+              focus true # initial focus
+              
+              on_widget_selected {
+                async_exec { close }
+                game.paused = @game_paused
+                game.restart! if game.game_over?
+              }
+            }
+          }
+          
+          on_swt_show {
+            @game_paused = game.paused?
+            game.paused = true
+            if game.game_over? && game.added_high_score?
+              game.added_high_score = false
+              game.save_high_scores!
+              @high_score_table.edit_table_item(
+                @high_score_table.items.first, # row item
+                0, # column
+                write_on_cancel: true,
+                after_write: -> {
+                  game.save_high_scores!
+                  @play_close_button.set_focus
+                },
+              )
+            end
+          }
+          
+          on_shell_closed {
+            # guard is needed because there is an observer in Tetris closing on
+            # game.show_high_scores change, which gets set below
+            unless @closing
+              @closing = true
+              @high_score_table.cancel_edit!
+              game.paused = @game_paused
+              game.show_high_scores = false
+            else
+              @closing = false
+            end
+          }
+          
+          on_widget_disposed {
+            @game_over_observer.deregister
+          }
+        }
+      }
+    end
+  end
+end

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

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        canvas {
+        composite {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

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

@@ -30,8 +30,8 @@ class Tetris
       options :block_size, :game
       
       before_body {
-        @font_name = 'Menlo'
-        @font_height = 32
+        @font_name = FONT_NAME
+        @font_height = FONT_TITLE_HEIGHT
       }
   
       body {
@@ -46,13 +46,13 @@ class Tetris
           }
           label(:center) {
             text 'Next'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           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
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
             text bind(game, :score)
@@ -63,7 +63,7 @@ class Tetris
           
           label(:center) {
             text 'Lines'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
             text bind(game, :lines)
@@ -74,7 +74,7 @@ class Tetris
           
           label(:center) {
             text 'Level'
-            font name: @font_name, height: @font_height, style: :bold
+            font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
             text bind(game, :level)

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

@@ -43,13 +43,13 @@ class Tetris
             menu_item(:check) {
               text '&Pause'
               accelerator :command, :p
-              enabled bind(game, :game_over, on_read: :!)
+              enabled bind(game, :game_over, on_read: :!) {|value| value && !game.show_high_scores}
+              enabled bind(game, :show_high_scores, on_read: :!) {|value| value && !game.game_over}
               selection bind(game, :paused)
             }
             menu_item {
               text '&Restart'
               accelerator :command, :r
-              enabled bind(game, :game_over, on_read: :!)
               
               on_widget_selected {
                 game.restart!
@@ -64,9 +64,76 @@ class Tetris
                 parent_proxy.close
               }
             }
-          }
+          } # end of menu
+          
+          menu {
+            text '&View'
+            
+            menu {
+              text '&High Scores'
+              menu_item(:check) {
+                text '&Show'
+                accelerator :command, :shift, :h
+                selection bind(game, :show_high_scores)
+              }
+              menu_item {
+                text '&Clear'
+                accelerator :command, :shift, :c
+                
+                on_widget_selected {
+                  game.clear_high_scores!
+                }
+              }
+            }
+          } # end of menu
+          
+          menu {
+            text '&Options'
+            menu_item(:check) {
+              text '&Beeping'
+              accelerator :command, :b
+              selection bind(game, :beeping)
+            }
+            menu {
+              text 'Up Arrow'
+              menu_item(:radio) {
+                text '&Instant Down'
+                accelerator :command, :shift, :i
+                selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
+              }
+              menu_item(:radio) {
+                text 'Rotate &Right'
+                accelerator :command, :shift, :r
+                selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
+              }
+              menu_item(:radio) {
+                text 'Rotate &Left'
+                accelerator :command, :shift, :l
+                selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
+              }
+            }
+          } # end of menu
+          
+          menu {
+            text '&Help'
+            
+            menu_item {
+              text '&About'
+              accelerator :command, :shift, :a
+              
+              on_widget_selected {
+                parent_custom_shell&.show_about_dialog
+              }
+            }
+          } # end of menu
         }
       }
+      
+      def parent_custom_shell
+        # grab custom shell widget wrapping parent widget proxy (i.e. Tetris) and invoke method on it
+        the_parent_custom_shell = parent_proxy&.get_data('custom_shell')
+        the_parent_custom_shell if the_parent_custom_shell&.visible?
+      end
     end
   end
 end

data/samples/hello/hello_canvas.rb

@@ -22,22 +22,22 @@
 include Glimmer
 
 shell {
-  text 'Hello, Canvas!'
+  text 'Hello, Canvas Image Icon!'
   minimum_size 320, 400
 
   canvas {
     background :yellow
-    rectangle(0, 0, 220, 400, fill: true) {
+    rectangle(0, 0, 220, 400) {
       background :red
     }
-    rectangle(50, 20, 300, 150, 30, 50, round: true, fill: true) {
+    rectangle(50, 20, 300, 150, 30, 50) {
       background :magenta
     }
-    rectangle(150, 200, 100, 70, true, gradient: true) {
+    rectangle(150, 200, 100, 70, true) {
       background :dark_magenta
       foreground :yellow
     }
-    rectangle(50, 200, 30, 70, false, gradient: true) {
+    rectangle(50, 200, 30, 70, false) {
       background :magenta
       foreground :dark_blue
     }
@@ -49,13 +49,14 @@ shell {
       foreground :dark_magenta
       font name: 'Courier', height: 30
     }
-    oval(110, 310, 100, 100, fill: true) {
-      background rgb(128, 138, 248)
+    oval(110, 310, 100, 100) {
+      # patterns provide a differnet way to make gradients
+      background_pattern 0, 0, 105, 0, :yellow, rgb(128, 138, 248)
     }
-    arc(210, 210, 100, 100, 30, -77, fill: true) {
+    arc(210, 210, 100, 100, 30, -77) {
       background :red
     }
-    polygon(250, 210, 260, 170, 270, 210, 290, 230, fill: true) {
+    polygon(250, 210, 260, 170, 270, 210, 290, 230) {
       background :dark_yellow
     }
     polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)

data/samples/hello/hello_canvas_animation.rb

@@ -35,7 +35,7 @@ shell {
         oval(0, 0, 400, 400) { # x, y, width, height
           foreground :black # sets oval background color
         }
-        arc(0, 0, 400, 400, -1.4*index%360, 10, fill: true) {  # x, y, width, height, start angle, arc angle
+        arc(0, 0, 400, 400, -1.4*index%360, 10) {  # x, y, width, height, start angle, arc angle
           background rgb(200, 200, 50) # sets arc background color
         }
       }
@@ -51,13 +51,13 @@ shell {
       frame { |index, color| # frame block loops indefinitely (unless frame_count or cycle_count is set to an integer)
         outside_color = colors[index % 2]
         inside_color = colors[(index + 1) % 2]
-        
+
         background outside_color # sets canvas background color
-        
-        rectangle(0, 0, 200, 200, fill: true) {
+
+        rectangle(0, 0, 200, 200) {
           background inside_color # sets rectangle background color
         }
-        rectangle(200, 200, 200, 200, fill: true) {
+        rectangle(200, 200, 200, 200) {
           background inside_color # sets rectangle background color
         }
       }