glimmer-dsl-swt 4.18.4.2 → 4.18.4.7

data/lib/glimmer/swt/display_proxy.rb

@@ -81,15 +81,15 @@ module Glimmer
       end
       
       def async_exec(&block)
-        @swt_display.async_exec(&block)
+        @swt_display.asyncExec(&block)
       end
 
       def sync_exec(&block)
-        @swt_display.sync_exec(&block)
+        @swt_display.syncExec(&block)
       end
 
-      def timer_exec(&block)
-        @swt_display.timer_exec(&block)
+      def timer_exec(delay_in_millis, &block)
+        @swt_display.timerExec(delay_in_millis, &block)
       end
       
       def on_widget_disposed(&block)
@@ -137,12 +137,13 @@ module Glimmer
           add_swt_event_filter(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
-          if OBSERVED_MENU_ITEMS.include?(event_name)
-            if OS.mac?
-              system_menu = swt_display.getSystemMenu
-              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-              menu_item.addListener(SWTProxy[:Selection], &block)
-            end
+          if OBSERVED_MENU_ITEMS.include?(event_name) && OS.mac?
+            system_menu = swt_display.getSystemMenu
+            menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], &block)
+            # TODO enable this code and test on the Mac to ensure automatic cleanup of mac event registrations in custom widgets
+#             Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+            display_mac_event_registration
           end
         end
       end

data/lib/glimmer/swt/properties.rb

@@ -22,28 +22,53 @@
 module Glimmer
   module SWT
     module Properties
+      class << self
+        def ruby_attribute_setter(attribute_name)
+          @ruby_attribute_setters ||= {}
+          @ruby_attribute_setters[attribute_name] ||= "#{normalized_attribute(attribute_name)}="
+        end
+  
+        def attribute_setter(attribute_name)
+          @attribute_setters ||= {}
+          @attribute_setters[attribute_name] ||= "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
+        end
+  
+        def attribute_getter(attribute_name)
+          @attribute_getters ||= {}
+          @attribute_getters[attribute_name] ||= "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
+        end
+        
+        def normalized_attribute(attribute_name)
+          @normalized_attributes ||= {}
+          if @normalized_attributes[attribute_name].nil?
+            attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
+            attribute_name = attribute_name.underscore unless attribute_name.downcase?
+            attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
+            attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
+            attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
+            @normalized_attributes[attribute_name] = attribute_name
+          end
+          @normalized_attributes[attribute_name]
+        end
+        alias ruby_attribute_getter normalized_attribute
+      end
+      
       def ruby_attribute_setter(attribute_name)
-        "#{normalized_attribute(attribute_name)}="
+        Glimmer::SWT::Properties.ruby_attribute_setter(attribute_name)
       end
 
       def attribute_setter(attribute_name)
-        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
+        Glimmer::SWT::Properties.attribute_setter(attribute_name)
       end
 
       def attribute_getter(attribute_name)
-        "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
+        Glimmer::SWT::Properties.attribute_getter(attribute_name)
       end
       
       def normalized_attribute(attribute_name)
-        attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
-        attribute_name = attribute_name.underscore unless attribute_name.downcase?
-        attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
-        attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
-        attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
-        attribute_name
+        Glimmer::SWT::Properties.normalized_attribute(attribute_name)
       end
       alias ruby_attribute_getter normalized_attribute
-      
     end
   end
 end

data/lib/glimmer/swt/shell_proxy.rb

@@ -164,7 +164,7 @@ module Glimmer
           minimum_size = @swt_widget.getMinimumSize
           @swt_widget.setMinimumSize(bounds.width, bounds.height)
           listener = on_control_resized { @swt_widget.setBounds(bounds) }
-          @swt_widget.pack
+          @swt_widget.layout(true, true)
           @swt_widget.removeControlListener(listener.swt_listener)
           @swt_widget.setMinimumSize(minimum_size)
         elsif OS.linux?

data/lib/glimmer/swt/widget_proxy.rb

@@ -50,6 +50,7 @@ module Glimmer
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
         'button'              => [:push],
+        'canvas'              => [:double_buffered],
         'checkbox'            => [:check],
         'check'               => [:check],
         'drag_source'         => [:drop_copy],
@@ -136,7 +137,8 @@ module Glimmer
         end
       end
 
-      attr_reader :parent_proxy, :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
+      attr_reader :parent_proxy, :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer, :finished_add_content
+      alias finished_add_content? finished_add_content
       
       # Initializes a new SWT Widget
       #
@@ -169,6 +171,7 @@ module Glimmer
         if respond_to?(:on_widget_disposed)
           on_widget_disposed {
             clear_shapes
+            deregister_shape_painting
           }
         end
       end
@@ -178,11 +181,17 @@ module Glimmer
         # No Op by default
       end
 
-      # Subclasses may override to perform post add_content work
+      # Subclasses may override to perform post add_content work.
+      # Make sure its logic detects if it ran before since it could run multiple times
+      # when adding content multiple times post creation.
       def post_add_content
         # No Op by default
       end
