glimmer-dsl-swt 4.20.7.0 → 4.20.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a17e44008cc8425de7d3789c82e9bbaa11e0406e3f38ec71cee7f9427f07686
-  data.tar.gz: abfaa95510ebb353849d8659f55f5336aa1fd9b2653e4baf44fa156ba4524174
+  metadata.gz: d9e4926af5ca63c55c0c1dc038339964678641b28dfe0b868ef0907674b151dd
+  data.tar.gz: 5789d0ea80816b981f912deeadbcdd5d587a84d7669671f951983b225785a533
 SHA512:
-  metadata.gz: 2c9c41491e55320002c349ae791073ec386237d63d07dc8737bbc8ecee37e29fbebef3ed8b4b333577ac8627e128fc54ff7da96720ca7db1fbad7ae4f49d7a96
-  data.tar.gz: 8a327ae96049e238fc36b40531e7bc9ae0d12303adae5183a4428de8cd3d39f49ef7ede3162b1b44a57102769f469200c556e394154eb65aba148679976ee12f
+  metadata.gz: c96b75dc0513e911bb0d925ecfaf76f979d9f65adf2efafaac161b622975b196c450df1300574c65913fce9ee077b96072845a578f7244c920b7a04e9c955651
+  data.tar.gz: 2956cc963363b9e428a3e07877e0fc7bc40c1e67ab38e5915da86ebc44f87fe2d360cd763ec2fe50565ba67891414ec0d241223740bcc9cd17f36907e45b60dd

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+### 4.20.10.0
+
+- Support noun alternatives for `Canvas Transform DSL` operations:
+  - `multiply(&block)` => `multiplication(&block)`
+  - `invert`           => `inversion`
+  - `rotate(angle)`    => `rotation(angle)`
+  - `translate(x, y)`  => `translation(x, y)`
+
+### 4.20.9.1
+
+- Fix issue with not being able to use :default x/y location with composite/custom shapes containing lines
+
+### 4.20.9.0
+
+- Canvas animation fps/frame_rate property to set frames-per-second rate of rendering (alternative to every)
+
+### 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.10.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.10.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.10.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.10.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.10.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.10.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -2165,12 +2165,12 @@ The first 2 values represent the 1st row, the second 2 values represent the 2nd
 
 Additionally, Transform operation keywords may be nested within the `transform` keyword to set its properties:
 - `identity` resets transform to identity (no transformation)
-- `invert` inverts a transform
-- `multiply(&block)` multiplies by another transform (takes a block representing properties of another transform, no need for using the word transform again)
-- `rotate(angle)` rotates by angle degrees
+- `invert` (alias: `inversion`) inverts a transform
+- `multiply(&transform_properties_block)` (alias: `multiplication`) multiplies by another transform (takes a block representing properties of another transform, no need for using the word transform again)
+- `rotate(angle)` (alias: `rotation`) rotates by angle degrees
 - `scale(x, y)` scales a shape (stretch)
 - `shear(x, y)` shear effect
-- `translate(x, y)` translate x and y coordinates (move)
+- `translate(x, y)` (alias: `translation`) translate x and y coordinates (move)
 - `elements(m11, m12, m21, m22, dx, dy)` resets all values of the transform matrix (first 2 values represent the 1st row, second 2 values represent the 2nd row, the last 2 values represent translation on x and y axes)
  
 Also, setting `transform` to `nil` after a previous `transform` has been set is like calling `identity`. It resets the transform.
