glimmer-dsl-swt 4.18.3.2 → 4.18.4.1

data/lib/glimmer/swt/widget_proxy.rb

@@ -77,7 +77,7 @@ module Glimmer
           composite.layout = GridLayout.new if composite.get_layout.nil?
         end,
         canvas: lambda do |canvas|
-          canvas.layout = nil unless canvas.get_layout.nil?
+          canvas.layout = nil if canvas.respond_to?('layout=') && !canvas.get_layout.nil?
         end,
         scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
@@ -165,6 +165,12 @@ module Glimmer
           DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
           @parent_proxy.post_initialize_child(self)
         end
+        @keyword = underscored_widget_name.to_s
+        if respond_to?(:on_widget_disposed)
+          on_widget_disposed {
+            clear_shapes
+          }
+        end
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -547,6 +553,10 @@ module Glimmer
         @swt_widget.dispose
       end
 
+      def disposed?
+        @swt_widget.isDisposed
+      end
+
       # TODO Consider renaming these methods as they are mainly used for data-binding
 
       def can_add_observer?(property_name)
@@ -663,7 +673,7 @@ module Glimmer
           can_handle_observation_request?(method) ||
           swt_widget.respond_to?(method, *args, &block)
       end
-
+      
       private
 
       def style(underscored_widget_name, styles)

data/lib/glimmer/ui/custom_widget.rb

@@ -163,8 +163,8 @@ module Glimmer
       attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
-        @parent = parent
-        @parent_proxy = @parent&.get_data('proxy')
+        @parent_proxy = @parent = parent
+        @parent_proxy = @parent&.get_data('proxy') if @parent.respond_to?(:get_data) && @parent.get_data('proxy')
         @swt_style = SWT::SWTProxy[*swt_constants]
         options ||= {}
         @options = self.class.options.merge(options)
@@ -249,6 +249,10 @@ module Glimmer
       def attribute_setter(attribute_name)
         "#{attribute_name}="
       end
+      
+      def disposed?
+        swt_widget.isDisposed
+      end
 
       def has_style?(style)
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]

data/samples/elaborate/meta_sample.rb

@@ -204,7 +204,7 @@ class MetaSampleApplication
     shell(:fill_screen) {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
-      image File.expand_path('../../icons/scaffold_app.png', __dir__)
+      image File.expand_path('meta_sample/meta_sample_logo.png', __dir__)
       
       sash_form {
         composite {
@@ -264,9 +264,12 @@ class MetaSampleApplication
           }
         }
             
-        @code_text = code_text {
+        @code_text = code_text(lines: {width: 2}) {
           text bind(SampleDirectory, 'selected_sample.code', read_only: true)
           editable bind(SampleDirectory, 'selected_sample.editable')
+          line_numbers {
+            background :white
+          }
         }
         
         weights 4, 11

data/samples/elaborate/tetris.rb

@@ -35,6 +35,7 @@ class Tetris
   FONT_NAME = 'Menlo'
   FONT_TITLE_HEIGHT = 32
   FONT_TITLE_STYLE = :bold
+  BEVEL_CONSTANT = 20
   
   option :playfield_width, default: Model::Game::PLAYFIELD_WIDTH
   option :playfield_height, default: Model::Game::PLAYFIELD_HEIGHT
@@ -55,6 +56,15 @@ class Tetris
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
           game.down!
+        when swt(:arrow_up)
+          case game.up_arrow_action
+          when :instant_down
+            game.down!(instant: true)
+          when :rotate_right
+            game.rotate!(:right)
+          when :rotate_left
+            game.rotate!(:left)
+          end
         when swt(:arrow_left), 'a'.bytes.first
           game.left!
         when swt(:arrow_right), 'd'.bytes.first
@@ -65,8 +75,6 @@ class Tetris
           elsif key_event.keyLocation == swt(:left) # left shift key
             game.rotate!(:left)
           end
-        when swt(:arrow_up)
-          game.rotate!(:right)
         when swt(:ctrl)
           game.rotate!(:left)
         end
@@ -76,6 +84,10 @@ class Tetris
       @about_observer = on_about {
         show_about_dialog
       }
+      
+      @quit_observer = on_quit {
+        exit(0)
+      }
     }
   }
   
@@ -87,6 +99,13 @@ class Tetris
         start_moving_tetrominos_down
       end
     end
+    @show_high_scores_observer = observe(@game, :show_high_scores) do |show_high_scores|
+      if show_high_scores
+        show_high_score_dialog
+      else
+        @high_score_dialog.close unless @high_score_dialog.nil? || @high_score_dialog.disposed? || !@high_score_dialog.visible?
+      end
+    end
     @game.start!
   }
   
@@ -99,10 +118,10 @@ class Tetris
         margin_height 0
         horizontal_spacing 0
       }
-
+      
       text 'Glimmer Tetris'
       minimum_size 475, 500
-      background :gray
+      image tetris_icon
 
       tetris_menu_bar(game: game)
 
@@ -118,6 +137,39 @@ class Tetris
     }
   }
   
+  def tetris_icon
+    icon_block_size = 64
+    icon_bevel_size = icon_block_size.to_f / 25.to_f
+    icon_bevel_pixel_size = 0.16*icon_block_size.to_f
+    icon_size = 8
+    icon_pixel_size = icon_block_size * icon_size
+    image(icon_pixel_size, icon_pixel_size) {
+      icon_size.times { |row|
+        icon_size.times { |column|
+          colored = row >= 1 && column.between?(1, 6)
+          color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
+          x = column * icon_block_size
+          y = row * icon_block_size
+          rectangle(x, y, icon_block_size, icon_block_size, fill: true) {
+            background color
+          }
+          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
+          }
+          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size, fill: true) {
+            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+          }
+          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
+          }
+          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+          }
+        }
+      }
+    }
+  end
+  
   def start_moving_tetrominos_down
     Thread.new do
       @mutex.synchronize do
@@ -147,10 +199,11 @@ class Tetris
   end
   
   def deregister_observers
-    @show_high_scores_observer.deregister
-    @game_over_observer.deregister
-    @keyboard_listener.deregister
+    @show_high_scores_observer&.deregister
+    @game_over_observer&.deregister
+    @keyboard_listener&.deregister
     @about_observer&.deregister
+    @quit_observer&.deregister
   end
 end
 

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

@@ -21,6 +21,7 @@
 
 require 'fileutils'
 require 'etc'
+require 'json'
 require 'glimmer/data_binding/observer'
 require 'glimmer/config'
 
@@ -38,7 +39,7 @@ class Tetris
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
       
       attr_reader :playfield_width, :playfield_height
-      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score, :show_high_scores, :up_arrow_action
       alias game_over? game_over
       alias paused? paused
       alias beeping? beeping
@@ -48,10 +49,12 @@ class Tetris
         @playfield_width = playfield_width
         @playfield_height = playfield_height
         @high_scores = []
+        @show_high_scores = false
         @beeping = true
+        @up_arrow_action = :rotate_left
         load_high_scores!
       end
-    
+      
       def configure_beeper(&beeper)
         @beeper = beeper
       end
@@ -61,6 +64,7 @@ class Tetris
       end
       
       def start!
+        self.show_high_scores = false
         self.paused = false
         self.level = 1
         self.score = 0
@@ -86,7 +90,7 @@ class Tetris
       
       def add_high_score!
         self.added_high_score = true
-        high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score))
+        high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score, lines, level))
       end
       
       def save_high_scores!
@@ -115,9 +119,9 @@ class Tetris
         File.join(tetris_dir, "high_scores.txt")
       end
       
-      def down!
+      def down!(instant: false)
         return unless game_in_progress?
-        current_tetromino.down!
+        current_tetromino.down!(instant: instant)
         game_over! if current_tetromino.row <= 0 && current_tetromino.stopped?
       end
       
@@ -202,6 +206,30 @@ class Tetris
         @beeper&.call if beeping
       end
       
+      def instant_down_on_up=(value)
+        self.up_arrow_action = :instant_down if value
+      end
+      
+      def instant_down_on_up
+        self.up_arrow_action == :instant_down
+      end
+      
+      def rotate_right_on_up=(value)
+        self.up_arrow_action = :rotate_right if value
+      end
+      
+      def rotate_right_on_up
+        self.up_arrow_action == :rotate_right
+      end
+      
+      def rotate_left_on_up=(value)
+        self.up_arrow_action = :rotate_left if value
+      end
+      
+      def rotate_left_on_up
+        self.up_arrow_action == :rotate_left
+      end
+      
       def reset_tetrominoes
         @tetrominoes = []
       end
@@ -247,12 +275,13 @@ class Tetris
             
       def playfield_remaining_heights(tetromino = nil)
         @playfield_width.times.map do |playfield_column|
+          bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)
           (playfield.each_with_index.detect do |row, playfield_row|
             !row[playfield_column].clear? &&
             (
               tetromino.nil? ||
-              (bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)).nil? ||
-              (playfield_row > tetromino.row + bottom_most_block[:row])
+              bottom_most_block.nil? ||
+              (playfield_row > tetromino.row + bottom_most_block[:row_index])
             )
           end || [nil, @playfield_height])[1]
         end.to_a

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

@@ -21,6 +21,19 @@
 
 class Tetris
   module Model
-    PastGame = Struct.new(:name, :score)
+    class PastGame
+      attr_accessor :name, :score, :lines, :level
+      
+      def initialize(name, score, lines, level)
+        @name = name
+        @score = score.to_i
+        @lines = lines.to_i
+        @level = level.to_i
+      end
+      
+      def to_a
+        [@name, @score, @lines, @level]
+      end
+    end
   end
 end

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

@@ -59,8 +59,14 @@ class Tetris
             table_column {
               text 'Score'
             }
+            table_column {
+              text 'Lines'
+            }
+            table_column {
+              text 'Level'
+            }
             
-            items bind(game, :high_scores), column_properties(:name, :score)
+            items bind(game, :high_scores, read_only_sort: true), column_properties(:name, :score, :lines, :level)
           }
           composite {
             row_layout :horizontal
@@ -77,31 +83,42 @@ class Tetris
               focus true # initial focus
               
               on_widget_selected {
-                close
+                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
                 },
-                after_cancel: -> {
-                  @play_close_button.set_focus
-                },
               )
             end
           }
           
           on_shell_closed {
-            @high_score_table.cancel_edit!
+            # 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 {