glimmer-dsl-swt 4.18.5.1 → 4.18.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3086c3823faac7765ca33e069111da2f027462fc9d09a2a9799a2ff094d6692
-  data.tar.gz: be7070377808b55cfa4bde48543b8a98fdff77205c9db0c07d0f4ac42078e00e
+  metadata.gz: 03f0ab47e7617c3d595a737c755ddc05e877074fb9139cacca042c6c31f7999e
+  data.tar.gz: f80117653d4ce70cfde372cbe660ab4d0a7ae181a24df76c79226fcb43c68549
 SHA512:
-  metadata.gz: 79e966ac5b7c342d8a9b936387e59f299f4895ae93c01600f8289cc06448b4d90beb0bd6e24073728d7a379172e1513b3cdf05fb3cdd4361ee08bd337870f491
-  data.tar.gz: 3c89781755c57a6cfc2990d85352bb37674e41a8d2f55f50c26c0d44f948ab26342b58bc98fcc9f93818cf19036ea0032a84b1565397abc7b7aa93a029b8c851
+  metadata.gz: a543129ea30b6a18306341b9fad1f62a36f919d83cedc27ea5b6e62c18e13827b28e05cbb01c81e0d8639d5412aeb6ba2e81de60e4c7f0ba5052b474eb07b7f3
+  data.tar.gz: 8d757538764f6018a381bcc68583b2d2660d23c9a2f8f1b15c90ad904b84316b1a4e61197f1f618a2bb42ad5d2114cc087e9aaebe1538514a24b330bdf8ce44f

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+### 4.18.5.2
+
+- Support checking if an `arc` shape accurately includes a point x,y coordinates within pie region only
+- Support checking if an `oval` shape includes a point x,y coordinates in oval region only (not its rectangular region)
+- Support checking if a `focus` shape includes a point x,y coordinates
+- Support checking point inclusion differently in drawed vs filled Rectangle (only check the drawn border when not filled)
+- Support checking point inclusion differently in drawed vs filled Oval (only check the drawn border when not filled)
+- Support checking point inclusion differently in drawed vs filled Arc (only check the drawn border when not filled)
+- Support `#include?(x, y)` and `#contain?(x, y)` methods in `text` shape
+- Fix point inclusion check for polyline
+- Fix issue with `polygon` check if it includes a point x,y coordinates (replace with available `java.awt` robust geometry algorithms)
+- Fix issue with transforms not working after the latest changes
+
 ### 4.18.5.1
 
 - Hello, Color Dialog! Sample

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.18.5.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.18.5.2
 ## 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)
@@ -342,7 +342,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.5.1
+jgem install glimmer-dsl-swt -v 4.18.5.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -360,7 +360,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.18.5.1'
+gem 'glimmer-dsl-swt', '~> 4.18.5.2'
 ```
 
 And, then run:
@@ -404,11 +404,16 @@ Glimmer configuration may be done via the `Glimmer::Config` module.
 
 ## Samples
 
-See a listing of Glimmer DSL for SWT samples over here, including screenshots and explanations of what each sample demonstrates:
+See a listing of samples over here, including screenshots and explanations of what each sample demonstrates:
 
 [docs/reference/GLIMMER_SAMPLES.md](docs/reference/GLIMMER_SAMPLES.md)
 
-Check the [samples](samples) directory in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer-dsl-swt` gem first and then use the `glimmer samples` command to run it (alternatively, you may clone the repo, follow [CONTRIBUTING.md](CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer`).
+Check the [samples](samples) directory in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer-dsl-swt` gem first and then run:
+```
+glimmer samples
+```
+ 
+(alternatively, you may clone the repo, follow [CONTRIBUTING.md](CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer`)
 
 ![Glimmer Meta-Sample](/images/glimmer-meta-sample.png)
 

data/VERSION

@@ -1 +1 @@
-4.18.5.1
+4.18.5.2

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1387,7 +1387,7 @@ https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/
 
 Glimmer supports drawing graphics directly on a `canvas` widget via SWT (or any widget for that matter though `canvas` is recommended for drawing).
 
-`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 that need it (Windows & Linux) 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)`)
 
 This is accomplished via the Shape DSL a sub-DSL of the Glimmer GUI DSL, which makes it possible to draw graphics declaratively with very understandable and maintainable syntax.
 
@@ -1404,9 +1404,10 @@ Shape keywords and their args (including defaults) are listed below (they basica
 - `rectangle(x, y, width, height, fill: false)` standard rectangle, which can be optionally filled
 - `rectangle(x, y, width, height, arcWidth = 60, arcHeight = 60, fill: false, round: true)` round rectangle, which can be optionally filled, and takes optional extra round angle arguments
 - `rectangle(x, y, width, height, vertical = true, fill: true, gradient: true)` gradient rectangle, which is always filled, and takes an optional extra argument to specify true for vertical gradient (default) and false for horizontal gradient
-- `text(string, x, y, flags = nil)` text with optional flags (flag format is `swt(comma_separated_flags)` where flags can be :draw_delimiter (i.e. new lines), :draw_tab, :draw_mnemonic, and :draw_transparent as explained in [GC API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html))
+- `text(string, x, y, is_transparent = true)` text with optional is_transparent to indicate if background is transparent (default is true)
+- `text(string, x, y, flags)` text with optional flags (flag format is `swt(comma_separated_flags)` where flags can be :draw_delimiter (i.e. new lines), :draw_tab, :draw_mnemonic, and :draw_transparent as explained in [GC API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html))
 
-Shape keywords that can be filled with color can take an keyword argument `fill: true`. Defaults to false when not specified unless background is set with no foreground (or foreground is set with no background), in which case a smart default is applied.
+Shape keywords that can be filled with color can take a keyword argument `fill: true`. Defaults to false when not specified unless background is set with no foreground (or foreground is set with no background), in which case a smart default is applied.
 Smart defaults can be applied to automatically infer `gradient: true` (rectangle with both foreground and background) and `round: true` (rectangle with more than 4 args, the extra args are numeric) as well.
 
 Optionally, a shape keyword takes a block that can set any attributes from [org.eclipse.swt.graphics.GC](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html) (methods starting with `set`), which enable setting the `background` for filling and `foreground` for drawing.
@@ -1473,6 +1474,110 @@ Screenshot:
 
 ![Canvas Animation Example](/images/glimmer-example-canvas.png)
 
+The round and gradient options could be dropped since Glimmer DSL for SWT supports auto-inference of them based on shape parameters.
+
+Example (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
+
+```ruby
+include Glimmer
+
+# image object has to be declared outside the canvas and shell to avoid confusing with canvas image property
+image_object = image(File.expand_path('./icons/scaffold_app.png'), width: 100)
+
+shell {
+  text 'Canvas Example'
+  minimum_size 320, 400
+
+  canvas {
+    background :dark_yellow
+    rectangle(0, 0, 220, 400) {
+      background :dark_red
+    }
+    rectangle(50, 20, 300, 150, 30, 50) {
+      background :yellow
+    }
+    rectangle(150, 200, 100, 70, true) {
+      background :dark_red
+      foreground :yellow
+    }
+    text('Glimmer', 208, 83) {
+      font height: 25, style: :bold
+    }
+    rectangle(200, 80, 108, 36) {
+      foreground :black
+      line_width 3
+    }
+    image(image_object, 70, 50)
+  }
+}.open
+```
+
+Notice how the shape declaration parameters perfectly match the method parameters in the [SWT org.eclipse.swt.graphics.GC API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html). This is useful for developers coming to Glimmer DSL for SWT from SWT.
+
+Of course, Glimmer DSL for SWT still supports an alternative syntax that is more declarative and consistent with the rest of the Glimmer GUI DSL syntax. This syntax in fact offers the extra-benefit of data-binding for shape parameter values (meaning you could use `bind(...)` syntax with them instead of setting values directly)
+
+Example (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
+
+```ruby
+include Glimmer
+
+# image object has to be declared outside the canvas and shell to avoid confusing with canvas image property
+image_object = image(File.expand_path('./icons/scaffold_app.png'), width: 100)
+
+shell {
+  text 'Canvas Example'
+  minimum_size 320, 400
+
+  canvas {
+    background :dark_yellow
+    rectangle {
+      x 0
+      y 0
+      width 220
+      height 400
+      background :dark_red
+    }
+    rectangle {
+      x 50
+      x 20
+      width 300
+      height 150
+      arc_width 30
+      arc_height 50
+      background :yellow
+    }
+    rectangle {
+      x 150
+      y 200
+      width 100
+      height 70
+      vertical true
+      background :dark_red
+      foreground :yellow
+    }
+    text {
+      string 'Glimmer'
+      x 208
+      y 83
+      font height: 25, style: :bold
+    }
+    rectangle {
+      x 200
+      y 80
+      width 108
+      height 36
+      foreground :black
+      line_width 3
+    }
+    image {
+      image image_object
+      x 70
+      y 50
+    }
+  }
+}.open
+```
+
 Learn more at the [Hello, Canvas! Sample](GLIMMER_SAMPLES.md#hello-canvas).
 
 If you ever have special needs or optimizations, you could always default to direct SWT painting via [org.eclipse.swt.graphics.GC](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html) instead. Learn more at the [SWT Graphics Guide](https://www.eclipse.org/articles/Article-SWT-graphics/SWT_graphics.html) and [SWT Image Guide](https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html#Saving%20Images).
@@ -1619,8 +1724,11 @@ shell {
 
 These Canvas Shape API methods help with manipulating shapes upon user interaction, such as mouse clicking a specific shape.
 
+They are implemented with the help of the highly robust Java built-in shape geometry algorithms.
+
 - `WidgetProxy#shape_at_location(x, y)` : returns shape object at x, y location from a widget proxy like canvas
-- `Shape#include?(x, y)` : indicates if shape includes x, y point (`arc` and `oval` shapes currently include their entire rectangular region in their checks, `text` shapes always return false)
+- `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
 
 Check [Hello, Canvas!](GLIMMER_SAMPLES.md#hello-canvas) for an example.
@@ -1963,7 +2071,7 @@ If there is anything missing you would like added to the Glimmer Animation DSL t
 
 Animation could be alternatively implemented without the `animation` keyword through a loop that invokes model methods inside `sync_exec {}` (or `async_exec {}`), which indirectly cause updates to the GUI via data-binding.
 
-The [Glimmer Tetris](#tetris) sample provides a good example of that.
+The [Glimmer Tetris](GLIMMER_SAMPLES.md#tetris) sample provides a good example of that.
 
 ### Data-Binding
 
@@ -2324,7 +2432,7 @@ shell {
 }
 ```
 
-Check out [Hello, Table!](#hello-table) for an actual example including table editors.
+Check out [Hello, Table!](GLIMMER_SAMPLES.md#hello-table) for an actual example including table editors.
 
 [Are We There Yet?](#are-we-there-yet) is an actual production Glimmer application that takes full advantage of table capabilities, storing model data in a database via ActiveRecord. As such, it's an excellent demonstration of how to use Glimmer DSL for SWT with a database.
 
@@ -2332,7 +2440,7 @@ Check out [Hello, Table!](#hello-table) for an actual example including table ed
 
 Glimmer automatically adds sorting support to the SWT `Table` widget.
 
-Check out the [Contact Manager](#contact-manager) sample for an example.
+Check out the [Contact Manager](GLIMMER_SAMPLES.md#contact-manager) sample for an example.
 You may click on any column and it will sort by ascending order first and descending if you click again.
 
 Glimmer automatic table sorting supports `String`, `Integer`, and `Float` columns out of the box as well as any column data that is comparable.
@@ -2454,7 +2562,7 @@ You can data-bind any of these properties:
 - `minutes bind(model, :property)`: produces an integer
 - `seconds bind(model, :property)`: produces an integer
 
-Learn more at the [Hello, Date Time!](#hello-date-time) sample.
+Learn more at the [Hello, Date Time!](GLIMMER_SAMPLES.md#hello-date-time) sample.
 
 If you need a better widget with the ability to customize the date format pattern, check out the [Nebula CDateTime Glimmer Custom Widget](https://github.com/AndyObtiva/glimmer-cw-cdatetime-nebula)
 
@@ -2840,7 +2948,7 @@ The `checkboxes` property returns the list of nested `checkbox` widgets.
 
 When data-binding `selection`, the model property should have a matching property with `_options` suffix (e.g. `activities_options` for `activities`) to provide an `Array` of `String` objects for `checkbox` buttons.
 
-You may see an example at the [Hello, Checkbox Group!](#hello-checkbox-group) sample.
+You may see an example at the [Hello, Checkbox Group!](GLIMMER_SAMPLES.md#hello-checkbox-group) sample.
 
 ![Hello Checkbox Group](/images/glimmer-hello-checkbox-group.png)
 
@@ -2875,7 +2983,7 @@ radio_group { |radio_group_proxy|
 # ...
 ```
 
-You may see another example at the [Hello, Radio Group!](#hello-radio-group) sample.
+You may see another example at the [Hello, Radio Group!](GLIMMER_SAMPLES.md#hello-radio-group) sample.
 
 ##### Code Text Custom Widget
 
@@ -3147,7 +3255,7 @@ This adds some default keyboard shortcuts:
 
 If you prefer it to be vanilla with no default key event listeners, then pass the `default_behavior: false` option.
 
-Learn more at [Hello, Code Text!](#hello-code-text)
+Learn more at [Hello, Code Text!](GLIMMER_SAMPLES.md#hello-code-text)
 
 ##### Video Custom Custom Widget
 

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.5.1 ruby lib
+# stub: glimmer-dsl-swt 4.18.5.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.5.1"
+  s.version = "4.18.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-02-23"
+  s.date = "2021-02-24"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]

data/lib/glimmer/dsl/swt/shape_expression.rb

@@ -32,7 +32,7 @@ module Glimmer
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::SWT::Custom::Drawable) and
+          (parent.is_a?(Glimmer::SWT::Custom::Drawable) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
             Glimmer::SWT::Custom::Shape.valid?(parent, keyword, *args, &block)
         end
         

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

@@ -38,6 +38,13 @@ module Glimmer
           @image_buffered_shapes ||= []
         end
         
+        # Returns shapes expanded with regards to nested shapes
+        def expand_shapes(shapes)
+          # TODO
+        end
+        
+        # TODO add a method like shapes that specifies drawable_properties to be able to adjust properties like transform in between shapes
+          
         def shape_at_location(x, y)
           shapes.reverse.detect {|shape| shape.include?(x, y)}
         end

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

@@ -34,8 +34,6 @@ module Glimmer
       class Shape
         include Packages
         include Properties
-        # TODO support textExtent sized shapes nested within text/string
-        # TODO support a Pattern DSL for methods that take Pattern arguments
         
         class << self
           def create(parent, keyword, *args, &property_block)
@@ -100,15 +98,17 @@ module Glimmer
           end
         end
         
-        attr_reader :parent, :name, :args, :options
+        attr_reader :drawable, :parent, :name, :args, :options, :shapes
         
         def initialize(parent, keyword, *args, &property_block)
           @parent = parent
+          @drawable = @parent.is_a?(Drawable) ? @parent : @parent.drawable
           @name = keyword
           @options = self.class.arg_options(args, extract: true)
           @method_name = self.class.method_name(keyword, @options)
           @args = args
           @properties = {}
+          @shapes = [] # nested shapes
           @options.reject {|key, value| %w[fill gradient round].include?(key.to_s)}.each do |property, property_args|
             @properties[property] = property_args
           end
@@ -116,13 +116,19 @@ module Glimmer
           post_add_content if property_block.nil?
         end
         
+        def add_shape(shape)
+          @shapes << shape
+        end
+        
         def draw?
           !fill?
         end
+        alias drawn? draw?
         
         def fill?
           @options[:fill]
         end
+        alias filled? fill?
         
         def gradient?
           @options[:gradient]
@@ -132,24 +138,32 @@ module Glimmer
           @options[:round]
         end
         
-        # subclasses (like polygon) may override to indicate if a point x,y coordinates fall inside the shape
-        # has a default implementation for rectangle and oval
+        # subclasses (like polygon) may override to indicate if a point x,y coordinates falls inside the shape
+        # some shapes may choose to provide a fuzz factor to make usage of this method for mouse clicking more user friendly
+        def contain?(x, y)
+          # assume a rectangular filled shape by default (works for several shapes like image, text, and focus)
+          if respond_to?(:x) && respond_to?(:y) && respond_to?(:width) && respond_to?(:height) && self.x && self.y && width && height
+            x.between?(self.x, self.x + width) && y.between?(self.y, self.y + height)
+          else
+            false # subclasses must provide implementation
+          end
+        end
+        
+        # subclasses (like polygon) may override to indicate if a point x,y coordinates falls on the edge of a drawn shape or inside a filled shape
+        # some shapes may choose to provide a fuzz factor to make usage of this method for mouse clicking more user friendly
         def include?(x, y)
-          case @name
-          when 'rectangle', 'oval', 'arc'
-            self_x = self.x
-            self_y = self.y
-            width = self.width
-            height = self.height
-            x.between?(self_x, self_x + width) && y.between?(self_y, self_y + height)
+          # assume a rectangular shape by default
+          if respond_to?(:x) && respond_to?(:y) && respond_to?(:width) && respond_to?(:height)
+            contain?(x, y)
           else
-            false
+            false # subclasses must provide implementation
           end
         end
         
+        # moves by x delta and y delta. Subclasses must implement
+        # provdies a default implementation that assumes moving x and y is sufficient by default (not for polygons though, which must override)
         def move_by(x_delta, y_delta)
-          case @name
-          when 'rectangle', 'oval', 'arc'
+          if respond_to?(:x) && respond_to?(:y) && x && y
             self.x += x_delta
             self.y += y_delta
           end
@@ -166,7 +180,7 @@ module Glimmer
         def post_add_content
           unless @content_added
             amend_method_name_options_based_on_properties!
-            @parent.setup_shape_painting unless @parent.is_a?(ImageProxy)
+            @drawable.setup_shape_painting unless @drawable.is_a?(ImageProxy)
             @content_added = true
           end
         end
@@ -180,7 +194,7 @@ module Glimmer
           if ['setBackground', 'setForeground'].include?(method_name.to_s) && args.first.is_a?(Array)
             args[0] = ColorProxy.new(args[0])
           end
-          if args.first.is_a?(Symbol) || args.first.is_a?(String)
+          if args.first.is_a?(Symbol) || args.first.is_a?(::String)
             if the_java_method.parameter_types.first == Color.java_class
               args[0] = ColorProxy.new(args[0])
             end
@@ -201,11 +215,11 @@ module Glimmer
             args[0] = args[0].swt_transform
           end
           if ['setBackgroundPattern', 'setForegroundPattern'].include?(method_name.to_s)
-            @parent.requires_shape_disposal = true
+            @drawable.requires_shape_disposal = true
             args = args.first if args.first.is_a?(Array)
             args.each_with_index do |arg, i|
               arg = ColorProxy.new(arg.red, arg.green, arg.blue) if arg.is_a?(RGB)
-              arg = ColorProxy.new(arg) if arg.is_a?(Symbol) || arg.is_a?(String)
+              arg = ColorProxy.new(arg) if arg.is_a?(Symbol) || arg.is_a?(::String)
               arg = arg.swt_color if arg.is_a?(ColorProxy)
               args[i] = arg
             end
@@ -229,7 +243,7 @@ module Glimmer
             @args[1..-1] = []
           end
           if @name == 'image'
-            if @args.first.is_a?(String)
+            if @args.first.is_a?(::String)
               @args[0] = ImageProxy.new(@args[0])
             end
             if @args.first.is_a?(ImageProxy)
@@ -240,7 +254,7 @@ module Glimmer
             end
           end
           if @name == 'text'
-            if @args[3].is_a?(Symbol) || @args[3].is_a?(String)
+            if @args[3].is_a?(Symbol) || @args[3].is_a?(::String)
               @args[3] = [@args[3]]
             end
             if @args[3].is_a?(Array)
@@ -256,12 +270,12 @@ module Glimmer
           if @name.include?('rectangle') && round? && @args.size.between?(4, 5)
             (6 - @args.size).times {@args << 60}
           elsif @name.include?('rectangle') && gradient? && @args.size == 4
-            @args << true
-          elsif (@name.include?('text') || @name.include?('String')) && !@properties.keys.map(&:to_s).include?('background') && @args.size == 3
-            @args << true
+            @args << true # vertical is true by default
+          elsif (@name.include?('text') || @name.include?('string')) && !@properties.keys.map(&:to_s).include?('background') && @args.size == 3
+            @args << true # is_transparent is true by default
           end
           if @name.include?('image')
-            @parent.requires_shape_disposal = true
+            @drawable.requires_shape_disposal = true
             if @args.size == 1
               @args[1] = 0
               @args[2] = 0
@@ -282,7 +296,7 @@ module Glimmer
         
         def amend_method_name_options_based_on_properties!
           return if @name == 'point'
-          if @name != 'text' && has_some_background? && !has_some_foreground?
+          if @name != 'text' && @name != 'string' && has_some_background? && !has_some_foreground?
             @options[:fill] = true
           elsif !has_some_background? && has_some_foreground?
             @options[:fill] = false
@@ -328,15 +342,16 @@ module Glimmer
           else
             @properties[ruby_attribute_getter(attribute_name)] = args
           end
-          if @content_added && !@parent.is_disposed
+          if @content_added && !@drawable.is_disposed
             @calculated_paint_args = false
-            @parent.redraw
+            @drawable.redraw
           end
         end
         
         def get_attribute(attribute_name)
           if parameter_name?(attribute_name)
-            @args[parameter_index(attribute_name)]
+            arg_index = parameter_index(attribute_name)
+            @args[arg_index] if arg_index
           else
             @properties.symbolize_keys[attribute_name.to_s.to_sym]
           end
@@ -405,6 +420,7 @@ module Glimmer
               args.first.swt_transform.dispose
             end
           end
+          self.extent = paint_event.gc.send("#{@name}Extent", *(([string, flags] if respond_to?(:flags)).compact)) if ['text', 'string'].include?(@name)
           paint_event.gc.send(@method_name, *@args)
         rescue => e
           Glimmer::Config.logger.error {"Error encountered in painting shape: #{self.inspect}"}
@@ -420,7 +436,7 @@ module Glimmer
                 if @properties[:foreground].is_a?(Array)
                   @properties[:foreground] = ColorProxy.new(@properties[:foreground], ensure_bounds: false)
                 end
-                if @properties[:foreground].is_a?(Symbol) || @properties[:foreground].is_a?(String)
+                if @properties[:foreground].is_a?(Symbol) || @properties[:foreground].is_a?(::String)
                  @properties[:foreground] = ColorProxy.new(@properties[:foreground], ensure_bounds: false)
                 end
                 if @properties[:foreground].is_a?(ColorProxy)
@@ -428,14 +444,14 @@ module Glimmer
                 end
               end
             else
-              @properties['background'] = [@parent.background] if fill? && !has_some_background?
-              @properties['foreground'] = [@parent.foreground] if @parent.respond_to?(:foreground) && draw? && !has_some_foreground?
+              @properties['background'] = [@drawable.background] if fill? && !has_some_background?
+              @properties['foreground'] = [@drawable.foreground] if @drawable.respond_to?(:foreground) && draw? && !has_some_foreground?
               # TODO regarding alpha, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes
               @properties['alpha'] ||= [255]
-              @properties['font'] = [@parent.font] if @parent.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
+              @properties['font'] = [@drawable.font] if @drawable.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
               # TODO regarding transform, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes
               # Also do that with all future-added properties
-              @properties['transform'] = [nil] if @parent.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
+              @properties['transform'] = [nil] if @drawable.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
               @properties.each do |property, args|
                 method_name = attribute_setter(property)
                 converted_args = apply_property_arg_conversions(method_name, property, args)

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

@@ -36,6 +36,23 @@ module Glimmer
           def parameter_names
             [:x, :y, :width, :height, :start_angle, :arc_angle]
           end
+          
+          # checks if shape contains the point denoted by x and y
+          def contain?(x, y)
+            shape_geometry = java.awt.geom.Arc2D::Double.new(self.x, self.y, width, height, start_angle, arc_angle, java.awt.geom.Arc2D::PIE)
+            shape_geometry.contains(x, y)
+          end
+          
+          def include?(x, y)
+            if filled?
+              contain?(x, y)
+            else
+              # give it some fuzz to allow a larger region around the drawn oval to accept including a point (helps with mouse clickability on a shape)
+              outer_shape_geometry = java.awt.geom.Arc2D::Double.new(self.x, self.y, width + 3, height + 3, start_angle, arc_angle, java.awt.geom.Arc2D::PIE)
+              inner_shape_geometry = java.awt.geom.Arc2D::Double.new(self.x, self.y, width - 3, height - 3, start_angle, arc_angle, java.awt.geom.Arc2D::PIE)
+              outer_shape_geometry.contains(x, y) && !inner_shape_geometry.contains(x, y)
+            end
+          end
         end
       end
     end

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

@@ -29,9 +29,9 @@ require 'glimmer/swt/transform_proxy'
 module Glimmer
   module SWT
     module Custom
-      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
-      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
       class Shape
+        # Represents a focus shape to be drawn on a control/widget/canvas/display
+        # Helps highlight focus on another selected shape
         class Focus < Shape
           def parameter_names
             [:x, :y, :width, :height]

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

@@ -62,13 +62,26 @@ module Glimmer
             end
           end
           
+          def x
+            dest_x || get_attribute('x')
+          end
+          
+          def y
+            dest_y || get_attribute('y')
+          end
+          
+          def width
+            dest_width || image.bounds.width
+          end
+          
+          def height
+            dest_height || image.bounds.height
+          end
+          
           def include?(x, y)
-            self_x = dest_x || self.x
-            self_y = dest_y || self.y
-            width = dest_width || image.bounds.width
-            height = dest_height || image.bounds.height
-            x.between?(self_x, self_x + width) && y.between?(self_y, self_y + height)
+            x.between?(self.x, self.x + width) && y.between?(self.y, self.y + height)
           end
+          alias contain? include?
             
           def move_by(x_delta, y_delta)
             if dest_x

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

@@ -33,17 +33,24 @@ module Glimmer
       # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
       class Shape
         class Line < Shape
+          class << self
+            def include?(x1, y1, x2, y2, x, y)
+              distance1 = Math.sqrt((x - x1)**2 + (y - y1)**2)
+              distance2 = Math.sqrt((x2 - x)**2 + (y2 - y)**2)
+              distance = Math.sqrt((x2 - x1)**2 + (y2 - y1)**2)
+              (distance1 + distance2).to_i == distance.to_i
+            end
+          end
+        
           def parameter_names
             [:x1, :y1, :x2, :y2]
           end
           
           def include?(x, y)
             # TODO must account for line width
-            distance1 = Math.sqrt((x - x1)**2 + (y - y1)**2)
-            distance2 = Math.sqrt((x2 - x)**2 + (y2 - y)**2)
-            distance = Math.sqrt((x2 - x1)**2 + (y2 - y1)**2)
-            (distance1 + distance2).to_i == distance.to_i
+            Line.include?(x1, y1, x2, y2, x, y)
           end
+          alias contain? include?
             
           def move_by(x_delta, y_delta)
             self.x1 += x_delta

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

@@ -36,6 +36,24 @@ module Glimmer
           def parameter_names
             [:x, :y, :width, :height]
           end
+          
+          # checks if shape contains the point denoted by x and y
+          def contain?(x, y)
+            shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.x, self.y, width, height)
+            shape_geometry.contains(x, y)
+          end
+          
+          # checks if drawn or filled oval includes the point denoted by x and y (if drawn, it only returns true if point lies on the edge)
+          def include?(x, y)
+            if filled?
+              contain?(x, y)
+            else
+              # give it some fuzz to allow a larger region around the drawn oval to accept including a point (helps with mouse clickability on a shape)
+              outer_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.x - 3, self.y - 3, width + 6, height + 6)
+              inner_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.x + 3, self.y + 3, width - 6, height - 6)
+              outer_shape_geometry.contains(x, y) && !inner_shape_geometry.contains(x, y)
+            end
+          end
         end
       end
     end

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

@@ -38,8 +38,10 @@ module Glimmer
           end
           
           def include?(x, y)
+            # give it some fuzz (helps makes mouse clicking easier)
             x.to_i.between?(self.x.to_i - 2, self.x.to_i + 2) && y.to_i.between?(self.y.to_i - 2, self.y.to_i + 2)
           end
+          alias contain? include?
           
           def move_by(x_delta, y_delta)
             self.x += x_delta

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

@@ -37,30 +37,30 @@ module Glimmer
             [:point_array]
           end
           
-          def size
-            point_array.size / 2
+          def point_count
+            point_array.count / 2
           end
           
           def [](index)
-            index = 0 if index == size
+            index = 0 if index == point_count
             org.eclipse.swt.graphics.Point.new(point_array[index * 2], point_array[index * 2 + 1])
           end
           
+          def x_array
+            point_array.each_with_index.select {|pair| pair.last.even?}.map(&:first)
+          end
+          
+          def y_array
+            point_array.each_with_index.select {|pair| pair.last.odd?}.map(&:first)
+          end
+          
+          def point_xy_array
+            x_array.zip(y_array)
+          end
+          
           def include?(x, y)
-            c = false
-            i = -1
-            j = self.size
-            while (i += 1) < (self.size + 1)
-              if ((self[i].y <= y && y < self[j].y) ||
-                 (self[j].y <= y && y < self[i].y))
-                if (x < (self[j].x - self[i].x) * (y - self[i].y) /
-                              (self[j].y - self[i].y) + self[i].x)
-                  c = !c
-                end
-                j = i
-              end
-            end
-            c
+            shape_geometry = java.awt.Polygon.new(x_array.to_java(:int), y_array.to_java(:int), point_count)
+            shape_geometry.contains(x, y)
           end
           
           def move_by(x_delta, y_delta)

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

@@ -37,30 +37,31 @@ module Glimmer
             [:point_array]
           end
           
-          def size
-            point_array.size / 2
+          def point_count
+            point_array.count / 2
+          end
+          
+          def x_array
+            point_array.each_with_index.select {|pair| pair.last.even?}.map(&:first)
+          end
+          
+          def y_array
+            point_array.each_with_index.select {|pair| pair.last.odd?}.map(&:first)
+          end
+          
+          def point_xy_array
+            x_array.zip(y_array)
           end
           
           def [](index)
-            index = 0 if index == size
+            index = 0 if index == point_count
             org.eclipse.swt.graphics.Point.new(point_array[index * 2], point_array[index * 2 + 1])
           end
           
           def include?(x, y)
-            c = false
-            i = -1
-            j = self.size
-            while (i += 1) < (self.size + 1)
-              if ((self[i].y <= y && y < self[j].y) ||
-                 (self[j].y <= y && y < self[i].y))
-                if (x < (self[j].x - self[i].x) * (y - self[i].y) /
-                              (self[j].y - self[i].y) + self[i].x)
-                  c = !c
-                end
-                j = i
-              end
-            end
-            c
+            comparison_lines = point_xy_array.zip(point_xy_array.rotate(1))
+            comparison_lines.pop # ignore last pair since you don't want to compare last point with first point
+            comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
           end
           
           def move_by(x_delta, y_delta)

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

@@ -80,6 +80,20 @@ module Glimmer
             end
           end
           
+          def point_xy_array
+            [[x, y], [x + width, y], [x + width, y + height], [x, y + height]]
+          end
+          
+          # checks if drawn or filled rectangle includes the point denoted by x and y (if drawn, it only returns true if point lies on the edge)
+          def include?(x, y)
+            if filled?
+              contain?(x, y)
+            else
+              comparison_lines = point_xy_array.zip(point_xy_array.rotate(1))
+              comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
+            end
+          end
+          
         end
       end
     end

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

@@ -33,6 +33,8 @@ module Glimmer
       # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
       class Shape
         class Text < Shape
+          attr_accessor :extent
+        
           def parameter_names
             @parameter_names || text_parameter_names
           end
@@ -43,15 +45,15 @@ module Glimmer
           end
           
           def text_parameter_names
-            [:text, :x, :y]
+            [:string, :x, :y]
           end
           
           def text_transparent_parameter_names
-            [:text, :x, :y, :is_transparent]
+            [:string, :x, :y, :is_transparent]
           end
           
           def text_flags_parameter_names
-            [:text, :x, :y, :flags]
+            [:string, :x, :y, :flags]
           end
           
           def set_parameter_attribute(attribute_name, *args)
@@ -66,7 +68,17 @@ module Glimmer
             super
           end
           
+          def width
+            extent&.x
+          end
+          
+          def height
+            extent&.y
+          end
+          
         end
+        
+        String = Text
       end
     end
   end

data/lib/glimmer/swt/transform_proxy.rb

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/display_proxy'
-require 'glimmer/swt/properties'
+require 'glimmer/swt/proxy_properties'
 require 'glimmer/swt/custom/shape'
 
 module Glimmer
@@ -29,7 +29,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TransformProxy
-      include Properties
+      include ProxyProperties
       
       include_package 'org.eclipse.swt.graphics'
       include_package 'org.eclipse.swt.widgets'
@@ -80,12 +80,28 @@ module Glimmer
         @swt_transform
       end
       
+      def has_attribute?(attribute_name, *args)
+        Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.respond_to?(attribute_name) } || super
+      end
+
+      def set_attribute(attribute_name, *args)
+        if @swt_transform.respond_to?(attribute_name)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(attribute_name, *args) }
+        else
+          super
+        end
+      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
       rescue => e
-        Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{@swt_transform.class.name} can handle the method ##{method}"}
-        super
+        begin
+          super
+        rescue Exception => inner_e
+          Glimmer::Config.logger.error {"Neither TransformProxy nor #{@swt_transform.class.name} can handle the method ##{method}"}
+          Glimmer::Config.logger.error {e.full_message}
+        end
       end
       
       def respond_to?(method, *args, &block)

data/lib/glimmer/swt/widget_proxy.rb

@@ -50,7 +50,7 @@ module Glimmer
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
         'button'              => [:push],
-        'canvas'              => ([:double_buffered] if OS.windows?),
+        'canvas'              => ([:double_buffered] unless OS.mac?),
         'checkbox'            => [:check],
         'check'               => [:check],
         'drag_source'         => [:drop_copy],

data/samples/hello/hello_canvas.rb

@@ -36,8 +36,6 @@ class HelloCanvas
       @canvas = canvas {
         background :yellow
         rectangle(0, 0, 220, 400) {
-          transform {
-          }
           background :red
         }
         rectangle(50, 20, 300, 150, 30, 50) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.5.1
+  version: 4.18.5.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement