glimmer-dsl-swt 4.20.8.0 → 4.20.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22394bc84cfc12938603e2566009365c2d23f9eee64f49b9da159f201438ca78
-  data.tar.gz: d00cd63f2663d46628e26a9dd974705e29d6d97e5c4b9d686194899662b34218
+  metadata.gz: 13187ec0b73c8a5952858310e3c42e511f2e48f4e278b58e075476781b7c5c3d
+  data.tar.gz: 5122305d5bac89596a966afca60fc6fd7085f0ceb6fdc4e8ac8317cdc3399667
 SHA512:
-  metadata.gz: ab487ddda276df797b56bdc5ad201ec6a9f02abcda356d13f8bdaa7c70eb3a90252459cc83872e28e88bf0b14284eafcaf05ee1f1dfca1468b88730eb1364b74
-  data.tar.gz: 1a8bb076d8bfb3daa0678477039c3220c5e49e206e08e641d2c701a5ef72a1ac3820a4f19539077be5d6d7ee5e65332f9118e88214b9d1cc9e6960a6c84339a9
+  metadata.gz: ded05c6457281d9b11ae751a6c28561fe9789a25c21abde7d30ba79c2232780deb919ab6a700d9c719a103de95fdd7e7a0941cb8b4716b6c8586baac0490aa2f
+  data.tar.gz: edb3e68ff37552894bf004b916351772cac70520153b97fb7683258667bb3b384659eaea1ab57f7319a7325f7adda1e6a1438c9a49cf436f16d8d965353be496

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+### 4.20.10.1
+
+- Hello, Scale! sample.
+
+### 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

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.8.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.1
 ## 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.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).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.10.1 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.8.0
+jgem install glimmer-dsl-swt -v 4.20.10.1
 ```
 
 `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.8.0'
+gem 'glimmer-dsl-swt', '~> 4.20.10.1'
 ```
 
 And, then run:
@@ -396,7 +396,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.8.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.10.1
       
 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.8.0
+4.20.10.1

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,7 +2281,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
+- `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 (finishes)

data/docs/reference/GLIMMER_SAMPLES.md

@@ -32,6 +32,7 @@
     - [Hello, Directory Dialog!](#hello-directory-dialog)
     - [Hello, File Dialog!](#hello-file-dialog)
     - [Hello, Date Time!](#hello-date-time)
+    - [Hello, Scale!](#hello-scale)
     - [Hello, Spinner!](#hello-spinner)
     - [Hello, Table!](#hello-table)
     - [Hello, Link!](#hello-link)
@@ -593,6 +594,18 @@ Hello, Date Time!
 
 ![Hello Date Time](/images/glimmer-hello-date-time.png)
 
+#### Hello, Scale!
+
+This sample demonstrates the use of `scale` widget in Glimmer
+
+Code:
+
+[samples/hello/hello_scale.rb](/samples/hello/hello_scale.rb)
+
+Hello, Scale!
+
+![Hello Scale](/images/glimmer-hello-scale.png)
+
 #### Hello, Spinner!
 
 This sample demonstrates the use of `spinner` widget in Glimmer

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)
@@ -266,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 perhaps 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,11 +25,11 @@ 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_duration_limit, :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 # seconds
+    @animation_fps = 0
     @animation_frame_count = 100
     @animation_duration_limit = 0 # seconds
     @animation_started = true
@@ -69,14 +69,14 @@ class HelloCanvasAnimation
         text 'every'
       }
       label {
-        text 'frame count (0=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}]
       }
@@ -84,16 +84,24 @@ class HelloCanvasAnimation
         layout_data(:fill, :center, true, false)
         minimum 0
         maximum 100
-        selection <=> [self, :animation_frame_count]
+        selection <=> [self, :animation_fps]
       }
       
       # row 4
+      label {
+        text 'frame count (0=unlimited)'
+      }
       label {
         text 'duration limit (0=unlimited)'
       }
-      label # filler
       
       # 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
@@ -108,11 +116,12 @@ class HelloCanvasAnimation
           height_hint 320
         }
         @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]
+          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)
@@ -124,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
       }
     }

data/samples/hello/hello_scale.rb

@@ -0,0 +1,57 @@
+# 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'
+
+class HelloScale
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :value
+  
+  before_body {
+    @value = 50
+  }
+  
+  body {
+    shell {
+      row_layout(:vertical) {
+        fill true
+        center true
+      }
+      
+      text 'Hello, Scale!'
+      
+      label(:center) {
+        text <= [self, :value]
+      }
+      
+      scale { # optionally takes :vertical or :horizontal (default) SWT style
+        minimum 0
+        maximum 100
+        selection <=> [self, :value]
+      }
+        
+    }
+    
+  }
+end
+
+HelloScale.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.8.0
+  version: 4.20.10.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-07-22 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
@@ -610,6 +610,7 @@ files:
 - samples/hello/hello_radio.rb
 - samples/hello/hello_radio_group.rb
 - samples/hello/hello_sash_form.rb
+- samples/hello/hello_scale.rb
 - samples/hello/hello_shape.rb
 - samples/hello/hello_shell.rb
 - samples/hello/hello_spinner.rb