glimmer-dsl-swt 4.20.5.0 → 4.20.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b5a5a713224bb17bff5a0f19e1333a232c71871212e99be452753fe6821e407
-  data.tar.gz: 65c144171a3083704797b01c29b036463b27692461aeb0a11a7698ad24c400a5
+  metadata.gz: 9a17e44008cc8425de7d3789c82e9bbaa11e0406e3f38ec71cee7f9427f07686
+  data.tar.gz: abfaa95510ebb353849d8659f55f5336aa1fd9b2653e4baf44fa156ba4524174
 SHA512:
-  metadata.gz: 44d93271f4c7504605a23a665cc921bd8c364962f6e992f137c058b0361099593407eee8003ce1aa08cd58e1f36d8302ab3243d34dead3e8718971c25150cca9
-  data.tar.gz: e7921eb7002882585225e4580b02d81f17a471982905263abdaad87482e640edcc686a5ae9be9241dd2b0f9d9f37f0a29cbfc6c7d43e1e1d770c39d60ce7be35
+  metadata.gz: 2c9c41491e55320002c349ae791073ec386237d63d07dc8737bbc8ecee37e29fbebef3ed8b4b333577ac8627e128fc54ff7da96720ca7db1fbad7ae4f49d7a96
+  data.tar.gz: 8a327ae96049e238fc36b40531e7bc9ae0d12303adae5183a4428de8cd3d39f49ef7ede3162b1b44a57102769f469200c556e394154eb65aba148679976ee12f

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+### 4.20.7.0
+
+- Add Canvas Animation DSL #finished, #finished?, #finished= properties
+- Update Hello, Canvas Animation! (formerly had Data Binding suffix)
+- Update Hello, Canvas Animation Multi! (formerly did not have Multi suffix)
+
+### 4.20.6.0
+
+- Canvas Animation DSL: support parallel animations per canvas (running along canvas static shapes too)
+
+### 4.20.5.2
+
+- Identify trimmed Canvas Shape DSL attribute `fill_rule` styles without `fill_` prefix
+- Identify trimmed Canvas Shape DSL attribute `line_cap` styles without `cap_` prefix
+- Identify trimmed Canvas Shape DSL attribute `line_join` styles without `join_` prefix
+
+### 4.20.5.1
+
+- Fix issue with Namespace is required always showing up when buildling a custom widget gem or custom shape gem
+
 ### 4.20.5.0
 
 - Relax glimmer-dsl-swt version number when scaffolding custom shape/widget/shell gems. Keep it strict for app development.

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.5.0
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.6.0
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.5.0 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.6.0 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -347,7 +347,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.5.0
+jgem install glimmer-dsl-swt -v 4.20.6.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -375,7 +375,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.20.5.0'
+gem 'glimmer-dsl-swt', '~> 4.20.6.0'
 ```
 
 And, then run:
@@ -396,7 +396,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.5.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.6.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.20.5.0
+4.20.7.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -18,6 +18,7 @@ This guide should help you get started with Glimmer DSL for SWT. For more advanc
       - [sync_exec](#sync_exec)
       - [timer_exec](#timer_exec)
     - [Menus](#menus)
+    - [Tray Item](#tray-item)
     - [ScrolledComposite](#scrolledcomposite)
     - [Sash Form Widget](#sash-form-widget)
     - [Browser Widget](#browser-widget)
@@ -872,6 +873,101 @@ shell {
 }.open
 ```
 
+#### Tray Item
+
+![Hello Tray Item Icon](/images/glimmer-hello-tray-item.png)
+
+The system tray allows showing icons for various apps that need to stay on for extended periods of time and provide quick access.
+
+In Glimmer DSL for SWT, generating tray items is automated via the `tray_item` keyword, which can be nested under `shell` and then have a child `menu` underneath that pops up when the user clicks on its icon in the system tray.
+
+Note how the shell was declared with the `:on_top` style (in addition to the default, which is `:shell_trim`) to ensure it opens above all apps when the "Show Application" menu item is selected.
+
+Example code:
+
+```ruby
+    shell(:shell_trim, :on_top) { # make it always appear on top of everything
+      row_layout(:vertical) {
+        center true
+      }
+      text 'Hello, Tray Item!'
+      
+      on_shell_closed do |event|
+        # do not perform event that closes app when shell is closed
+        event.doit = false
+        # body_root is the root shell
+        body_root.hide
+        self.show_application = false # updates Show Application checkbox menu item indirectly
+      end
+      
+      tray_item {
+        tool_tip_text 'Glimmer'
+        image @image # could use an image path instead
+
+        menu {
+          menu_item {
+            text 'About'
+
+            on_widget_selected do
+              message_box {
+                text 'Glimmer - About'
+                message 'This is a Glimmer DSL for SWT Tray Item'
+              }.open
+            end
+          }
+          menu_item(:separator)
+          menu_item(:check) {
+            text 'Show Application'
+            selection <=> [self, :show_application]
+            
+            on_widget_selected do
+              # body_root is the root shell
+              if body_root.visible?
+                body_root.hide
+              else
+                body_root.show
+              end
+            end
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Exit'
+
+            on_widget_selected {
+              exit(0)
+            }
+          }
+        }
+        
+        # supported tray item listeners (you can try to add actions to them when needed)
+#         on_swt_Show {
+#         }
+#
+#         on_swt_Hide {
+#         }
+#
+#         on_widget_selected {
+#         }
+#
+#         on_menu_detected {
+#         }
+      }
+      
+      label(:center) {
+        text 'This is the application'
+        font height: 30
+      }
+      label {
+        text 'Click on the tray item (circles icon) to open its menu'
+      }
+      label {
+        text 'Uncheck Show Application to hide the app and recheck it to show the app'
+      }
+    }
+```
+
+Learn more at [Hello, Tray Item!](/docs/reference/GLIMMER_SAMPLES.md#hello-tray-item)
+
 #### ScrolledComposite
 
 Glimmer provides smart defaults for the `scrolled_composite` widget by:
@@ -2147,13 +2243,13 @@ Learn more at the [Hello, Canvas Transform! Sample](GLIMMER_SAMPLES.md#hello-can
 
 (note: this is a very new feature of Glimmer. It may change a bit while getting battle tested. As always, you could default to basic SWT usage if needed.)
 
-Glimmer additionally provides built-in support for animations via a declarative Animation DSL, another sub-DSL of the Glimmer GUI DSL.
+Glimmer provides built-in support for animations via a declarative Animation DSL, another sub-DSL of the Glimmer GUI DSL.
 
-Animations take advantage of multi-threading, automatically running each animation in its own independent thread of execution while updating the GUI asynchronously.
+Animations take advantage of multi-threading, with Glimmer DSL for SWT automatically running each animation in its own independent thread of execution while updating the GUI asynchronously.
 
-Multiple simultaneous animations are supported by declaring an animation per `canvas` (or widget) parent.
+Multiple simultaneous animations are supported per `canvas` (or widget) parent.
 
-`canvas` has the `:double_buffered` SWT style by default to ensure flicker-free rendering. If you need to disable it for whatever reason, just pass the `:none` SWT style instead (e.g. `canvas(:none)`)
+`canvas` has the `:double_buffered` SWT style by default on platforms other than the Mac to ensure flicker-free rendering (Mac does not need it). If you need to disable it for whatever reason, just pass the `:none` SWT style instead (e.g. `canvas(:none)`)
 
 This example says it all (it moves a tiny red square across a blue background) (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
 
@@ -2186,8 +2282,8 @@ Screenshot:
 Keywords:
 - `animation` declares an animation under a canvas, which renders frames using a frame block indefinitely or finitely depending on (cycle_count/frame_count) properties
 - `every` specifies delay in seconds between every two frame renders
-- `frame` a block that can contain Shape DSL syntax that is rendered dynamically with variables calculated on the fly
-- `cycle` a property that takes an array to cycle into a second variable for the `frame` block
+- `frame {|index, cycle_var| }` a block that can contain Shape DSL syntax that is rendered dynamically with variables calculated on the fly
+- `cycle` an optional property that takes an array to cycle into a second variable for the `frame` block
 - `cycle_count` an optional cycle count limit after which the animation stops
 - `frame_count` an optional frame count limit after which the animation stops
 - `started` a boolean indicating if the animation is started right away or stopped waiting for manual startup via `#start` method

data/docs/reference/GLIMMER_SAMPLES.md

@@ -39,7 +39,7 @@
     - [Hello, Code Text!](#hello-code-text)
     - [Hello, Canvas!](#hello-canvas)
     - [Hello, Canvas Animation!](#hello-canvas-animation)
-    - [Hello, Canvas Animation Data Binding!](#hello-canvas-animation-data-binding)
+    - [Hello, Canvas Animation Multi!](#hello-canvas-animation-multi)
     - [Hello, Canvas Transform!](#hello-canvas-transform)
     - [Hello, Canvas Path!](#hello-canvas-path)
     - [Hello, Canvas Data Binding!](#hello-canvas-data-binding)
@@ -743,31 +743,27 @@ Hello, Canvas! Data-Binding (changing a `text` shape `string` via data-binding c
 
 #### Hello, Canvas Animation!
 
-This sample demonstrates the use of the `canvas` widget and [Animation DSL](#canvas-animation-dsl) in Glimmer.
+This sample demonstrates the use of the [Canvas Animation DSL](#canvas-animation-dsl) with data-binding.
 
 Code:
 
-[samples/hello/hello_canvas_animation.rb](/samples/hello/hello_canvas_animation.rb)
+[samples/hello/hello_canvas_animation_data_binding.rb](/samples/hello/hello_canvas_animation_data_binding.rb)
 
 Hello, Canvas Animation!
 
-![Hello Canvas Animation](/images/glimmer-hello-canvas-animation.png)
-
-Hello, Canvas Animation Another Frame!
+![Hello Canvas Animation Data Binding](/images/glimmer-hello-canvas-animation.gif)
 
-![Hello Canvas Animation Frame 2](/images/glimmer-hello-canvas-animation-frame2.png)
+#### Hello, Canvas Animation Multi!
 
-#### Hello, Canvas Animation Data Binding!
-
-This sample demonstrates the use of the [Canvas Animation DSL](#canvas-animation-dsl) with data-binding.
+This sample demonstrates parallel animations in the [Canvas Animation DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX#canvas-animation-dsl).
 
 Code:
 
-[samples/hello/hello_canvas_animation_data_binding.rb](/samples/hello/hello_canvas_animation_data_binding.rb)
+[samples/hello/hello_canvas_animation_multi.rb](/samples/hello/hello_canvas_animation_multi.rb)
 
-Hello, Canvas Animation Data Binding!
+Hello, Canvas Animation Multi!
 
-![Hello Canvas Animation Data Binding](/images/glimmer-hello-canvas-animation-data-binding.gif)
+![Hello Canvas Animation Multi](/images/glimmer-hello-canvas-animation-multi.gif)
 
 #### Hello, Canvas Transform!
 

data/lib/glimmer/rake_task/scaffold.rb

@@ -312,13 +312,13 @@ module Glimmer
         end
     
         def custom_widget_gem(custom_widget_name, namespace)
-          return puts('Namespace is required! Usage: glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
           gem_name = "glimmer-cw-#{compact_name(custom_widget_name)}"
           gem_summary = "#{human_name(custom_widget_name)} - Glimmer Custom Widget"
           if namespace
             gem_name += "-#{compact_name(namespace)}"
             gem_summary += " (#{human_name(namespace)})"
           else
+            return puts('Namespace is required! Usage: glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
             namespace = 'glimmer'
           end
           
@@ -350,13 +350,13 @@ module Glimmer
         end
     
         def custom_shape_gem(custom_shape_name, namespace)
-          return puts('Namespace is required! Usage: glimmer scaffold:custom_shape_gem[custom_shape_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
           gem_name = "glimmer-cp-#{compact_name(custom_shape_name)}"
           gem_summary = "#{human_name(custom_shape_name)} - Glimmer Custom Shape"
           if namespace
             gem_name += "-#{compact_name(namespace)}"
             gem_summary += " (#{human_name(namespace)})"
           else
+            return puts('Namespace is required! Usage: glimmer scaffold:custom_shape_gem[custom_shape_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
             namespace = 'glimmer'
           end
           

data/lib/glimmer/swt/custom/animation.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/properties'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module SWT
@@ -27,6 +28,7 @@ module Glimmer
       # Represents an animation declaratively
       class Animation
         include Properties
+        include Glimmer::DataBinding::ObservableModel
         
         class << self
           def schedule_frame_animation(animation, &frame_animation_block)
@@ -76,18 +78,19 @@ module Glimmer
           end
         end
         
-        attr_reader :parent, :options, :frame_index, :cycle
+        attr_reader :parent, :options
+        attr_accessor :frame_index, :cycle, :frame_block, :every, :cycle_count, :frame_count, :started, :duration_limit, :duration, :finished, :cycle_count_index
         alias current_frame_index frame_index
-        attr_accessor :frame_block, :every, :cycle_count, :frame_count, :started, :duration_limit
         alias started? started
+        alias finished? finished
         # TODO consider supporting an async: false option
         
         def initialize(parent)
           @parent = parent
           @parent.requires_shape_disposal = true
-          @started = true
-          @frame_index = 0
-          @cycle_count_index = 0
+          self.started = true
+          self.frame_index = 0
+          self.cycle_count_index = 0
           @start_number = 0 # denotes the number of starts (increments on every start)
           self.class.swt_display # ensures initializing variable to set from GUI thread
         end
@@ -110,9 +113,10 @@ module Glimmer
         def start
           return if @start_number > 0 && started?
           @start_number += 1
-          @started = true
           @start_time = Time.now
           @original_start_time = @start_time if @duration.nil?
+          self.finished = false if finished?
+          self.started = true
           # TODO track when finished in a variable for finite animations (whether by frame count, cycle count, or duration limit)
           Thread.new do
             start_number = @start_number
@@ -131,16 +135,16 @@ module Glimmer
         
         def stop
           return if stopped?
-          @started = false
-          @duration = (Time.now - @start_time) + @duration.to_f if duration_limited? && !@start_time.nil?
+          self.started = false
+          self.duration = (Time.now - @start_time) + @duration.to_f if duration_limited? && !@start_time.nil?
         end
         
         # Restarts an animation (whether indefinite or not and whether stopped or not)
         def restart
           @original_start_time = @start_time = nil
-          @duration = nil
-          @frame_index = 0
-          @cycle_count_index = 0
+          self.duration = nil
+          self.frame_index = 0
+          self.cycle_count_index = 0
           stop
           start
         end
@@ -182,6 +186,21 @@ module Glimmer
           end
         end
         
+        def cycle_count_index=(value)
+          @cycle_count_index = value
+          self.finished = true if cycle_limited? && @cycle_count_index == @cycle_count
+        end
+        
+        def frame_index=(value)
+          @frame_index = value
+          self.finished = true if frame_count_limited? && @frame_index == @frame_count
+        end
+        
+        def duration=(value)
+          @duration = value
+          self.finished = true if surpassed_duration_limit?
+        end
+        
         def cycle_enabled?
           @cycle.is_a?(Array)
         end
@@ -195,7 +214,7 @@ module Glimmer
         end
         
         def frame_count_limited?
-          @frame_count.is_a?(Integer)
+          @frame_count.is_a?(Integer) && @frame_count > 0
         end
         
         def surpassed_duration_limit?
@@ -210,11 +229,13 @@ module Glimmer
         
         # Returns true on success of painting a frame and false otherwise
         def draw_frame(start_number)
-          return false if stopped? ||
-                          start_number != @start_number ||
-                          (frame_count_limited? && @frame_index == @frame_count) ||
-                          (cycle_limited? && @cycle_count_index == @cycle_count) ||
-                          surpassed_duration_limit?
+          if stopped? or
+              (start_number != @start_number) or
+              (frame_count_limited? && @frame_index == @frame_count) or
+              (cycle_limited? && @cycle_count_index == @cycle_count) or
+              surpassed_duration_limit?
+            return false
+          end
           block_args = [@frame_index]
           block_args << @cycle[@frame_index % @cycle.length] if cycle_enabled?
           current_frame_index = @frame_index
@@ -222,20 +243,24 @@ module Glimmer
           self.class.schedule_frame_animation(self) do
             if started? && start_number == @start_number && within_duration_limit?
               unless @parent.isDisposed
-                @parent.clear_shapes # TODO adjust this to clear only the shapes of this animation (not all shapes) to allow simultaneous animations to occur on the same parent
-                @parent.content { frame_block.call(*block_args) }
+                @shapes.to_a.each(&:dispose)
+                parent_shapes_before = @parent.shapes.clone
+                @parent.content {
+                  frame_block.call(*block_args)
+                }
+                @shapes = @parent.shapes - parent_shapes_before
               end
             else
+              self.finished = true if surpassed_duration_limit?
               if stopped? && @frame_index > current_frame_index
-                @started = false
-                @frame_index = current_frame_index
-                @cycle_count_index = current_cycle_count_index
+                self.frame_index = current_frame_index
+                self.cycle_count_index = current_cycle_count_index
               end
             end
           end
-          @frame_index += 1
-          @cycle_count_index += 1 if cycle_limited? && (@frame_index % @cycle&.length&.to_i) == 0
-          sleep(every) if every.is_a?(Numeric)
+          self.frame_index += 1
+          self.cycle_count_index += 1 if cycle_limited? && (@frame_index % @cycle&.length&.to_i) == 0
+          sleep(every) if every.is_a?(Numeric) # TODO consider using timer_exec as a more reliable alternative
           true
         rescue => e
           Glimmer::Config.logger.error {e}

data/lib/glimmer/swt/custom/shape.rb

@@ -295,6 +295,15 @@ module Glimmer
             if method_name.to_s == 'setLineStyle'
               args[0] = "line_#{args[0]}" if !args[0].to_s.downcase.start_with?('line_')
             end
+            if method_name.to_s == 'setFillRule'
+              args[0] = "fill_#{args[0]}" if !args[0].to_s.downcase.start_with?('fill_')
+            end
+            if method_name.to_s == 'setLineCap'
+              args[0] = "cap_#{args[0]}" if !args[0].to_s.downcase.start_with?('cap_')
+            end
+            if method_name.to_s == 'setLineJoin'
+              args[0] = "join_#{args[0]}" if !args[0].to_s.downcase.start_with?('join_')
+            end
             if the_java_method.parameter_types.first == Java::int.java_class
               args[0] = SWTProxy.constant(args[0])
             end

data/samples/elaborate/meta_sample.rb

@@ -207,6 +207,8 @@ class MetaSampleApplication
       image File.expand_path('../../icons/scaffold_app.png', __dir__)
       
       sash_form {
+        weights 4, 14
+      
         composite {
           grid_layout(1, false) {
             margin_width 0
@@ -282,8 +284,6 @@ class MetaSampleApplication
           left_margin 7
           right_margin 7
         }
-        
-        weights 4, 11
       }
     }
   }

data/samples/hello/hello_canvas_animation.rb

@@ -20,49 +20,89 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer-dsl-swt'
+require 'bigdecimal'
 
-include Glimmer
-
-shell {
-  text 'Hello, Canvas Animation!'
-  minimum_size 800, 420
-
-  canvas {
-    animation {
-      every 0.01 # in seconds (one hundredth)
-            
-      frame { |index| # frame block loops indefinitely (unless frame_count is set to an integer)
-        background rgb(index%255, 100, 200) # sets canvas background color
+class HelloCanvasAnimation
+  include Glimmer::UI::CustomShell
+  
+  # data-bindable attributes (names must vary from attribute names on animation)
+  attr_accessor :animation_every, :animation_frame_count, :animation_started, :animation_finished
+  
+  before_body {
+    @animation_every = 0.050
+    @animation_frame_count = 100
+    @animation_started = true
+    @animation_finished = false
+  }
+  
+  body {
+    shell {
+      grid_layout(2, true)
+      text 'Hello, Canvas Animation!'
+      
+      button {
+        layout_data(:fill, :center, true, false)
+        text <= [self, :animation_started, on_read: ->(value) { value ? 'Stop' : 'Resume' }]
+        enabled <= [self, :animation_finished, on_read: :!]
         
-        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) {  # x, y, width, height, start angle, arc angle
-          background rgb(200, 200, 50) # sets arc background color
-        }
+        on_widget_selected do
+          if @animation.started?
+            @animation.stop
+          else
+            @animation.start
+          end
+        end
       }
-    }
-  }
-
-  canvas {
-    colors = [:yellow, :red]
-    animation {
-      every 0.25 # in seconds (one quarter)
-      cycle colors # cycles array of colors into the second variable of the frame block below
-
-      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) {
-          background inside_color # sets rectangle background color
+      button {
+        layout_data(:fill, :center, true, false)
+        text 'Restart'
+        
+        on_widget_selected do
+          @animation.restart
+        end
+      }
+      label {
+        text 'every (milliseconds)'
+      }
+      label {
+        text 'frame count (0 is unlimited)'
+      }
+      spinner {
+        layout_data(:fill, :center, true, false)
+        digits 3
+        minimum 1
+        maximum 100
+        selection <=> [self, :animation_every, on_read: ->(v) {(BigDecimal(v.to_s)*1000).to_f}, on_write: ->(v) {(BigDecimal(v.to_s)/1000).to_f}]
+      }
+      spinner {
+        layout_data(:fill, :center, true, false)
+        minimum 0
+        maximum 100
+        selection <=> [self, :animation_frame_count]
+      }
+      
+      canvas {
+        layout_data(:fill, :fill, true, true) {
+          horizontal_span 2
+          width_hint 320
+          height_hint 320
         }
-        rectangle(200, 200, 200, 200) {
-          background inside_color # sets rectangle background color
+        @animation = animation {
+          every <= [self, :animation_every]
+          frame_count <= [self, :animation_frame_count]
+          started <=> [self, :animation_started]
+          finished <=> [self, :animation_finished]
+          
+          frame { |index|
+            background rgb(index%100, index%100 + 100, index%55 + 200)
+            oval(index*3%300, index*3%300, 20, 20) {
+              background :yellow
+            }
+          }
         }
       }
     }
   }
-}.open
+end
+
+HelloCanvasAnimation.launch

data/samples/hello/hello_canvas_animation_multi.rb

@@ -0,0 +1,109 @@
+# 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 'glimmer-dsl-swt'
+
+include Glimmer
+
+shell {
+  text 'Hello, Canvas Animation Multi!'
+  minimum_size 1200, 420
+
+  canvas {
+    background :white
+    
+    animation {
+      every 0.01 # in seconds (one hundredth)
+            
+      frame { |index| # frame block loops indefinitely (unless frame_count is set to an integer)
+        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) {  # x, y, width, height, start angle, arc angle
+          background rgb(50, 200, 50) # sets arc background color
+        }
+      }
+    }
+  }
+
+  canvas {
+    background :white
+    
+    colors = [:yellow, :red]
+    
+    animation {
+      every 0.25 # in seconds (one quarter)
+      cycle colors # cycles array of colors into the second variable of the frame block below
+
+      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) {
+          background inside_color # sets rectangle background color
+        }
+        rectangle(200, 200, 200, 200) {
+          background inside_color # sets rectangle background color
+        }
+      }
+    }
+  }
+
+  canvas {
+    background :white
+    
+    colors = [:yellow, :red]
+    
+    animation {
+      every 0.25 # in seconds (one quarter)
+      cycle colors # cycles array of colors into the second variable of the frame block below
+
+      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) {
+          background inside_color # sets rectangle background color
+        }
+        rectangle(200, 200, 200, 200) {
+          background inside_color # sets rectangle background color
+        }
+      }
+    }
+    
+    animation {
+      every 0.01 # in seconds (one hundredth)
+            
+      frame { |index| # frame block loops indefinitely (unless frame_count is set to an integer)
+        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) {  # x, y, width, height, start angle, arc angle
+          background rgb(50, 200, 50) # sets arc background color
+        }
+      }
+    }
+  }
+}.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.5.0
+  version: 4.20.7.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -574,7 +574,7 @@ files:
 - samples/hello/hello_c_tab.rb
 - samples/hello/hello_canvas.rb
 - samples/hello/hello_canvas_animation.rb
-- samples/hello/hello_canvas_animation_data_binding.rb
+- samples/hello/hello_canvas_animation_multi.rb
 - samples/hello/hello_canvas_data_binding.rb
 - samples/hello/hello_canvas_path.rb
 - samples/hello/hello_canvas_transform.rb

data/samples/hello/hello_canvas_animation_data_binding.rb

@@ -1,66 +0,0 @@
-# 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 'glimmer-dsl-swt'
-require 'bigdecimal'
-
-class HelloAnimationDataBinding
-  include Glimmer::UI::CustomShell
-  
-  attr_accessor :delay_time
-  
-  before_body {
-    @delay_time = 0.050
-  }
-  
-  body {
-    shell {
-      text 'Hello, Canvas Animation Data Binding!'
-      minimum_size 320, 320
-      
-      canvas {
-        grid_layout
-        
-        spinner {
-          layout_data(:center, :center, true, true) {
-            minimum_width 75
-          }
-          digits 3
-          minimum 1
-          maximum 100
-          selection <=> [self, :delay_time, on_read: ->(v) {(BigDecimal(v.to_s)*1000).to_f}, on_write: ->(v) {(BigDecimal(v.to_s)/1000).to_f}]
-        }
-        animation {
-          every <= [self, :delay_time]
-          
-          frame { |index|
-            background rgb(index%100, index%100 + 100, index%55 + 200)
-            oval(index*3%300, index*3%300, 20, 20) {
-              background :yellow
-            }
-          }
-        }
-      }
-    }
-  }
-end
-
-HelloAnimationDataBinding.launch