-
+      
+      def finish_add_content!
+        @finished_add_content = true
+      end
+      
       def extract_args(underscored_widget_name, args)
         @arg_extractor_mapping ||= {
           'menu_item' => lambda do |args|
@@ -544,6 +553,10 @@ module Glimmer
         DisplayProxy.instance.sync_exec(&block)
       end
 
+      def timer_exec(delay_in_millis, &block)
+        DisplayProxy.instance.timer_exec(delay_in_millis, &block)
+      end
+
       def has_style?(style)
         comparison = interpret_style(style)
         (@swt_widget.style & comparison) == comparison

data/lib/glimmer/ui/custom_widget.rb

@@ -158,11 +158,17 @@ module Glimmer
         def after_body(&block)
           @after_body_block = block
         end
+
+        # Current custom widgets being rendered. Useful to yoke all observers evaluated during rendering of their custom widgets for automatical disposal on_widget_disposed
+        def current_custom_widgets
+          @current_custom_widgets ||= []
+        end
       end
 
       attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
+        Glimmer::UI::CustomWidget.current_custom_widgets << self
         @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]
@@ -177,6 +183,9 @@ module Glimmer
         @swt_widget = @body_root.swt_widget
         @swt_widget.set_data('custom_widget', self)
         execute_hook('after_body')
+        @dispose_listener_registration = @body_root.on_widget_disposed do
+          observer_registrations.each(&:deregister)
+        end
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -184,6 +193,10 @@ module Glimmer
         # No Op by default
       end
 
+      def observer_registrations
+        @observer_registrations ||= []
+      end
+
       def can_handle_observation_request?(observation_request)
         observation_request = observation_request.to_s
         result = false
@@ -273,6 +286,10 @@ module Glimmer
         SWT::DisplayProxy.instance.sync_exec(&block)
       end
 
+      def timer_exec(delay_in_millis, &block)
+        SWT::DisplayProxy.instance.timer_exec(delay_in_millis, &block)
+      end
+
       # Returns content block if used as an attribute reader (no args)
       # Otherwise, if a block is passed, it adds it as content to this custom widget
       def content(&block)

data/samples/elaborate/mandelbrot_fractal.rb

@@ -0,0 +1,103 @@
+# 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 'complex'
+require 'bigdecimal'
+require 'concurrent-ruby'
+
+# Mandelbrot implementation
+# Courtesy of open-source code at:
+# https://github.com/gotbadger/ruby-mandelbrot
+class Mandelbrot
+
+  attr_accessor :max_iterations
+
+  def initialize(max_iterations)
+    @max_iterations = max_iterations
+  end
+  
+  def calculate_all(x_array, y_array)
+    thread_pool = Concurrent::FixedThreadPool.new(Concurrent.processor_count)
+    width = x_array.size
+    height = y_array.size
+    pixel_rows_array = Concurrent::Array.new(height)
+    height.times do |y|
+      pixel_rows_array[y] ||= Concurrent::Array.new(width)
+      width.times do |x|
+        thread_pool.post do
+          pixel_rows_array[y][x] = calculate(x_array[x], y_array[y]).last
+        end
+      end
+    end
+    thread_pool.shutdown
+    thread_pool.wait_for_termination
+    pixel_rows_array
+  end
+
+  def calculate(x,y)
+    base_case = [Complex(x,y), 0]
+    Array.new(max_iterations, base_case).inject(base_case) do |prev ,base|
+      z, itr = prev
+      c, _ = base
+      val = z*z + c
+      itr += 1 unless val.abs < 2
+      [val, itr]
+    end
+  end
+end
+
+class MandelbrotFractal
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    @colors = [[0, 0, 0]] + 40.times.map { |i| [255 - i*5, 255 - i*5, 55 + i*5] }
+    @colors = @colors.map {|color_data| rgb(*color_data).swt_color}
+    mandelbrot = Mandelbrot.new(@colors.size - 1)
+    @y_array = (1.0).step(-1,-0.0030).to_a
+    @x_array = (-2.0).step(0.5,0.0030).to_a
+    @height = @y_array.size
+    @width = @x_array.size
+    @pixel_rows_array = mandelbrot.calculate_all(@x_array, @y_array)
+    @image = Image.new(display.swt_display, @width, @height)
+    image_gc = org.eclipse.swt.graphics.GC.new(@image)
+    @height.times { |y|
+      @width.times { |x|
+        new_foreground = @colors[@pixel_rows_array[y][x]]
+        image_gc.foreground = @current_foreground = new_foreground unless new_foreground == @current_foreground
+        image_gc.draw_point x, y
+      }
+    }
+  }
+
+  body {
+    shell {
+      text 'Mandelbrot Fractal'
+      minimum_size @width, @height + 12
+      image @image
+      
+      canvas {
+        image(@image, 0, 0)
+      }
+    }
+  }
+end
+
+MandelbrotFractal.launch

data/samples/elaborate/meta_sample.rb

