glimmer-dsl-swt 4.20.7.0 → 4.20.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a17e44008cc8425de7d3789c82e9bbaa11e0406e3f38ec71cee7f9427f07686
-  data.tar.gz: abfaa95510ebb353849d8659f55f5336aa1fd9b2653e4baf44fa156ba4524174
+  metadata.gz: 22394bc84cfc12938603e2566009365c2d23f9eee64f49b9da159f201438ca78
+  data.tar.gz: d00cd63f2663d46628e26a9dd974705e29d6d97e5c4b9d686194899662b34218
 SHA512:
-  metadata.gz: 2c9c41491e55320002c349ae791073ec386237d63d07dc8737bbc8ecee37e29fbebef3ed8b4b333577ac8627e128fc54ff7da96720ca7db1fbad7ae4f49d7a96
-  data.tar.gz: 8a327ae96049e238fc36b40531e7bc9ae0d12303adae5183a4428de8cd3d39f49ef7ede3162b1b44a57102769f469200c556e394154eb65aba148679976ee12f
+  metadata.gz: ab487ddda276df797b56bdc5ad201ec6a9f02abcda356d13f8bdaa7c70eb3a90252459cc83872e28e88bf0b14284eafcaf05ee1f1dfca1468b88730eb1364b74
+  data.tar.gz: 1a8bb076d8bfb3daa0678477039c3220c5e49e206e08e641d2c701a5ef72a1ac3820a4f19539077be5d6d7ee5e65332f9118e88214b9d1cc9e6960a6c84339a9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+### 4.20.8.0
+
+- Support data-binding Animation `duration_limit` property
+- Improve support of Animation `duration_limit` property in recognizing when an animation is finished
+- Added duration limit to Hello, Canvas Animation! sample
+
 ### 4.20.7.0
 
 - Add Canvas Animation DSL #finished, #finished?, #finished= properties

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.6.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.8.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.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).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.8.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.6.0
+jgem install glimmer-dsl-swt -v 4.20.8.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.6.0'
+gem 'glimmer-dsl-swt', '~> 4.20.8.0'
 ```
 
 And, then run:
@@ -396,7 +396,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.6.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.8.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.7.0
+4.20.8.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -2284,9 +2284,11 @@ Keywords:
 - `every` specifies delay in seconds between every two frame renders
 - `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
+- `cycle_count` an optional cycle count limit after which the animation stops (finishes)
+- `frame_count` an optional frame count limit after which the animation stops (finishes)
+- `duration_limit` an optional duration limit in seconds after which the animation stops (finishes)
+- `started`/`started?` a boolean indicating if the animation is started right away or stopped waiting for manual startup via `#start` method
+- `finished`/`finished?` a boolean indicating if the animation finished (for finite animations only)
 
 API of Animation Object (returned from `animation` keyword):
 - `#start` starts an animation that is indefinite or has never been started before (i.e. having `started: false` option). Otherwise, resumes a stopped animation that has not been completed.

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

@@ -114,6 +114,7 @@ module Glimmer
           return if @start_number > 0 && started?
           @start_number += 1
           @start_time = Time.now
+          @duration = 0
           @original_start_time = @start_time if @duration.nil?
           self.finished = false if finished?
           self.started = true
@@ -141,8 +142,8 @@ module Glimmer
         
         # Restarts an animation (whether indefinite or not and whether stopped or not)
         def restart
-          @original_start_time = @start_time = nil
-          self.duration = nil
+          @original_start_time = @start_time = Time.now
+          self.duration = 0
           self.frame_index = 0
           self.cycle_count_index = 0
           stop
@@ -189,16 +190,19 @@ module Glimmer
         def cycle_count_index=(value)
           @cycle_count_index = value
           self.finished = true if cycle_limited? && @cycle_count_index == @cycle_count
+          @cycle_count_index
         end
         
         def frame_index=(value)
           @frame_index = value
           self.finished = true if frame_count_limited? && @frame_index == @frame_count
+          @frame_index
         end
         
         def duration=(value)
           @duration = value
           self.finished = true if surpassed_duration_limit?
+          @duration
         end
         
         def cycle_enabled?
