glimmer-dsl-swt 4.18.5.3 → 4.18.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf07c3a7c6f534f4082330369a0bacac2593675506da814ec68e70446ec02b9
-  data.tar.gz: ff2983c28283b30b4f7f9e6bdf9cc0bad3768331014ef281ff5397726851b39d
+  metadata.gz: 6d4f89641fcc2573b43cd52e23cf4dda45aa209e55cd49cbe751f6a4b7bc85b1
+  data.tar.gz: 9cf53e2b5aef11f838314b50188f63b3a69936ea31f54930da77bddfd561b08e
 SHA512:
-  metadata.gz: d89da48eb352e555e861032de5b5fee9c1e1ad3e7796c920e354b61b5fb1e2522fa1eafd89e363259ee9c3961ab4207a51ea483ef670e072c869fb1671fecccb
-  data.tar.gz: d267615568ac7e20ef8b5778df77cfe36f3de061ab9dd5c4e227b2ef08d5323a27bc6742f07728a84b0760a11f64bdad822c4468f1cf24049ac536919816548e
+  metadata.gz: 355fe3aab4e45648832678ce3a2c00411129be61bbff91575f4c19b73254a82ab9fa58ce6acbac78d6dca4daf383340cd074e6ec5ea6128bcdb37df94befe125
+  data.tar.gz: d30171ae846dc373fb4d58426bcdc64a179579c4f86ee749d16cb0a5f3440bc542305a91a1e0d5774b796e14750a1918ae4e8d3bb33b2eaff70da4fd3a7afff1

data/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Change Log
 