@@ -203,7 +203,7 @@ class MetaSampleApplication
     shell(:fill_screen) {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
-      image File.expand_path('meta_sample/meta_sample_logo.png', __dir__)
+      image File.expand_path('../../icons/scaffold_app.png', __dir__)
       
       sash_form {
         composite {

data/samples/elaborate/tetris.rb

@@ -51,11 +51,12 @@ class Tetris
     end
     
     Display.app_name = 'Glimmer Tetris'
+
     display {
-      @keyboard_listener = on_swt_keydown { |key_event|
+      @keyboard_down_listener = on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
-          game.down!
+          game.down! if OS.mac?
         when swt(:arrow_up)
           case game.up_arrow_action
           when :instant_down
@@ -69,7 +70,7 @@ class Tetris
           game.left!
         when swt(:arrow_right), 'd'.bytes.first
           game.right!
-        when swt(:shift), swt(:alt), swt(:ctrl)
+        when swt(:shift), swt(:alt)
           if key_event.keyLocation == swt(:right) # right shift key
             game.rotate!(:right)
           elsif key_event.keyLocation == swt(:left) # left shift key
@@ -77,6 +78,16 @@ class Tetris
           end
         end
       }
+
+      # invoke game.down! on keyup with Windows/Linux since they seem to group-render similar events, preventing intermediate renders (causing invisiblity while holding keys)
+      if !OS.mac?
+        @keyboard_up_listener = on_swt_keyup { |key_event|
+          case key_event.keyCode
+          when swt(:arrow_down), 's'.bytes.first
+            game.down!
+          end
+        }
+      end
       
       # if running in app mode, set the Mac app about dialog (ignored in platforms)
       @about_observer = on_about {
@@ -128,10 +139,6 @@ class Tetris
       score_lane(game: game, block_size: BLOCK_SIZE) {
         layout_data(:fill, :fill, true, true)
       }
-
-      on_widget_disposed {
-        deregister_observers
-      }
     }
   }
   
@@ -148,26 +155,26 @@ class Tetris
           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) {
+          rectangle(x, y, icon_block_size, icon_block_size) {
             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) {
+          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) {
             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) {
+          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) {
             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) {
+          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) {
             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) {
+          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) {
             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
@@ -195,14 +202,6 @@ class Tetris
       message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nCopyright (c) 2007-2021 Andy Maleh"
     }.open
   end
-  
-  def deregister_observers
-    @show_high_scores_observer&.deregister
-    @game_over_observer&.deregister
-    @keyboard_listener&.deregister
-    @about_observer&.deregister
-    @quit_observer&.deregister
-  end
 end
 
 Tetris.launch

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

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        composite {
+        composite((:double_buffered unless OS.mac?)) {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

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

@@ -23,6 +23,8 @@ class Tetris
   module View
     class TetrisMenuBar
       include Glimmer::UI::CustomWidget
+
+      COMMAND_KEY = OS.mac? ? :command : :ctrl
   
       options :game
       
@@ -34,7 +36,7 @@ class Tetris
             menu_item {
               text '&Start'
               enabled bind(game, :game_over)
-              accelerator :command, :s
+              accelerator COMMAND_KEY, :s
               
               on_widget_selected {
                 game.start!
@@ -42,14 +44,14 @@ class Tetris
             }
             menu_item(:check) {
               text '&Pause'
-              accelerator :command, :p
+              accelerator COMMAND_KEY, :p
               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
+              accelerator COMMAND_KEY, :r
               
               on_widget_selected {
                 game.restart!
@@ -58,7 +60,7 @@ class Tetris
             menu_item(:separator)
             menu_item {
               text '&Exit'
-              accelerator :command, :x
+              accelerator COMMAND_KEY, :x
               
               on_widget_selected {
                 parent_proxy.close
@@ -73,12 +75,12 @@ class Tetris
               text '&High Scores'
               menu_item(:check) {
                 text '&Show'
-                accelerator :command, :shift, :h
+                accelerator COMMAND_KEY, :shift, :h
                 selection bind(game, :show_high_scores)
               }
               menu_item {
                 text '&Clear'
-                accelerator :command, :shift, :c
+                accelerator COMMAND_KEY, :shift, :c
                 
                 on_widget_selected {
                   game.clear_high_scores!
@@ -91,24 +93,24 @@ class Tetris
             text '&Options'
             menu_item(:check) {
               text '&Beeping'
-              accelerator :command, :b
+              accelerator COMMAND_KEY, :b
               selection bind(game, :beeping)
             }
             menu {
               text 'Up Arrow'
               menu_item(:radio) {
                 text '&Instant Down'
-                accelerator :command, :shift, :i
+                accelerator COMMAND_KEY, :shift, :i
                 selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
               }
               menu_item(:radio) {
                 text 'Rotate &Right'
-                accelerator :command, :shift, :r
+                accelerator COMMAND_KEY, :shift, :r
                 selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
               }
               menu_item(:radio) {
                 text 'Rotate &Left'
-                accelerator :command, :shift, :l
+                accelerator COMMAND_KEY, :shift, :l
                 selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
               }
             }
@@ -119,7 +121,7 @@ class Tetris
             
             menu_item {
               text '&About'
-              accelerator :command, :shift, :a
+              accelerator COMMAND_KEY, :shift, :a
               
               on_widget_selected {
                 parent_custom_shell&.show_about_dialog