glimmer-dsl-swt 4.18.4.3 → 4.18.4.8

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
       #
@@ -147,6 +149,7 @@ module Glimmer
       #
       # Styles is a comma separate list of symbols representing SWT styles in lower case
       def initialize(*init_args, swt_widget: nil)
+        @image_double_buffered = !!(init_args&.last&.include?(:image_double_buffered) && init_args&.last&.delete(:image_double_buffered))
         if swt_widget.nil?
           underscored_widget_name, parent, args = init_args
           @parent_proxy = parent
@@ -169,6 +172,7 @@ module Glimmer
         if respond_to?(:on_widget_disposed)
           on_widget_disposed {
             clear_shapes
+            deregister_shape_painting
           }
         end
       end
@@ -178,11 +182,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 +554,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
+      }
+    }
+  }
+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

@@ -139,10 +139,6 @@ class Tetris
       score_lane(game: game, block_size: BLOCK_SIZE) {
         layout_data(:fill, :fill, true, true)
       }
-
-      on_widget_disposed {
-        deregister_observers
-      }
     }
   }
   
@@ -159,19 +155,19 @@ 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)
           }
         }
@@ -206,15 +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_down_listener&.deregister
-    @keyboard_up_listener&.deregister
-    @about_observer&.deregister
-    @quit_observer&.deregister
-  end
 end
 
 Tetris.launch

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

@@ -27,7 +27,7 @@ class Tetris
       options :game_playfield, :block_size, :row, :column
   
       body {
-        canvas(:double_buffered) {
+        canvas {
           background bind(game_playfield[row][column], :color)
           polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4) {
             background bind(game_playfield[row][column], :color) { |color_value|

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

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

data/samples/hello/hello_canvas_animation.rb

@@ -25,7 +25,7 @@ shell {
   text 'Hello, Canvas Animation!'
   minimum_size 800, 420
 
-  canvas(:double_buffered) {
+  canvas {
     animation {
       every 0.01 # in seconds (one hundredth)
             

data/samples/hello/hello_canvas_transform.rb

@@ -1,6 +1,6 @@
 include Glimmer
 
-glimmer_logo = File.expand_path('./hello_canvas_transform/hello_canvas_transform_image.png', __dir__)
+glimmer_logo = File.expand_path('../../icons/scaffold_app.png', __dir__)
 
 shell {
   text 'Hello, Canvas Transform!'

data/samples/hello/hello_table.rb

@@ -192,7 +192,7 @@ class HelloTable
         layout_data :center, :center, true, false
         
         text 'BASEBALL PLAYOFF SCHEDULE'
-        background :transparent
+        background :transparent if OS.windows?
         foreground rgb(94, 107, 103)
         font name: 'Optima', height: 38, style: :bold
       }

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.4.3
+  version: 4.18.4.8
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-07 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.1.1
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -361,6 +361,13 @@ files:
 - bin/girb
 - bin/girb_runner.rb
 - bin/glimmer
+- docs/reference/GLIMMER_COMMAND.md
+- docs/reference/GLIMMER_CONFIGURATION.md
+- docs/reference/GLIMMER_GIRB.md
+- docs/reference/GLIMMER_GUI_DSL_SYNTAX.md
+- docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md
+- docs/reference/GLIMMER_SAMPLES.md
+- docs/reference/GLIMMER_STYLE_GUIDE.md
 - glimmer-dsl-swt.gemspec
 - icons/scaffold_app.icns
 - icons/scaffold_app.ico
@@ -405,6 +412,7 @@ files:
 - lib/glimmer/dsl/swt/message_box_expression.rb
 - lib/glimmer/dsl/swt/multiply_expression.rb
 - lib/glimmer/dsl/swt/observe_expression.rb
+- lib/glimmer/dsl/swt/pixel_expression.rb
 - lib/glimmer/dsl/swt/property_expression.rb
 - lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/swt/rgb_expression.rb
@@ -415,6 +423,7 @@ files:
 - lib/glimmer/dsl/swt/sync_exec_expression.rb
 - lib/glimmer/dsl/swt/tab_item_expression.rb
 - lib/glimmer/dsl/swt/table_items_data_binding_expression.rb
+- lib/glimmer/dsl/swt/timer_exec_expression.rb
 - lib/glimmer/dsl/swt/transform_expression.rb
 - lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
 - lib/glimmer/dsl/swt/tree_properties_expression.rb
@@ -468,8 +477,8 @@ files:
 - samples/elaborate/contact_manager/contact_manager_presenter.rb
 - samples/elaborate/contact_manager/contact_repository.rb
 - samples/elaborate/login.rb
+- samples/elaborate/mandelbrot_fractal.rb
 - samples/elaborate/meta_sample.rb
-- samples/elaborate/meta_sample/meta_sample_logo.png
 - samples/elaborate/tetris.rb
 - samples/elaborate/tetris/model/block.rb
 - samples/elaborate/tetris/model/game.rb
@@ -489,7 +498,6 @@ files:
 - samples/hello/hello_canvas.rb
 - samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_canvas_transform.rb
-- samples/hello/hello_canvas_transform/hello_canvas_transform_image.png
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
 - samples/hello/hello_code_text.rb