+### 4.18.6.2
+
+- Hello, Canvas Data Binding! Sample
+- Update Stock Ticker sample to keep stock names visible when scrolling graphs off the screen
+- `rgb` keyword tolerance of nil values (converts to 0)
+- Canvas Path DSL Data-Binding
+- Added `Glimmer::SWT::Custom::Shape::PathSegment` `#path` and `#root_path` API methods to enable determining what path/root-path the path segment is part of.
+- Fixed issues with geometry calculation of path segments (especially line)
+
+### 4.18.6.1
+
+- Fixed issues with Canvas Path DSL handling of connected vs non-connected path segments (including in geometry calculations)
+- Optimized Canvas Path DSL redraw performance by removing extra redraws
+- Fixed issues in the Hello, Canvas Path! sample and renamed to Stock Ticker
+- Added a new simpler Hello, Canvas Path! sample
+
+### 4.18.6.0
+
+- Canvas Path DSL support (Alpha) for `path` as drawn or filled (`fill: true`) to the Canvas Shape DSL, supporting `point`, `line` (first point is auto-derived from previous point if not specified)
+- Hello, Canvas Path! sample showing a Stock Ticker with line curves for multiple company stocks, animated with randomly generated data, moving to the left out of screen second by second. Has multiple tabs demonstrating different types of paths for graphing/charting of different real world business applications: point, line, quad, cubic.
+- Fix issue to allow invocation of `set_min_size` off of `scrolled_composite` proxy directly (not just swt_widget), thus taking advantage of implicit `auto_exec`
+- Support `Shape#content {}` method just like `WidgetProxy#content` to enable reopening and adding nested shapes at runtime after initial construction
+- Support a path containing a `quad` bezier curve with `point_array` property
+- Support a path containing a `cubic` bezier curve with `point_array` property
+
+### 4.18.5.5
+
+- Automatically recalculate default size (width/height) to accomodate nested shapes when changing x/y/width/height sticking out of parent from right or bottom.
+- Support special case of centering a nested shape with default x/y within a parent with default width/height calculated from nested shape
+- Consider Canvas Shape DSL support for LineAttributes `line_dash_offset` and `line_miter_limit`
+- Canvas Shape DSL Polygon `include?` does an outer/inner check of edge detection only
+- Ensure all Canvas Shape DSL properties are restored upon painting a shape to what they were prior to painting that shape
+- Fix issue with bringing high score dialog up in Tetris caused by latest dialog changes for supporting the new `color_dialog` and `font_dialog`
+
+### 4.18.5.4
+
+- Support passing width, height as :default (or nil or not passed in if they are the last args) in all shapes that include other shapes to indicate they are calculated automatically from nested shapes, text/string extent, or otherwise defaulting to 0, 0
+- Support [:default, width_delta], [:default, height_delta] attributes for width and height, which add/subtract from defaults used for shape
+- Switch from use of `:default` with x_delta/y_delta to passing `[:default, x_delta]` or `[:default, y_delta]` (e.g. `image(file, [:default, -30], :default)` for x = default - 30 and y = default + 0)
+- Support a bounding box for all shapes, implementing `#bounds` (x, y, width, and height) and `#size` (width, height) for the ones that don't receive as parameters (like polygon)
+
 ### 4.18.5.3
 
 - Support nesting shapes within shapes, with relative positioning (meaning x, y coordinates are assumed relative to parent's x, y in nested shapes)

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.3
+# [<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.6.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)
@@ -8,17 +8,15 @@
 
 **[Contributors Wanted! (Submit a Glimmer App Sample to Get Started)](#contributing)**
 
-[Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster JVM version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#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](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#widgets), but it also supports drawing Canvas Graphics like [Shapes](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl) and [Animations](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](docs/reference/GLIMMER_COMMAND.md#scaffolding) options for [Apps](#in-production), [Gems](docs/reference/GLIMMER_COMMAND.md#custom-shell-gem), and [Custom Widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](docs/reference/GLIMMER_COMMAND.md#packaging) on [Linux](https://www.linux.org/).
-
-[Glimmer receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer](https://rubygems.org/gems/glimmer) with your Ruby desktop GUI development needs. Please make [Glimmer](https://rubygems.org/gems/glimmer) even better by providing feedback and [contributing](#contributing) when possible.
-
-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.
-
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) versions 4.18.x.y come with [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020.
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for SWT is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster JVM version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#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](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#widgets), but it also supports drawing Canvas Graphics like [Shapes](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl) and [Animations](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](docs/reference/GLIMMER_COMMAND.md#scaffolding) options for [Apps](#in-production), [Gems](docs/reference/GLIMMER_COMMAND.md#custom-shell-gem), and [Custom Widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](docs/reference/GLIMMER_COMMAND.md#packaging) on [Linux](https://www.linux.org/).
 
 [<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.18.6.2 includes [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020. 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.
+
+[Glimmer DSL for SWT receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) with your Ruby desktop GUI development needs! [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) brings great ideas to the table, such as declarative programming via domain specific languages, currently under-utilized in the GUI domain. That said, it may not be feature complete enough for everybody's needs, so please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) even better by providing feedback and [contributing](#contributing) when possible. The project is very active, so any feature suggestions that are accepted could be implemented within weeks if not days. Also, you are welcome to [hire me](#hire-me) full-time if you want long-term development of [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) for your project needs.
+
 Glimmer DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
@@ -342,7 +340,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.5.3
+jgem install glimmer-dsl-swt -v 4.18.6.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -360,7 +358,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.3'
+gem 'glimmer-dsl-swt', '~> 4.18.6.2'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-4.18.5.3
+4.18.6.2

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -36,10 +36,12 @@ This guide should help you get started with Glimmer DSL for SWT. For more advanc
   - [Layouts](#layouts)
   - [Layout Data](#layout-data)
   - [Canvas Shape DSL](#canvas-shape-dsl)
+    - [Shapes inside a Shape](#shapes-inside-a-shape)
     - [Shapes inside a Widget](#shapes-inside-a-widget)
     - [Shapes inside an Image](#shapes-inside-an-image)
     - [Canvas Shape API](#canvas-shape-api)
     - [Pixel Graphics](#pixel-graphics)
+  - [Canvas Path DSL](#canvas-path-dsl)
   - [Canvas Transform DSL](#canvas-transform-dsl)
     - [Top-Level Transform Fluent Interface](#top-level-transform-fluent-interface)
   - [Canvas Animation DSL](#canvas-animation-dsl)
@@ -1403,7 +1405,7 @@ Shape keywords and their args (including defaults) are listed below (they basica
 - `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, 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))
+- `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 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.
@@ -1460,7 +1462,7 @@ shell {
       font height: 25, style: :bold
     }
     rectangle(200, 80, 108, 36) {
-      foreground :black
+      foreground rgb(0, 0, 0)
       line_width 3
     }
     image(image_object, 70, 50)
@@ -1506,7 +1508,7 @@ shell {
       font height: 25, style: :bold
     }
     rectangle(200, 80, 108, 36) {
-      foreground :black
+      foreground rgb(0, 0, 0)
       line_width 3
     }
     image(image_object, 70, 50)
@@ -1541,7 +1543,7 @@ shell {
     }
     rectangle {
       x 50
-      x 20
+      y 20
       width 300
       height 150
       arc_width 30
@@ -1596,23 +1598,26 @@ shell {
   minimum_size 320, 400
 
   canvas {
-    background :yellow
+    background :dark_yellow
     
     on_paint_control { |paint_event|
       gc = paint_event.gc
-      gc.background = color(:red).swt_color
-      gc.fill_rectangle(0, 0, 220, 400)
       
-      gc.background = color(:magenta).swt_color
-      gc.fill_roundRectangle(50, 20, 300, 150, 30, 50)
+      gc.background = color(:dark_red).swt_color
+      gc.fill_rectangle(0, 0, 220, 400)
       
-      gc.background = color(:dark_magenta).swt_color
-      gc.fill_gradientRectangle(150, 200, 100, 70, true)
+      gc.background = color(:yellow).swt_color
+      gc.fill_round_rectangle(50, 20, 300, 150, 30, 50)
       
-      gc.foreground = color(:dark_blue).swt_color
-      gc.draw_rectangle(200, 80, 108, 36)
+      gc.background = color(:dark_red).swt_color
+      gc.foreground = color(:yellow).swt_color
+      gc.fill_gradient_rectangle(150, 200, 100, 70, true)
       
+      gc.font = font(height: 25, style: :bold).swt_font
       gc.foreground = color(:black).swt_color
+      gc.draw_text('Glimmer', 208, 83, true)
+      
+      gc.foreground = rgb(0, 0, 0).swt_color
       gc.line_width = 3
       gc.draw_rectangle(200, 80, 108, 36)
       
@@ -1762,6 +1767,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#size` : calculated size for shape bounding box (e.g. a polygon with an irregular shape will have its bounding box width and height calculated)
+- `Shape#bounds` : calculated bounds (x, y, width, height) for shape bounding box (e.g. a polygon with an irregular shape will have its bounding box top-left x, y, width and height calculated)
 
 Check [Hello, Canvas!](GLIMMER_SAMPLES.md#hello-canvas) for an example.
 
@@ -1947,6 +1954,43 @@ shell {
 
 As they say, there are many ways to skin a cat! This is in line with the Ruby way of providing more ways than one. Pick and choose the right tool for the job just like true software engineers.
 
+### Canvas Path DSL
+
+**(ALPHA FEATURE)**
+
+Unlike common imperative GUI graphing toolkits, Glimmer enables declarative rendering of paths with the new Canvas Path DSL (Early Alpha) via the new `path { }` keyword and by nesting one of the following path segment keywords underneath:
+- `point(x1, y1)`: renders a Point (Dot) as part of a path.
+- `line(x1, y1, x2=nil, y2=nil)`: renders a Line as part of a path. If you drop x2, y2, it joins to the previous point automatically. You may repeat for a series of lines forming a curve.
+- `quad(x1, y1, x2, y2, x3=nil, y3=nil)`: renders a Quadratic Bezier Curve. If you drop x3 and y3, it joins to the previous point automatically.
+- `cubic(x1, y1, x2, y2, x3, y3, x4=nil, y4=nil)`: renders a Cubic Bezier Curve. If you drop x4 and y4, it joins to the previous point automatically.
+
+Example:
+
+```ruby
+include Glimmer
+
+shell {
+  text 'Canvas Path Example'
+  minimum_size 300, 300
+  
+  canvas {
+    path {
+      foreground :black
+      250.times {|n|
+        cubic(n + n%30, n+ n%50, 40, 40, 70, 70, n + 20 + n%30, n%30*-1 * n%50)
+      }
+    }
+  }
+  
+}.open
+```
+
+![Canvas Path Example](/images/glimmer-example-canvas-path.png)
+
+Learn more at the [Hello, Canvas Path!](GLIMMER_SAMPLES.md#hello-canvas-path) and [Stock Ticker](GLIMMER_SAMPLES.md#stock-ticker) samples.
+
+![Stock Ticker](/images/glimmer-stock-ticker.gif)
+
 ### Canvas Transform DSL
 
 **(ALPHA FEATURE)**

data/docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md

@@ -12,6 +12,8 @@ glimmer package
 
 It works out of the box for any application scaffolded by [Glimmer Scaffolding](#scaffolding), generating all available packaging types on the current platform (e.g. `DMG`, `PKG`, `APP` on the Mac) and displaying a message indicating what pre-requisite setup tools are needed if not installed already (e.g. [Wix Toolset](https://wixtoolset.org/) to generate MSI files on Windows). If you install Wix, make sure it is on the system PATH by adding for example "C:\Program Files (x86)\WiX Toolset v3.11\bin" to the Windows Environment Variables.
 
+(note: if you see this error on the Mac 'Error: Bundler "DMG Installer" (dmg) failed to produce a bundle.', ignore it as it should have produced a bundle anyways. It is a harmless issue in 3rd party dependency: javapackager.)
+
 You may choose to generate a specific type of packaging instead by addionally passing in the `[type]` option. For example, this generates an MSI setup file on Windows:
 
 ```

data/docs/reference/GLIMMER_SAMPLES.md

@@ -33,6 +33,7 @@
     - [Hello, Canvas!](#hello-canvas)
     - [Hello, Canvas Animation!](#hello-canvas-animation)
     - [Hello, Canvas Transform!](#hello-canvas-transform)
+    - [Hello, Canvas Path!](#hello-canvas-path)
     - [Hello, Cursor!](#hello-cursor)
     - [Hello, Progress Bar!](#hello-progress-bar)
     - [Hello, Tree!](#hello-tree)
@@ -45,6 +46,7 @@
     - [Contact Manager](#contact-manager)
     - [Glimmer Tetris](#glimmer-tetris)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
+    - [Stock Ticker](#stock-ticker)
   - [External Samples](#external-samples)
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
@@ -564,6 +566,10 @@ Hello, Canvas!
 
 ![Hello Canvas](/images/glimmer-hello-canvas.png)
 
+Hello, Canvas! Moving Shapes and Nested Shapes via Drag'n'Drop
+
+![Hello Canvas Moving Shapes](/images/glimmer-hello-canvas-moving-shapes.gif)
+
 Hello, Canvas! with Moved Shapes (via Drag'n'Drop)
 
 ![Hello Canvas Moved Shapes](/images/glimmer-hello-canvas-moved-shapes.png)
@@ -580,6 +586,10 @@ Hello, Canvas! Colors Changed
 
 ![Hello Canvas Colors Changed](/images/glimmer-hello-canvas-colors-changed.png)
 
+Hello, Canvas! Data-Binding (changing a `text` shape `string` via data-binding changes from another thread)
+
+![Hello Canvas Data Binding](/images/glimmer-hello-canvas-data-binding.gif)
+
 #### Hello, Canvas Animation!
 
 This sample demonstrates the use of the `canvas` widget and [Animation DSL](#canvas-animation-dsl) in Glimmer.
@@ -608,6 +618,18 @@ Hello, Canvas Transform!
 
 ![Hello Canvas Transform](/images/glimmer-hello-canvas-transform.png)
 
+#### Hello, Canvas Path!
+
+This sample demonstrates the use of the `path`, `quad`, `cubic`, `line`, and `point` keywords as part of the [Canvas Path DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-path-dsl) within the [Canvas Shape DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl).
+
+Code:
+
+[samples/hello/hello_canvas_path.rb](/samples/hello/hello_canvas_path.rb)
+
+Hello, Canvas Path!
+
+![Hello Canvas Path](/images/glimmer-hello-canvas-path.png)
+
 #### Hello, Cursor!
 
 This sample demonstrates the use of the `cursor` property keyword to change the mouse cursor.
@@ -804,6 +826,16 @@ Code:
 
 ![Mandelbrot Fractal Help Menu](/images/glimmer-mandelbrot-menu-help.png)
 
+#### Stock Ticker
+
+This sample demonstrates a Stock Ticker that generates random stock price data for 4 different stocks and provides 4 different tab views of the graphed data using the [Canvas Path DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-path-dsl). It leverages a thread that runs in the background and ticks the stocks to generate random new stock prices before amending the graphed paths with them.
+
+Code:
+
+[samples/elaborate/stock_ticker.rb](/samples/elaborate/stock_ticker.rb)
+
+![Stock Ticker](/images/glimmer-stock-ticker.gif)
+
 ### External Samples
 
 #### Glimmer Calculator

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.3 ruby lib
+# stub: glimmer-dsl-swt 4.18.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.5.3"
+  s.version = "4.18.6.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-25"
+  s.date = "2021-03-02"
   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]
@@ -115,13 +115,17 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/custom/radio_group.rb",
     "lib/glimmer/swt/custom/shape.rb",
     "lib/glimmer/swt/custom/shape/arc.rb",
+    "lib/glimmer/swt/custom/shape/cubic.rb",
     "lib/glimmer/swt/custom/shape/focus.rb",
     "lib/glimmer/swt/custom/shape/image.rb",
     "lib/glimmer/swt/custom/shape/line.rb",
     "lib/glimmer/swt/custom/shape/oval.rb",
+    "lib/glimmer/swt/custom/shape/path.rb",
+    "lib/glimmer/swt/custom/shape/path_segment.rb",
     "lib/glimmer/swt/custom/shape/point.rb",
     "lib/glimmer/swt/custom/shape/polygon.rb",
     "lib/glimmer/swt/custom/shape/polyline.rb",
+    "lib/glimmer/swt/custom/shape/quad.rb",
     "lib/glimmer/swt/custom/shape/rectangle.rb",
     "lib/glimmer/swt/custom/shape/text.rb",
     "lib/glimmer/swt/date_time_proxy.rb",
@@ -162,6 +166,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/login.rb",
     "samples/elaborate/mandelbrot_fractal.rb",
     "samples/elaborate/meta_sample.rb",
+    "samples/elaborate/stock_ticker.rb",
     "samples/elaborate/tetris.rb",
     "samples/elaborate/tetris/model/block.rb",
     "samples/elaborate/tetris/model/game.rb",
@@ -180,6 +185,8 @@ Gem::Specification.new do |s|
     "samples/hello/hello_button.rb",
     "samples/hello/hello_canvas.rb",
     "samples/hello/hello_canvas_animation.rb",
+    "samples/hello/hello_canvas_data_binding.rb",
+    "samples/hello/hello_canvas_path.rb",
     "samples/hello/hello_canvas_transform.rb",
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",

data/lib/glimmer/swt/color_proxy.rb

@@ -99,7 +99,7 @@ module Glimmer
       def ensure_arg_values_within_valid_bounds
         if @args.to_a.size >= 3
           @args = @args.map do |value|
-            [[value, 255].min, 0].max
+            [[value.to_f, 255].min, 0].max
           end
         end
       end

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

@@ -26,13 +26,40 @@ require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/transform_proxy'
 
+class Java::OrgEclipseSwtGraphics::GC
+  def setLineDashOffset(value)
+    lineMiterLimit = getLineAttributes&.miterLimit || 999_999
+    setLineAttributes(Java::OrgEclipseSwtGraphics::LineAttributes.new(getLineWidth, getLineCap, getLineJoin, getLineStyle, getLineDash.map(&:to_f).to_java(:float), value, lineMiterLimit))
+  end
+  alias set_line_dash_offset setLineDashOffset
+  alias line_dash_offset= setLineDashOffset
+  
+  def getLineDashOffset
+    getLineAttributes&.dashOffset
+  end
+  alias get_line_dash_offset getLineDashOffset
+  alias line_dash_offset getLineDashOffset
+  
+  def setLineMiterLimit(value)
+    lineDashOffset = getLineAttributes&.dashOffset || 0
+    setLineAttributes(Java::OrgEclipseSwtGraphics::LineAttributes.new(getLineWidth, getLineCap, getLineJoin, getLineStyle, getLineDash.map(&:to_f).to_java(:float), lineDashOffset, value))
+  end
+  alias set_line_miter_limit setLineMiterLimit
+  alias line_miter_limit= setLineMiterLimit
+  
+  def getLineMiterLimit
+    getLineAttributes&.miterLimit
+  end
+  alias get_line_miter_limit getLineMiterLimit
+  alias line_miter_limit getLineMiterLimit
+end
+
 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
-        include Packages
         include Properties
         
         class << self
@@ -46,7 +73,8 @@ module Glimmer
           end
         
           def valid?(parent, keyword, *args, &block)
-            gc_instance_methods.include?(method_name(keyword, arg_options(args)))
+            gc_instance_methods.include?(method_name(keyword, arg_options(args))) ||
+              constants.include?(keyword.to_s.camelcase(:upper).to_sym)
           end
           
           def gc_instance_methods
@@ -99,7 +127,7 @@ module Glimmer
         end
         
         attr_reader :drawable, :parent, :name, :args, :options, :shapes
-        attr_accessor :x_delta, :y_delta
+        attr_accessor :extent
         
         def initialize(parent, keyword, *args, &property_block)
           @parent = parent
@@ -110,8 +138,6 @@ module Glimmer
           @args = args
           @properties = {}
           @shapes = [] # nested shapes
-          @x_delta = 0
-          @y_delta = 0
           @options.reject {|key, value| %w[fill gradient round].include?(key.to_s)}.each do |property, property_args|
             @properties[property] = property_args
           end
@@ -121,6 +147,7 @@ module Glimmer
         
         def add_shape(shape)
           @shapes << shape
+          calculated_args_changed_for_defaults!
         end
         
         def draw?
@@ -141,26 +168,44 @@ module Glimmer
           @options[:round]
         end
         
-        # subclasses (like polygon) may override to indicate if a point x,y coordinates falls inside the shape
+        # The bounding box top-left x, y, width, height in absolute positioning
+        def bounds
+          org.eclipse.swt.graphics.Rectangle.new(absolute_x, absolute_y, calculated_width, calculated_height)
+        end
+        
+        # The bounding box top-left x and y
+        def location
+          org.eclipse.swt.graphics.Point.new(bounds.x, bounds.y)
+        end
+        
+        # The bounding box width and height (as a Point object with x being width and y being height)
+        def size
+          org.eclipse.swt.graphics.Point.new(calculated_width, calculated_height)
+        end
+        
+        def extent
+          @extent || size
+        end
+        
+        # Returns if shape contains a point
+        # 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.absolute_x, self.absolute_x + width) && y.between?(self.absolute_y, self.absolute_y + height)
-          else
-            false # subclasses must provide implementation
-          end
+          x.between?(self.absolute_x, self.absolute_x + calculated_width) && y.between?(self.absolute_y, self.absolute_y + calculated_height)
         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
+        # Returns if shape includes a point. When the shape is filled, this is the same as contain. When the shape is drawn, it only returns true if the point lies on the edge (boundary/border)
+        # 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)
           # assume a rectangular shape by default
-          if respond_to?(:x) && respond_to?(:y) && respond_to?(:width) && respond_to?(:height)
-            contain?(x, y)
-          else
-            false # subclasses must provide implementation
-          end
+          contain?(x, y)
+        end
+
+        # Indicates if a shape's x, y, width, height differ from its bounds calculation (e.g. arc / polygon)
+        def irregular?
+          false
         end
         
         # moves by x delta and y delta. Subclasses must implement
@@ -168,18 +213,25 @@ module Glimmer
         def move_by(x_delta, y_delta)
           if respond_to?(:x) && respond_to?(:y) && respond_to?(:x=) && respond_to?(:y=)
             if default_x?
-              self.x_delta += x_delta
+              self.default_x_delta += x_delta
             else
               self.x += x_delta
             end
             if default_y?
-              self.y_delta += y_delta
+              self.default_y_delta += y_delta
             else
               self.y += y_delta
             end
           end
         end
         
+        def content(&block)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec do
+            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::ShapeExpression.new, &block)
+            calculated_args_changed!(children: false)
+          end
+        end
+        
         def has_some_background?
           @properties.keys.map(&:to_s).include?('background') || @properties.keys.map(&:to_s).include?('background_pattern')
         end
@@ -189,8 +241,8 @@ module Glimmer
         end
         
         def post_add_content
-          unless @content_added
-            amend_method_name_options_based_on_properties!
+          amend_method_name_options_based_on_properties!
+          if !@content_added || @method_name != @original_method_name
             @drawable.setup_shape_painting unless @drawable.is_a?(ImageProxy)
             @content_added = true
           end
@@ -199,14 +251,19 @@ module Glimmer
         def apply_property_arg_conversions(method_name, property, args)
           args = args.dup
           the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
-          if the_java_method.parameter_types.first == Color.java_class && args.first.is_a?(RGB)
+          return args if the_java_method.nil?
+          if the_java_method.parameter_types.first == org.eclipse.swt.graphics.Color.java_class && args.first.is_a?(org.eclipse.swt.graphics.RGB)
             args[0] = [args[0].red, args[0].green, args[0].blue]
           end
           if ['setBackground', 'setForeground'].include?(method_name.to_s) && args.first.is_a?(Array)
             args[0] = ColorProxy.new(args[0])
           end
+          if method_name.to_s == 'setLineDash' && args.size > 1
+            args[0] = args.dup
+            args[1..-1] = []
+          end
           if args.first.is_a?(Symbol) || args.first.is_a?(::String)
-            if the_java_method.parameter_types.first == Color.java_class
+            if the_java_method.parameter_types.first == org.eclipse.swt.graphics.Color.java_class
               args[0] = ColorProxy.new(args[0])
             end
             if the_java_method.parameter_types.first == Java::int.java_class
@@ -216,7 +273,7 @@ module Glimmer
           if args.first.is_a?(ColorProxy)
             args[0] = args[0].swt_color
           end
-          if (args.first.is_a?(Hash) || args.first.is_a?(FontData)) && the_java_method.parameter_types.first == Font.java_class
+          if (args.first.is_a?(Hash) || args.first.is_a?(org.eclipse.swt.graphics.FontData)) && the_java_method.parameter_types.first == org.eclipse.swt.graphics.Font.java_class
             args[0] = FontProxy.new(args[0])
           end
           if args.first.is_a?(FontProxy)
@@ -229,7 +286,7 @@ module Glimmer
             @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.red, arg.green, arg.blue) if arg.is_a?(org.eclipse.swt.graphics.RGB)
               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
@@ -278,20 +335,22 @@ module Glimmer
         end
         
         def apply_shape_arg_defaults!
+          self.x = :default if current_parameter_name?(:x) && x.nil?
+          self.y = :default if current_parameter_name?(:y) && y.nil?
+          self.dest_x = :default if current_parameter_name?(:dest_x) && dest_x.nil?
+          self.dest_y = :default if current_parameter_name?(:dest_y) && dest_y.nil?
+          self.width = :default if current_parameter_name?(:width) && width.nil?
+          self.height = :default if current_parameter_name?(:height) && height.nil?
           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 # 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
+            set_attribute('vertical', true, redraw: false)
+          elsif (@name.include?('text') || @name.include?('string')) && !@properties.keys.map(&:to_s).include?('background') && @args.size < 4
+            set_attribute('is_transparent', true, redraw: false)
           end
           if @name.include?('image')
             @drawable.requires_shape_disposal = true
           end
-          self.x = :default if current_parameter_name?(:x) && x.nil?
-          self.y = :default if current_parameter_name?(:y) && y.nil?
-          self.dest_x = :default if current_parameter_name?(:dest_x) && dest_x.nil?
-          self.dest_y = :default if current_parameter_name?(:dest_y) && dest_y.nil?
         end
                 
         # Tolerates shape extra args added by user by mistake
@@ -306,6 +365,7 @@ module Glimmer
         end
         
         def amend_method_name_options_based_on_properties!
+          @original_method_name = @method_name
           return if @name == 'point'
           if @name != 'text' && @name != 'string' && has_some_background? && !has_some_foreground?
             @options[:fill] = true
@@ -341,11 +401,11 @@ module Glimmer
         end
         
         def current_parameter_name?(attribute_name)
-          parameter_names.map(&:to_s).include?(ruby_attribute_getter(attribute_name))
+          parameter_names.include?(attribute_name.to_s.to_sym)
         end
         
         def parameter_index(attribute_name)
-          parameter_names.map(&:to_s).index(attribute_name.to_s)
+          parameter_names.index(attribute_name.to_s.to_sym)
         end
         
         def set_parameter_attribute(attribute_name, *args)
@@ -357,9 +417,10 @@ module Glimmer
             parameter_name?(attribute_name) or
             (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter(attribute_name), super: true))
         end
-  
+        
         def set_attribute(attribute_name, *args)
           options = args.last if args.last.is_a?(Hash)
+          args.pop if !options.nil? && !options[:redraw].nil?
           perform_redraw = @perform_redraw
           perform_redraw = options[:redraw] if perform_redraw.nil? && !options.nil?
           perform_redraw = true if perform_redraw.nil?
@@ -372,9 +433,19 @@ module Glimmer
           end
           if @content_added && perform_redraw && !drawable.is_disposed
             @calculated_paint_args = false
+            if is_a?(PathSegment)
+              root_path&.calculated_path_args = @calculated_path_args = false
+              calculated_args_changed!
+              root_path&.calculated_args_changed!
+            end
             attribute_name = ruby_attribute_getter(attribute_name)
-            @calculated_absolute_args = false if (location_parameter_names.map(&:to_s) + ['x_delta', 'y_delta']).include?(attribute_name)
-
+            if location_parameter_names.map(&:to_s).include?(attribute_name)
+              @calculated_args = nil
+              parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
+            end
+            if ['width', 'height'].include?(attribute_name)
+              calculated_args_changed_for_defaults!
+            end
             # TODO consider redrawing an image proxy's gc in the future
             drawable.redraw unless drawable.is_a?(ImageProxy)
           end
@@ -433,6 +504,7 @@ module Glimmer
         end
         
         def dispose(dispose_images: true, dispose_patterns: true)
+          shapes.each { |shape| shape.is_a?(Shape::Path) && shape.dispose }
           if dispose_patterns
             @background_pattern&.dispose
             @background_pattern = nil
@@ -445,27 +517,46 @@ module Glimmer
           end
           @parent.shapes.delete(self)
         end
-                
+        
         def paint(paint_event)
+          # pre-paint children an extra-time first when default width/height need to be calculated for defaults
+          paint_children(paint_event) if default_width? || default_height?
+          paint_self(paint_event)
+          # re-paint children from scratch in the special case of pre-calculating parent width/height to re-center within new parent dimensions
+          shapes.each(&:calculated_args_changed!) if default_width? || default_height?
+          paint_children(paint_event)
+        rescue => e
+          Glimmer::Config.logger.error {"Error encountered in painting shape (#{self.inspect}) with calculated args (#{@calculated_args}) and args (#{@args})"}
+          Glimmer::Config.logger.error {e.full_message}
+        end
+        
+        def paint_self(paint_event)
+          @painting = true
           calculate_paint_args!
+          @original_properties_backup = {}
           @properties.each do |property, args|
             method_name = attribute_setter(property)
-            # TODO consider optimization of not setting a background/foreground/font if it didn't change from last shape
+            @original_properties_backup[method_name] = paint_event.gc.send(method_name.sub('set', 'get')) rescue nil
             paint_event.gc.send(method_name, *args)
             if property == 'transform' && args.first.is_a?(TransformProxy)
               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)
-          if !@calculated_absolute_args || parent_shape_absolute_location_changed?
-            @absolute_args = absolute_args
-            @calculated_absolute_args = true
+          ensure_extent(paint_event)
+          if !@calculated_args || parent_shape_absolute_location_changed?
+            @calculated_args = calculated_args
           end
-          paint_event.gc.send(@method_name, *@absolute_args)
-          paint_children(paint_event)
+          # paint unless parent's calculated args are not calculated yet, meaning it is about to get painted and trigger a paint on this child anyways
+          paint_event.gc.send(@method_name, *@calculated_args) unless parent.is_a?(Shape) && !parent.calculated_args?
+          @original_properties_backup.each do |method_name, value|
+            paint_event.gc.send(method_name, value)
+          end
+          @painting = false
         rescue => e
-          Glimmer::Config.logger.error {"Error encountered in painting shape: #{self.inspect}"}
+          Glimmer::Config.logger.error {"Error encountered in painting shape (#{self.inspect}) with calculated args (#{@calculated_args}) and args (#{@args})"}
           Glimmer::Config.logger.error {e.full_message}
+        ensure
+          @painting = false
         end
         
         def paint_children(paint_event)
@@ -474,6 +565,21 @@ module Glimmer
           end
         end
         
+        def ensure_extent(paint_event)
+          old_extent = @extent
+          if ['text', 'string'].include?(@name)
+            extent_args = [string]
+            extent_flags = SWTProxy[:draw_transparent] if current_parameter_name?(:is_transparent) && is_transparent
+            extent_flags = flags if current_parameter_name?(:flags)
+            extent_args << extent_flags unless extent_flags.nil?
+            self.extent = paint_event.gc.send("#{@name}Extent", *extent_args)
+          end
+          if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y)
+            calculated_args_changed!
+            parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
+          end
+        end
+        
         def expanded_shapes
           if shapes.to_a.any?
             shapes.map do |shape|
@@ -487,69 +593,200 @@ module Glimmer
         def parent_shape_absolute_location_changed?
           (parent.is_a?(Shape) && (parent.absolute_x != @parent_absolute_x || parent.absolute_y != @parent_absolute_y))
         end
+        
+        def calculated_args_changed!(children: true)
+          # TODO add a children: true option to enable setting to false to avoid recalculating children args
+          @calculated_args = nil
+          shapes.each(&:calculated_args_changed!) if children
+        end
+        
+        def calculated_args_changed_for_defaults!
+          has_default_dimensions = default_width? || default_height?
+          parent_calculated_args_changed_for_defaults = has_default_dimensions
+          @calculated_args = nil if default_x? || default_y? || has_default_dimensions
+          if has_default_dimensions && parent.is_a?(Shape)
+            parent.calculated_args_changed_for_defaults!
+          elsif @content_added && !drawable.is_disposed
+            # TODO consider optimizing in the future if needed by ensuring one redraw for all parents in the hierarchy at the end instead of doing one per parent that needs it
+            drawable.redraw if !@painting && !drawable.is_a?(ImageProxy)
+          end
+        end
+        
+        def calculated_args?
+          !!@calculated_args
+        end
                 
         # args translated to absolute coordinates
-        def absolute_args
-          return @args if !default_x? && !default_y? && @x_delta == 0 && @y_delta == 0 && parent.is_a?(Drawable)
+        def calculated_args
+          return @args if !default_x? && !default_y? && !default_width? && !default_height? && parent.is_a?(Drawable)
+          # Note: Must set x and move_by because not all shapes have a real x and some must translate all their points with move_by
+          # TODO change that by setting a bounding box for all shapes with a calculated top-left x, y and
+          # a setter that does the moving inside them instead so that I could rely on absolute_x and absolute_y
+          # here to get the job done of calculating absolute args
           @perform_redraw = false
           original_x = nil
           original_y = nil
+          original_width = nil
+          original_height = nil
+          if parent.is_a?(Shape)
+            @parent_absolute_x = parent.absolute_x
+            @parent_absolute_y = parent.absolute_y
+          end
+          if default_width?
+            original_width = width
+            self.width = default_width + default_width_delta
+          end
+          if default_height?
+            original_height = height
+            self.height = default_height + default_height_delta
+          end
           if default_x?
             original_x = x
-            self.x = default_x
+            self.x = default_x + default_x_delta
           end
           if default_y?
             original_y = y
-            self.y = default_y
+            self.y = default_y + default_y_delta
           end
-          move_by(@x_delta, @y_delta)
           if parent.is_a?(Shape)
-            @parent_absolute_x = parent.absolute_x
-            @parent_absolute_y = parent.absolute_y
-            move_by(parent.absolute_x, parent.absolute_y)
-            calculated_absolute_args = @args.clone
-            move_by(-1*parent.absolute_x, -1*parent.absolute_y)
+            move_by(@parent_absolute_x, @parent_absolute_y)
+            result_args = @args.clone
+            move_by(-1*@parent_absolute_x, -1*@parent_absolute_y)
           else
-            calculated_absolute_args = @args.clone
+            result_args = @args.clone
           end
-          move_by(-1*@x_delta, -1*@y_delta)
           if original_x
             self.x = original_x
           end
           if original_y
             self.y = original_y
           end
+          if original_width
+            self.width = original_width
+          end
+          if original_height
+            self.height = original_height
+          end
           @perform_redraw = true
-          calculated_absolute_args
+          result_args
         end
         
         def default_x?
-          current_parameter_name?('x') && (x.nil? || x.to_s == 'default')
+          current_parameter_name?(:x) and
+            (x.nil? || x.to_s == 'default' || (x.is_a?(Array) && x.first.to_s == 'default'))
         end
         
         def default_y?
-          current_parameter_name?('y') && (y.nil? || y.to_s == 'default')
+          current_parameter_name?(:y) and
+            (y.nil? || y.to_s == 'default' || (y.is_a?(Array) && y.first.to_s == 'default'))
+        end
+        
+        def default_width?
+          return false unless current_parameter_name?(:width)
+          width = self.width
+          (width.nil? || width == :default || width == 'default' || (width.is_a?(Array) && (width.first.to_s == :default || width.first.to_s == 'default')))
+        end
+        
+        def default_height?
+          return false unless current_parameter_name?(:height)
+          height = self.height
+          (height.nil? || height == :default || height == 'default' || (height.is_a?(Array) && (height.first.to_s == :default || height.first.to_s == 'default')))
         end
         
         def default_x
-          if respond_to?(:width) && width && parent.respond_to?(:width) && parent.width
-            (parent.width - width) / 2
-          else
-            0
-          end
+          result = ((parent.size.x - size.x) / 2)
+          result += parent.bounds.x - parent.absolute_x if parent.is_a?(Shape) && parent.irregular?
+          result
         end
         
         def default_y
-          if respond_to?(:height) && height && parent.respond_to?(:height) && parent.height
-            (parent.height - height) / 2
-          else
-            0
+          result = ((parent.size.y - size.y) / 2)
+          result += parent.bounds.y - parent.absolute_y if parent.is_a?(Shape) && parent.irregular?
+          result
+        end
+        
+        def default_width
+          # TODO consider caching
+          x_ends = shapes.map do |shape|
+            shape_width = shape.calculated_width.to_f
+            shape_x = shape.default_x? ? 0 : shape.x.to_f
+            shape_x + shape_width
+          end
+          x_ends.max.to_f
+        end
+        
+        def default_height
+          # TODO consider caching
+          y_ends = shapes.map do |shape|
+            shape_height = shape.calculated_height.to_f
+            shape_y = shape.default_y? ? 0 : shape.y.to_f
+            shape_y + shape_height
           end
+          y_ends.max.to_f
+        end
+        
+        def calculated_width
+          default_width? ? (default_width + default_width_delta) : width
+        end
+        
+        def calculated_height
+          default_height? ? (default_height + default_height_delta) : height
+        end
+        
+        def default_x_delta
+          return 0 unless default_x? && x.is_a?(Array)
+          x[1].to_f
+        end
+        
+        def default_y_delta
+          return 0 unless default_y? && y.is_a?(Array)
+          y[1].to_f
+        end
+        
+        def default_width_delta
+          return 0 unless default_width? && width.is_a?(Array)
+          width[1].to_f
+        end
+        
+        def default_height_delta
+          return 0 unless default_height? && height.is_a?(Array)
+          height[1].to_f
+        end
+        
+        def default_x_delta=(delta)
+          return unless default_x?
+          self.x = [:default, delta]
+        end
+        
+        def default_y_delta=(delta)
+          return unless default_y?
+          self.y = [:default, delta]
+        end
+        
+        def default_width_delta=(delta)
+          return unless default_width?
+          self.width = [:default, delta]
+        end
+        
+        def default_height_delta=(delta)
+          return unless default_height?
+          self.height = [:default, delta]
+        end
+        
+        def calculated_x
+          result = default_x? ? default_x : self.x
+          result += default_x_delta
+          result
+        end
+        
+        def calculated_y
+          result = default_y? ? default_y : self.y
+          result += default_y_delta
+          result
         end
         
         def absolute_x
-          x = default_x? ? default_x : self.x
-          x += @x_delta
+          x = calculated_x
           if parent.is_a?(Shape)
             parent.absolute_x + x
           else
@@ -558,8 +795,7 @@ module Glimmer
         end
         
         def absolute_y
-          y = default_y? ? default_y : self.y
-          y += @y_delta
+          y = calculated_y
           if parent.is_a?(Shape)
             parent.absolute_y + y
           else
@@ -567,12 +803,19 @@ module Glimmer
           end
         end
         
+        # Overriding inspect to avoid printing very long shape hierarchies
+        def inspect
+          "#<#{self.class.name}:0x#{self.hash.to_s(16)} args=#{@args.inspect}, properties=#{@properties.inspect}}>"
+        rescue => e
+          "#<#{self.class.name}:0x#{self.hash.to_s(16)}"
+        end
+        
         def calculate_paint_args!
           unless @calculated_paint_args
             if @name == 'pixel'
               @name = 'point'
               # optimized performance calculation for pixel points
-              if !@properties[:foreground].is_a?(Color)
+              if !@properties[:foreground].is_a?(org.eclipse.swt.graphics.Color)
                 if @properties[:foreground].is_a?(Array)
                   @properties[:foreground] = ColorProxy.new(@properties[:foreground], ensure_bounds: false)
                 end
@@ -589,7 +832,7 @@ module Glimmer
               # 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'] = [@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
+              # TODO regarding transform, make sure to reset it to parent stored transform once we allow setting shape properties on parents directly without shapes
               # Also do that with all future-added properties
               @properties['transform'] = [nil] if @drawable.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
               @properties.each do |property, args|