@@ -2239,7 +2239,7 @@ Learn more at the [Hello, Canvas Transform! Sample](GLIMMER_SAMPLES.md#hello-can
 
 ### Canvas Animation DSL
 
-**(ALPHA FEATURE)**
+**(EXPERIMENTAL EARLY ALPHA FEATURE)**
 
 (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.)
 
@@ -2281,12 +2281,15 @@ 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
+- `every` specifies delay in seconds between every two frame renders (an alternative to `fps`, cannot use together)
+- `fps` (alias: `frame_rate`) specifies frame rate as frames per second (an alternative to `every`, cannot use together)
 - `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/dsl/swt/multiply_expression.rb

@@ -31,7 +31,10 @@ module Glimmer
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'multiply' and
+          (
+            keyword == 'multiply' or
+            keyword == 'multiplication'
+          ) and
             parent.is_a?(Glimmer::SWT::TransformProxy)
         end
 

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

@@ -21,6 +21,7 @@
 
 require 'glimmer/swt/properties'
 require 'glimmer/swt/custom/shape'
+require 'bigdecimal'
 
 module Glimmer
   module SWT
@@ -79,10 +80,12 @@ module Glimmer
         end
         
         attr_reader :parent, :options
-        attr_accessor :frame_index, :cycle, :frame_block, :every, :cycle_count, :frame_count, :started, :duration_limit, :duration, :finished, :cycle_count_index
+        attr_accessor :frame_index, :cycle, :frame_block, :every, :fps, :cycle_count, :frame_count, :started, :duration_limit, :duration, :finished, :cycle_count_index
         alias current_frame_index frame_index
         alias started? started
         alias finished? finished
+        alias frame_rate fps
+        alias frame_rate= fps=
         # TODO consider supporting an async: false option
         
         def initialize(parent)
@@ -114,6 +117,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 +145,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 +193,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 +217,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 +225,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 +241,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 +249,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 +258,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 +269,12 @@ 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
+          # TODO consider using timer_exec as a perhaps more reliable alternative
+          if every.is_a?(Numeric) && every > 0
+            sleep(every)
+          elsif fps.is_a?(Numeric) && fps > 0
+            sleep((BigDecimal(1.0.to_s) / BigDecimal(fps.to_f.to_s)).to_f)
+          end
           true
         rescue => e
           Glimmer::Config.logger.error {e}

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

@@ -71,14 +71,14 @@ module Glimmer
           # Logical x coordinate relative to parent
           def x
             x_value = bounds.x
-            x_value -= parent.absolute_x if parent.is_a?(Shape)
+            x_value -= parent.absolute_x if parent.is_a?(Shape) && parent.class != Shape
             x_value
           end
           
           # Logical y coordinate relative to parent
           def y
             y_value = bounds.y
-            y_value -= parent.absolute_y if parent.is_a?(Shape)
+            y_value -= parent.absolute_y if parent.is_a?(Shape) && parent.class != Shape
             y_value
           end
           
@@ -91,7 +91,7 @@ module Glimmer
           end
           
           def absolute_x1
-            if parent.is_a?(Shape)
+            if parent.is_a?(Shape) && parent.class != Shape
               parent.absolute_x + x1
             else
               x1
@@ -99,7 +99,7 @@ module Glimmer
           end
           
           def absolute_y1
-            if parent.is_a?(Shape)
+            if parent.is_a?(Shape) && parent.class != Shape
               parent.absolute_y + y1
             else
               y1
@@ -107,7 +107,7 @@ module Glimmer
           end
           
           def absolute_x2
-            if parent.is_a?(Shape)
+            if parent.is_a?(Shape) && parent.class != Shape
               parent.absolute_x + x2.to_f
             else
               x2
@@ -115,7 +115,7 @@ module Glimmer
           end
           
           def absolute_y2
-            if parent.is_a?(Shape)
+            if parent.is_a?(Shape) && parent.class != Shape
               parent.absolute_y + y2.to_f
             else
               y2

data/lib/glimmer/swt/transform_proxy.rb

@@ -34,6 +34,12 @@ module Glimmer
       include_package 'org.eclipse.swt.graphics'
       include_package 'org.eclipse.swt.widgets'
       
+      ATTRIBUTE_ALIASES = {
+        'rotation'    => 'rotate',
+        'translation' => 'translate',
+        'inversion'   => 'invert',
+      }
+      
       attr_reader :swt_transform, :parent
       
       def initialize(parent, *args, swt_transform: nil, multiply: false)
@@ -81,10 +87,11 @@ module Glimmer
       end
       
       def has_attribute?(attribute_name, *args)
-        Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.respond_to?(attribute_name) } || super
+        ATTRIBUTE_ALIASES.keys.include?(attribute_name.to_s) || Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.respond_to?(attribute_name) } || super
       end
 
       def set_attribute(attribute_name, *args)
+        attribute_name = ATTRIBUTE_ALIASES[attribute_name.to_s] || attribute_name
         if @swt_transform.respond_to?(attribute_name)
           Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(attribute_name, *args) }
         else
@@ -92,6 +99,11 @@ module Glimmer
         end
       end
       
+      def get_attribute(attribute_name)
+        attribute_name = ATTRIBUTE_ALIASES[attribute_name.to_s] || attribute_name
+        super(attribute_name)
+      end
+      
       def method_missing(method_name, *args, &block)
         result = Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(method_name, *args, &block) }
         result.nil? ? self : result

data/samples/hello/hello_canvas_animation.rb

@@ -25,12 +25,13 @@ require 'bigdecimal'
 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_fps, :animation_frame_count, :animation_duration_limit, :animation_started, :animation_finished
   
   before_body {
-    @animation_every = 0.050
+    @animation_every = 0.050 # seconds
+    @animation_fps = 0
     @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,25 +63,51 @@ class HelloCanvasAnimation
           @animation.restart
         end
       }
+
+      # row 2
       label {
-        text 'every (milliseconds)'
+        text 'every'
       }
       label {
-        text 'frame count (0 is unlimited)'
+        text 'frames per second'
       }
+      
+      # row 3
       spinner {
         layout_data(:fill, :center, true, false)
         digits 3
-        minimum 1
+        minimum 0
         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_fps]
+      }
+      
+      # row 4
+      label {
+        text 'frame count (0=unlimited)'
+      }
+      label {
+        text 'duration limit (0=unlimited)'
+      }
+      
+      # row 5
       spinner {
         layout_data(:fill, :center, true, false)
         minimum 0
         maximum 100
         selection <=> [self, :animation_frame_count]
       }
+      spinner {
+        layout_data(:fill, :center, true, false)
+        minimum 0
+        maximum 10
+        selection <=> [self, :animation_duration_limit]
+      }
       
       canvas {
         layout_data(:fill, :fill, true, true) {
@@ -88,10 +116,12 @@ class HelloCanvasAnimation
           height_hint 320
         }
         @animation = animation {
-          every <= [self, :animation_every]
-          frame_count <= [self, :animation_frame_count]
-          started <=> [self, :animation_started]
-          finished <=> [self, :animation_finished]
+          every          <=  [self, :animation_every]
+          fps            <=  [self, :animation_fps]
+          frame_count    <=  [self, :animation_frame_count]
+          duration_limit <=  [self, :animation_duration_limit]
+          started        <=> [self, :animation_started]
+          finished       <=> [self, :animation_finished]
           
           frame { |index|
             background rgb(index%100, index%100 + 100, index%55 + 200)
@@ -103,6 +133,16 @@ class HelloCanvasAnimation
       }
     }
   }
+  
+  def animation_every=(value)
+    @animation_every = value
+    self.animation_fps = 0 if @animation_every.to_f > 0
+  end
+  
+  def animation_fps=(value)
+    @animation_fps = value
+    self.animation_every = 0 if @animation_fps.to_f > 0
+  end
 end
 
 HelloCanvasAnimation.launch

data/samples/hello/hello_canvas_transform.rb

@@ -13,28 +13,29 @@ shell {
 
     image(glimmer_logo, 0, 0) {
       transform {
-        translate 110, 110
-        rotate 90
+        translation 110, 110
+        rotation 90
         scale 0.21, 0.21
+        # also supports inversion, identity, shear, and multiplication {transform properties}
       }
     }
     image(glimmer_logo, 0, 0) {
       transform {
-        translate 110, 220
+        translation 110, 220
         scale 0.21, 0.21
       }
     }
     image(glimmer_logo, 0, 0) {
       transform {
-        translate 220, 220
-        rotate 270
+        translation 220, 220
+        rotation 270
         scale 0.21, 0.21
       }
     }
     image(glimmer_logo, 0, 0) {
       transform {
-        translate 220, 110
-        rotate 180
+        translation 220, 110
+        rotation 180
         scale 0.21, 0.21
       }
     }

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.10.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0