@@ -210,7 +214,7 @@ module Glimmer
         end
         
         def duration_limited?
-          @duration_limit.is_a?(Integer)
+          @duration_limit.is_a?(Numeric) && @duration_limit > 0
         end
         
         def frame_count_limited?
@@ -218,7 +222,7 @@ module Glimmer
         end
         
         def surpassed_duration_limit?
-          duration_limited? && ((Time.now - @start_time) > (@duration_limit - @duration.to_f))
+          duration_limited? && ((Time.now - @start_time) > @duration_limit)
         end
         
         def within_duration_limit?
@@ -234,6 +238,7 @@ module Glimmer
               (frame_count_limited? && @frame_index == @frame_count) or
               (cycle_limited? && @cycle_count_index == @cycle_count) or
               surpassed_duration_limit?
+            self.duration = Time.now - @start_time
             return false
           end
           block_args = [@frame_index]
@@ -241,6 +246,7 @@ module Glimmer
           current_frame_index = @frame_index
           current_cycle_count_index = @cycle_count_index
           self.class.schedule_frame_animation(self) do
+            self.duration = Time.now - @start_time # TODO should this be set here, after the if statement, in the else too, or outside both?
             if started? && start_number == @start_number && within_duration_limit?
               unless @parent.isDisposed
                 @shapes.to_a.each(&:dispose)
@@ -249,9 +255,9 @@ module Glimmer
                   frame_block.call(*block_args)
                 }
                 @shapes = @parent.shapes - parent_shapes_before
+                self.duration = Time.now - @start_time # TODO consider if this is needed
               end
             else
-              self.finished = true if surpassed_duration_limit?
               if stopped? && @frame_index > current_frame_index
                 self.frame_index = current_frame_index
                 self.cycle_count_index = current_cycle_count_index
@@ -260,7 +266,7 @@ module Glimmer
           end
           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
+          sleep(every) if every.is_a?(Numeric) # TODO consider using timer_exec as a perhaps more reliable alternative
           true
         rescue => e
           Glimmer::Config.logger.error {e}

data/samples/hello/hello_canvas_animation.rb

@@ -26,11 +26,12 @@ 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
+  attr_accessor :animation_every, :animation_frame_count, :animation_duration_limit, :animation_started, :animation_finished
   
   before_body {
-    @animation_every = 0.050
+    @animation_every = 0.050 # seconds
     @animation_frame_count = 100
+    @animation_duration_limit = 0 # seconds
     @animation_started = true
     @animation_finished = false
   }
@@ -40,6 +41,7 @@ class HelloCanvasAnimation
       grid_layout(2, true)
       text 'Hello, Canvas Animation!'
       
+      # row 1
       button {
         layout_data(:fill, :center, true, false)
         text <= [self, :animation_started, on_read: ->(value) { value ? 'Stop' : 'Resume' }]
@@ -61,12 +63,16 @@ class HelloCanvasAnimation
           @animation.restart
         end
       }
+
+      # row 2
       label {
-        text 'every (milliseconds)'
+        text 'every'
       }
       label {
-        text 'frame count (0 is unlimited)'
+        text 'frame count (0=unlimited)'
       }
+      
+      # row 3
       spinner {
         layout_data(:fill, :center, true, false)
         digits 3
@@ -81,6 +87,20 @@ class HelloCanvasAnimation
         selection <=> [self, :animation_frame_count]
       }
       
+      # row 4
+      label {
+        text 'duration limit (0=unlimited)'
+      }
+      label # filler
+      
+      # row 5
+      spinner {
+        layout_data(:fill, :center, true, false)
+        minimum 0
+        maximum 10
+        selection <=> [self, :animation_duration_limit]
+      }
+      
       canvas {
         layout_data(:fill, :fill, true, true) {
           horizontal_span 2
@@ -90,6 +110,7 @@ class HelloCanvasAnimation
         @animation = animation {
           every <= [self, :animation_every]
           frame_count <= [self, :animation_frame_count]
+          duration_limit <= [self, :animation_duration_limit]
           started <=> [self, :animation_started]
           finished <=> [self, :animation_finished]
           

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.7.0
+  version: 4.20.8.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement