glimmer-dsl-swt 4.20.9.1 → 4.20.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37d0806e8aaa9348e085cee3068003ab71eba9b55dcf9dc0a6dc19df8f9a351
-  data.tar.gz: ffc3acfdc525c51c694d1461f28955b77b3f33869abfb6a9fc7b2c40624085c4
+  metadata.gz: 22a275c90700a95d9bb50a11500062bc752ae0993177af88f8c84afb150615e2
+  data.tar.gz: fa1470d45be2485bd2304eccfb8f93a0f45b841c81bc7891de65144fb6e7b8ac
 SHA512:
-  metadata.gz: 85e233e9aca10e9674ef33ec09ab00ecbe04d122f9bc9e6bbbba24d48b187bf9f89eaa55bf8b4001eec37b4825995e2e8427f39ede64f76d51767ee1e60421a5
-  data.tar.gz: d168d8a89386a65ee536e372eeb0f4b958e536db7d8ec0f6b280dc8249b268108997e037b107aa59c3fe1f59bb8003c9a7b5c557749a31c962eb2cbb97d90d42
+  metadata.gz: 72447b790c797f63c78ce456cfe638a74140294e3f710432465a773e63c97c5198ecec9c5d4a6cc6de36a8bfbb5ec743300c3ffdd2db2c638ab031bbf125d44d
+  data.tar.gz: 577412f2a8a2313f3fc61568ac4d435e6d7158725ff2199eaef5e935c165745a872971f4fb8d48d8d8d0ae3d1a3b19078d956f65e54da7b9c0dcd582c7d73a5a

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+### 4.20.11.0
+
+- Shape `#center_x`/`#center_y` methods to identify a shape's center point
+- Shape `#rotate` method to rotate around center point
+
+### 4.20.10.2
+
+- Fix issue "Resolve 'NameError: uninitialized constant Glimmer::DataBinding' on Windows" https://github.com/AndyObtiva/glimmer-dsl-swt/issues/9 (originally in https://github.com/AMaleh/glimmer-dsl-swt/pull/1)
+
+### 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

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.9.1
+# [<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.11.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.9.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).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.11.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.9.1
+jgem install glimmer-dsl-swt -v 4.20.11.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.9.1'
+gem 'glimmer-dsl-swt', '~> 4.20.11.0'
 ```
 
 And, then run:
@@ -396,7 +396,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.9.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.11.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.9.1
+4.20.11.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1901,6 +1901,8 @@ They are implemented with the help of the highly robust Java built-in shape geom
 - `Shape#contain?(x, y)` : indicates if shape contains x, y point
 - `Shape#include?(x, y)` : indicates if shape includes x, y point on the edge if drawn or inside if filled (include uses contain for filled shapes)
 - `Shape#move_by(x_delta, y_delta)` : moves shape object at x, y location
+- `Shape#rotate(angle)` : rotates around center by an angle (not cumulative, reseting angle on every call)
+- `Shape#rotatation_angle` : current rotation angle (according to use of rotate method)
 - `Shape#dispose` : disposes of shape, removing it form its parent canvas, widget, or shape
 - `Shape#content {}` : reopens a shape to add more content inside it using the Glimmer GUI DSL (e.g. Canvas Shape DSL) just like `WidgetProxy#content {}`.
 - `Shape#size` : calculated size for shape bounding box (e.g. a polygon with an irregular shape will have its bounding box width and height calculated)
@@ -1921,6 +1923,10 @@ They are implemented with the help of the highly robust Java built-in shape geom
 - `Shape#default_y?` : calculated top-left corner y position
 - `Shape#calculated_x` : calculated top-left corner x position when default/delta is set (i.e. centered within parent)
 - `Shape#calculated_y` : calculated top-left corner y position when default/delta is set (i.e. centered within parent)
+- `Shape#center_x` : center x
+- `Shape#center_y` : center y
+- `Shape#x_end` : right-most included x coordinate
+- `Shape#y_end` : bottom-most included y coordinate
 
 Check [Hello, Canvas!](GLIMMER_SAMPLES.md#hello-canvas) for an example.
 
@@ -2165,12 +2171,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.

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

@@ -19,6 +19,7 @@
 # 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/data_binding/observable_model'
 require 'glimmer/swt/properties'
 require 'glimmer/swt/custom/shape'
 require 'bigdecimal'

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

@@ -1,3 +1,24 @@
+# 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/ui/custom_widget'
 
 module Glimmer

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

@@ -240,6 +240,45 @@ module Glimmer
           end
         end
         
+        # rotates shape for an angle around its center
+        # this operation is not cumulative (it resets angle every time)
+        # consumers may inspect corresponding rotation_angle attribute to know which angle the shape is currently at for convenience
+        # this overrides any pre-existing transforms that are applied to shape
+        def rotate(angle)
+          half_width = calculated_width/2.0
+          half_height = calculated_height/2.0
+          self.transform = Glimmer::SWT::TransformProxy.new(self).translate(half_width, half_height).rotate(angle).translate(-1.0*half_width, -1.0*half_height)
+          @rotation_angle = angle
+        end
+        
+        # returns rotation angle
+        # consumers may inspect rotation_angle attribute to know which angle the shape is rotated at via rotate method
+        # it is not guaranteed to give the right result if a transform is applied outside of rotate method.
+        # starts at 0
+        def rotation_angle
+          @rotation_angle.to_f
+        end
+        
+        def center_x
+          center_x_dependencies = [x_end, calculated_width]
+          if center_x_dependencies != @center_x_dependencies
+            @center_x_dependencies = center_x_dependencies
+            the_x_end, the_calculated_width = center_x_dependencies
+            @center_x = the_x_end - the_calculated_width/2.0
+          end
+          @center_x
+        end
+        
+        def center_y
+          center_y_dependencies = [y_end, calculated_height]
+          if center_y_dependencies != @center_y_dependencies
+            @center_y_dependencies = center_y_dependencies
+            the_y_end, the_calculated_height = center_y_dependencies
+            @center_y = the_y_end - the_calculated_height/2.0
+          end
+          @center_y
+        end
+        
         def content(&block)
           Glimmer::SWT::DisplayProxy.instance.auto_exec do
             Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::ShapeExpression.new, @name, &block)
@@ -936,7 +975,7 @@ module Glimmer
           @x_end
         end
         
-        # right-most y coordinate in this shape (adding up its height and location)
+        # bottom-most y coordinate in this shape (adding up its height and location)
         def y_end
           y_end_dependencies = [calculated_height, default_y?, !default_y? && y]
           if y_end_dependencies != @y_end_dependencies

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

@@ -25,6 +25,7 @@ require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/transform_proxy'
+require 'glimmer/swt/image_proxy'
 
 module Glimmer
   module SWT
@@ -69,11 +70,15 @@ module Glimmer
           end
           
           def width
-            dest_width || image.bounds.width
+            dest_width || image_proxy.bounds.width
           end
           
           def height
-            dest_height || image.bounds.height
+            dest_height || image_proxy.bounds.height
+          end
+          
+          def image_proxy
+            ImageProxy.create(image)
           end
           
           def default_x?

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_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.9.1
+  version: 4.20.11.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -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