glimmer-dsl-swt 4.18.3.3 → 4.18.4.2

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)

data/samples/elaborate/meta_sample.rb

@@ -20,7 +20,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'fileutils'
-require 'etc'
 
 class Sample
   include Glimmer::DataBinding::ObservableModel
@@ -31,7 +30,7 @@ class Sample
     end
   
     def user_glimmer_directory
-      File.join(Etc.getpwuid.dir, '.glimmer-dsl-swt')
+      File.join(File.expand_path('~'), '.glimmer-dsl-swt')
     end
     
     def ensure_user_glimmer_directory
@@ -204,7 +203,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 +263,21 @@ class MetaSampleApplication
           }
         }
             
-        @code_text = code_text {
+        @code_text = code_text(lines: {width: 3}) {
+          root {
+            grid_layout(2, false) {
+              horizontal_spacing 0
+              margin_width 0
+              margin_height 0
+            }
+          }
+          line_numbers {
+            background :white
+          }
           text bind(SampleDirectory, 'selected_sample.code', read_only: true)
           editable bind(SampleDirectory, 'selected_sample.editable')
+          left_margin 7
+          right_margin 7
         }
         
         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
@@ -56,19 +57,24 @@ class Tetris
         when swt(:arrow_down), 's'.bytes.first
           game.down!
         when swt(:arrow_up)
-          game.down!(immediate: true)
+          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
           game.right!
-        when swt(:shift), swt(:alt)
+        when swt(:shift), swt(:alt), swt(:ctrl)
           if key_event.keyLocation == swt(:right) # right shift key
             game.rotate!(:right)
           elsif key_event.keyLocation == swt(:left) # left shift key
             game.rotate!(:left)
           end
-        when swt(:ctrl)
-          game.rotate!(:left)
         end
       }
       
@@ -110,10 +116,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)
 
@@ -129,6 +135,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

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

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'fileutils'
-require 'etc'
+require 'json'
 require 'glimmer/data_binding/observer'
 require 'glimmer/config'
 
@@ -38,7 +38,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, :show_high_scores
+      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
@@ -50,6 +50,7 @@ class Tetris
         @high_scores = []
         @show_high_scores = false
         @beeping = true
+        @up_arrow_action = :rotate_left
         load_high_scores!
       end
       
@@ -110,16 +111,16 @@ class Tetris
       end
       
       def tetris_dir
-        @tetris_dir ||= File.join(Etc.getpwuid.dir, '.glimmer-tetris')
+        @tetris_dir ||= File.join(File.expand_path('~'), '.glimmer-tetris')
       end
       
       def tetris_high_score_file
         File.join(tetris_dir, "high_scores.txt")
       end
       
-      def down!(immediate: false)
+      def down!(instant: false)
         return unless game_in_progress?
-        current_tetromino.down!(immediate: immediate)
+        current_tetromino.down!(instant: instant)
         game_over! if current_tetromino.row <= 0 && current_tetromino.stopped?
       end
       
@@ -204,6 +205,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

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

@@ -21,6 +21,19 @@
 
 class Tetris
   module Model
-    PastGame = Struct.new(:name, :score, :lines, :level)
+    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

@@ -182,11 +182,11 @@ class Tetris
         @blocks.size
       end
       
-      def down!(immediate: false)
+      def down!(instant: false)
         launch! if preview?
         unless stopped?
           block_count = 1
-          if immediate
+          if instant
             remaining_height, bottom_touching_block = remaining_height_and_bottom_touching_block
             block_count = remaining_height - @row
           end

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

@@ -71,13 +71,6 @@ class Tetris
           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
@@ -99,13 +92,11 @@ class Tetris
               @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
           }

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/tetris_menu_bar.rb

@@ -94,6 +94,24 @@ class Tetris
               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 {

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
         }
       }