glimmer-dsl-swt 4.18.6.1 → 4.18.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6951b42a995fd393c82fcb406f5bb308aacf9330d75b85e0050104451044870c
-  data.tar.gz: 1de171314b2b6da4c80e295152a91697085e8bc7b00502fb0af88aef2890defc
+  metadata.gz: 6d4f89641fcc2573b43cd52e23cf4dda45aa209e55cd49cbe751f6a4b7bc85b1
+  data.tar.gz: 9cf53e2b5aef11f838314b50188f63b3a69936ea31f54930da77bddfd561b08e
 SHA512:
-  metadata.gz: d996c3707e136ec0e059396a3a06d301953236acbde4012f428fdc85dab3e13843296ace25426d41fa6fe7d87031ab5990a40e62a2b572bfbd47b97759575892
-  data.tar.gz: 5c317cdc5e75597d03bf241436cad374cd05e64d4a91739d08945ed2b4a5464807128eb25f23b271a057fdb4dd7b79372eee3c68f6f336a4fd27af8448ce31a9
+  metadata.gz: 355fe3aab4e45648832678ce3a2c00411129be61bbff91575f4c19b73254a82ab9fa58ce6acbac78d6dca4daf383340cd074e6ec5ea6128bcdb37df94befe125
+  data.tar.gz: d30171ae846dc373fb4d58426bcdc64a179579c4f86ee749d16cb0a5f3440bc542305a91a1e0d5774b796e14750a1918ae4e8d3bb33b2eaff70da4fd3a7afff1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 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)

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.6.0
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.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)
@@ -13,7 +13,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.18.6.0 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](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.
 
@@ -340,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.6.0
+jgem install glimmer-dsl-swt -v 4.18.6.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -358,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.6.0'
+gem 'glimmer-dsl-swt', '~> 4.18.6.2'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-4.18.6.1
+4.18.6.2

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1976,7 +1976,6 @@ shell {
   canvas {
     path {
       foreground :black
-      point(0, 0)
       250.times {|n|
         cubic(n + n%30, n+ n%50, 40, 40, 70, 70, n + 20 + n%30, n%30*-1 * n%50)
       }

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/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.6.1 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.6.1"
+  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-03-01"
+  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]
@@ -185,6 +185,7 @@ 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",

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

@@ -60,7 +60,6 @@ module Glimmer
       # 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
@@ -253,7 +252,7 @@ module Glimmer
           args = args.dup
           the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
           return args if the_java_method.nil?
-          if the_java_method.parameter_types.first == Color.java_class && args.first.is_a?(RGB)
+          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)
@@ -264,7 +263,7 @@ module Glimmer
             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
@@ -274,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)
@@ -287,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
@@ -434,6 +433,11 @@ 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)
             if location_parameter_names.map(&:to_s).include?(attribute_name)
               @calculated_args = nil
@@ -811,7 +815,7 @@ module Glimmer
             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

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

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/custom/shape'
+require 'glimmer/swt/custom/shape/path'
 require 'glimmer/swt/custom/shape/path_segment'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
@@ -102,7 +103,7 @@ module Glimmer
           end
           
           def eql?(other)
-            point_array == (other && other.respond_to?(:point_array) && other.point_array)
+            other.is_a?(Cubic) && point_array == (other && other.respond_to?(:point_array) && other.point_array)
           end
           alias == eql?
           

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

@@ -1,4 +1,5 @@
 # Copyright (c) 2007-2021 Andy Maleh
+# Copyright (c) 2007-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -157,7 +158,7 @@ module Glimmer
           
           def path_segment_geometry_args
             # TODO make args auto-infer first point if previous_point_connected is true or if there is only x1,y1 or x2,y2 (but not both), or if there is an x, y, or if there is a point_array with 1 point
-            @args[0..1]
+            @args
           end
           
           def previous_point_connected?
@@ -165,7 +166,8 @@ module Glimmer
           end
           
           def eql?(other)
-            x1 == (other && other.respond_to?(:x1) && other.x1) &&
+            other.is_a?(Line) &&
+              x1 == (other && other.respond_to?(:x1) && other.x1) &&
               y1 == (other && other.respond_to?(:y1) && other.y1) &&
               x2 == (other && other.respond_to?(:x2) && other.x2) &&
               y2 == (other && other.respond_to?(:y2) && other.y2)

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

@@ -30,14 +30,15 @@ require 'glimmer/swt/display_proxy'
 module Glimmer
   module SWT
     module Custom
-      # Represents a path 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 path 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
+        # swt_path is not guaranteed to have any object in it till after rendering
         class Path < Shape
           include PathSegment # a path may behave as a path segment in another path
           
-          attr_accessor :flatness, :closed
           attr_reader :swt_path, :path_segments
+          attr_accessor :calculated_path_args
         
           def initialize(parent, keyword, *args, &property_block)
             super
@@ -81,15 +82,25 @@ module Glimmer
           def post_dispose_content(path_segment)
             @path_segments.delete(path_segment)
             @uncalculated_path_segments = @path_segments.dup
-            dispose
+            @swt_path&.dispose
+            @swt_path = nil
+            @args = []
+            calculated_args_changed!(children: false)
           end
           
-          def dispose
+          def clear
+            @path_segments.each { |path_segments| path_segments.class == Path && path_segments.dispose }
+            @path_segments.clear
+            @uncalculated_path_segments = @path_segments.dup
             @swt_path&.dispose
             @swt_path = nil
             @args = []
             calculated_args_changed!(children: false)
-            super
+          end
+          
+          def dispose
+            clear if self.class == Path
+            super if parent.is_a?(Drawable)
           end
           
           def calculated_args_changed!(children: true)
@@ -97,14 +108,19 @@ module Glimmer
           end
           
           def calculated_args
-            new_swt_path = @swt_path.nil?
-            @swt_path ||= org.eclipse.swt.graphics.Path.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
+            new_swt_path = @swt_path.nil? || !@calculated_paint_args || !@calculated_path_args
+            if new_swt_path
+              @swt_path&.dispose
+              @swt_path = org.eclipse.swt.graphics.Path.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
+              @uncalculated_path_segments = @path_segments.dup
+            end
             # TODO recreate @swt_path only if one of the children get disposed (must notify parent on dispose)
             @args = [@swt_path]
             @uncalculated_path_segments.each do |path_segment|
               path_segment.add_to_swt_path(@swt_path)
               @uncalculated_path_segments.delete(path_segment)
             end
+            @calculated_path_args = true
             if new_swt_path
               @path_calculated_args = super
             else
@@ -196,7 +212,7 @@ module Glimmer
           end
           
           def eql?(other)
-            geometry.equals(other && other.respond_to?(:geometry) && other.geometry)
+            (other.class == Path) && geometry.equals(other && other.respond_to?(:geometry) && other.geometry)
           end
           alias == eql?
           

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

@@ -30,6 +30,26 @@ module Glimmer
         # Represents path segments like point, line, quad, and cubic curves
         # Shapes could mix in
         module PathSegment
+          def root_path
+            current_parent = parent
+            until current_parent.class == Path && !current_parent.parent.is_a?(Path)
+              current_parent = current_parent.parent
+              return current_parent if current_parent.nil?
+            end
+            current_parent
+          end
+          def path
+            current_parent = parent
+            until current_parent.class == Path
+              current_parent = current_parent.parent
+              return current_parent if current_parent.nil?
+            end
+            current_parent
+          end
+          # this is needed to indicate if a shape is part of a path or not (e.g. line and point could be either)
+          def part_of_path?
+            !!root_path
+          end
           # Subclasses must override and implement to indicate method name to invoke on SWT Path object to add segment
           def path_segment_method_name
             nil
@@ -59,6 +79,8 @@ module Glimmer
           
           def dispose
             parent.post_dispose_content(self) if parent.is_a?(Path)
+            super if !part_of_path?
+            drawable.redraw unless drawable.is_a?(ImageProxy)
           end
           
           def first_path_segment?
@@ -94,10 +116,10 @@ module Glimmer
               if !previous_point_connected?
                 if the_path_segment_geometry_args.count == default_path_segment_arg_count
                   point = the_path_segment_geometry_args.shift, the_path_segment_geometry_args.shift
-                  @swt_path.moveTo(*point)
+                  geometry.moveTo(point[0], point[1])
                 elsif first_path_segment?
                   point = the_path_segment_geometry_args[0..1]
-                  @swt_path.moveTo(*point)
+                  geometry.moveTo(point[0], point[1])
                 end
               end
             end

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

@@ -75,7 +75,7 @@ module Glimmer
           end
           
           def eql?(other)
-            x == (other && other.respond_to?(:x) && other.x) && y == (other && other.respond_to?(:y) && other.y)
+            other.is_a?(Point) && x == (other && other.respond_to?(:x) && other.x) && y == (other && other.respond_to?(:y) && other.y)
           end
           alias == eql?
           

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

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/custom/shape'
+require 'glimmer/swt/custom/shape/path'
 require 'glimmer/swt/custom/shape/path_segment'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
@@ -82,7 +83,7 @@ module Glimmer
           
           def path_segment_args
             # TODO make args auto-infer control points if previous_point_connected is true or if there is only a point_array with 1 point
-            @args.to_a
+            @args
           end
           
           def default_path_segment_arg_count
@@ -98,7 +99,7 @@ module Glimmer
           end
           
           def eql?(other)
-            point_array == (other && other.respond_to?(:point_array) && other.point_array)
+            other.is_a?(Quad) && point_array == (other && other.respond_to?(:point_array) && other.point_array)
           end
           alias == eql?
           

data/samples/elaborate/stock_ticker.rb

@@ -26,24 +26,24 @@ require 'glimmer-dsl-swt'
 class StockTicker
   class Stock
     class << self
-      attr_writer :stock_price_min, :stock_price_max
+      attr_writer :price_min, :price_max
       
-      def stock_price_min
-        @stock_price_min ||= 1
+      def price_min
+        @price_min ||= 1
       end
       
-      def stock_price_max
-        @stock_price_max ||= 600
+      def price_max
+        @price_max ||= 600
       end
     end
     
-    attr_reader :name, :stock_prices
-    attr_accessor :stock_price
+    attr_reader :name, :prices
+    attr_accessor :price
     
-    def initialize(name, stock_price)
+    def initialize(name, price)
       @name = name
-      @stock_price = stock_price
-      @stock_prices = [@stock_price]
+      @price = price
+      @prices = [@price]
       @delta_sign = 1
       start_new_trend!
     end
@@ -55,7 +55,7 @@ class StockTicker
         @delta_sign *= -1
         start_new_trend!
       end
-      stock_prices << self.stock_price = [[@stock_price + @delta_sign*delta, Stock.stock_price_min].max, Stock.stock_price_max].min
+      prices << self.price = [[@price + @delta_sign*delta, Stock.price_min].max, Stock.price_max].min
     end
     
     def start_new_trend!
@@ -73,52 +73,38 @@ class StockTicker
       Stock.new('ADBE', 459),
     ]
     @stock_colors = [:red, :dark_green, :blue, :dark_magenta]
-    max_stock_name_width = 0
-    left_margin = 5
-    @tabs = ['Lines', 'Quadratic Bezier Curves', 'Cubic Bezier Curves', 'Points'].map {|title| {title: title, stock_paths: [], stock_transforms: []}}
+    margin = 5
+    @tabs = ['Lines', 'Quadratic Bezier Curves', 'Cubic Bezier Curves', 'Points'].map {|title| {title: title, stock_paths: []}}
     @stocks.each_with_index do |stock, stock_index|
-      observe(stock, :stock_price) do |new_price|
+      observe(stock, :price) do |new_price|
         begin
           @tabs.each do |tab|
-            new_x = stock.stock_prices.count - 1
+            new_x = stock.prices.count - 1
             new_y = @tabs.first[:canvas].bounds.height - new_price - 1
-            max_stock_name_width = tab[:text]&.bounds&.width if tab[:text]&.bounds&.width.to_f > max_stock_name_width
             if new_x > 0
               case tab[:title]
               when 'Cubic Bezier Curves'
-                if new_x%3 == 0 && stock.stock_prices[new_x] && stock.stock_prices[new_x - 1] && stock.stock_prices[new_x - 2]
+                if new_x%3 == 0 && stock.prices[new_x] && stock.prices[new_x - 1] && stock.prices[new_x - 2]
                   tab[:stock_paths][stock_index].content {
-                    cubic(new_x - 2, @tabs.first[:canvas].bounds.height - stock.stock_prices[new_x - 2] - 1, new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[new_x - 1] - 1, new_x, new_y)
-                    tab[:stock_transforms][stock_index] ||= transform {
-                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                    }
+                    cubic(new_x - 2 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 2] - 1, new_x - 1 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 1] - 1, new_x + margin, new_y)
                   }
                 end
               when 'Quadratic Bezier Curves'
-                if new_x%2 == 0 && stock.stock_prices[new_x] && stock.stock_prices[new_x - 1]
+                if new_x%2 == 0 && stock.prices[new_x] && stock.prices[new_x - 1]
                   tab[:stock_paths][stock_index].content {
-                    quad(new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[new_x - 1] - 1, new_x, new_y)
-                    tab[:stock_transforms][stock_index] ||= transform {
-                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                    }
+                    quad(new_x - 1 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 1] - 1, new_x + margin, new_y)
                   }
                 end
               when 'Lines'
                 tab[:stock_paths][stock_index].content {
-                  line(new_x, new_y)
-                  tab[:stock_transforms][stock_index] ||= transform {
-                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                  }
+                  line(new_x + margin, new_y)
                 }
               when 'Points'
                 tab[:stock_paths][stock_index].content {
-                  point(new_x, new_y)
-                  tab[:stock_transforms][stock_index] ||= transform {
-                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                  }
+                  point(new_x + margin, new_y)
                 }
               end
-              new_x_location = new_x + max_stock_name_width + 5 + left_margin + 5
+              new_x_location = new_x + 2*margin
               canvas_width = tab[:canvas].bounds.width
               if new_x_location > canvas_width
                 tab[:canvas].set_size(new_x_location, @tabs.first[:canvas].bounds.height)
@@ -127,9 +113,10 @@ class StockTicker
                 tab[:scrolled_composite].set_origin(tab[:scrolled_composite].origin.x + 1, tab[:scrolled_composite].origin.y) if (tab[:scrolled_composite].origin.x + tab[:scrolled_composite].client_area.width) == canvas_width
               end
             else
-              tab[:canvas].content {
-                tab[:text] = text(stock.name, new_x + left_margin, new_y) {
+              tab[:canvas_header].content {
+                text(stock.name, 15, new_y - 10) {
                   foreground @stock_colors[stock_index]
+                  font height: 14
                 }
               }
             end
@@ -163,13 +150,17 @@ class StockTicker
       @tab_folder = tab_folder {
         @tabs.each do |tab|
           tab_item {
-            fill_layout {
+            grid_layout(2, false) {
               margin_width 0
               margin_height 0
             }
             text tab[:title]
             
+            tab[:canvas_header] = canvas {
+              layout_data(:center, :fill, false, true)
+            }
             tab[:scrolled_composite] = scrolled_composite {
+              layout_data :fill, :fill, true, true
               tab[:canvas] = canvas {
                 background :white
                 
@@ -209,8 +200,8 @@ class StockTicker
       }
     
       on_swt_show {
-        Stock.stock_price_min = 25
-        Stock.stock_price_max = @tabs.first[:canvas].bounds.height - 6
+        Stock.price_min = 25
+        Stock.price_max = @tabs.first[:canvas].bounds.height - 6
         # pre-initialize all tabs by selecting them so that they render content when they are later in the background
         @tab_folder.items.each do |item|
           @tab_folder.selection = item

data/samples/hello/hello_canvas_data_binding.rb

@@ -0,0 +1,193 @@
+require 'glimmer-dsl-swt'
+
+class HelloCanvasDataBinding
+  include Glimmer::GUI::CustomWindow
+  
+  CANVAS_WIDTH  = 300
+  CANVAS_HEIGHT = 300
+  
+  attr_accessor :x1_value, :y1_value, :x2_value, :y2_value, :foreground_red, :foreground_green, :foreground_blue, :line_width_value, :line_style_value
+  
+  def foreground_value
+    rgb(foreground_red, foreground_green, foreground_blue)
+  end
+  
+  def line_style_value_options
+    [:line_solid, :line_dash, :line_dot, :line_dashdot, :line_dashdotdot]
+  end
+  
+  before_body {
+    self.x1_value = 0
+    self.y1_value = 0
+    self.x2_value = CANVAS_WIDTH
+    self.y2_value = CANVAS_HEIGHT
+    self.foreground_red = 28
+    self.foreground_green = 128
+    self.foreground_blue = 228
+    self.line_width_value = 3
+    self.line_style_value = :line_dot
+  }
+  
+  body {
+    shell {
+      text 'Hello, Canvas Data-Binding!'
+      
+      tab_folder {
+        tab_item {
+          grid_layout(6, true) {
+            margin_width 0
+            margin_height 0
+            horizontal_spacing 0
+            vertical_spacing 0
+          }
+          text 'line'
+          
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'x1'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'y1'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_WIDTH
+            increment 3
+            selection bind(self, :x1_value)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_HEIGHT
+            increment 3
+            selection bind(self, :y1_value)
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'x2'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'y2'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_WIDTH
+            increment 3
+            selection bind(self, :x2_value)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_HEIGHT
+            increment 3
+            selection bind(self, :y2_value)
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            text 'foreground red'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            text 'foreground green'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            text 'foreground blue'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            maximum 255
+            increment 10
+            selection bind(self, :foreground_red)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            maximum 255
+            increment 10
+            selection bind(self, :foreground_green)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            maximum 255
+            increment 10
+            selection bind(self, :foreground_blue)
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'line width'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'line style'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum 255
+            selection bind(self, :line_width_value)
+          }
+          combo(:read_only) {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            selection bind(self, :line_style_value)
+          }
+          canvas {
+            layout_data(:center, :center, false, false) {
+              horizontal_span 6
+              width_hint CANVAS_WIDTH
+              height_hint CANVAS_WIDTH
+            }
+            background :white
+            
+            line {
+              x1 bind(self, :x1_value)
+              y1 bind(self, :y1_value)
+              x2 bind(self, :x2_value)
+              y2 bind(self, :y2_value)
+              foreground bind(self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue])
+              line_width bind(self, :line_width_value)
+              line_style bind(self, :line_style_value)
+            }
+          }
+        }
+      }
+    }
+  }
+  
+end
+
+HelloCanvasDataBinding.launch

data/samples/hello/hello_canvas_path.rb

@@ -1,66 +1,120 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'glimmer-dsl-swt'
         
 include Glimmer
   
 shell {
+  grid_layout {
+    margin_width 0
+    margin_height 0
+    margin_top 5
+  }
   text 'Hello, Canvas Path!'
   minimum_size 800, 700
-  background :white
   
-    canvas {
-      background :white
-      
-      text('line', 15, 200) {
-        foreground :red
-      }
-      @path1 = path {
-        antialias :on
-        foreground :red
-      }
-      
-      text('quad', 15, 300) {
-        foreground :dark_green
-      }
-      @path2 = path {
-        antialias :on
-        foreground :dark_green
-      }
-      
-      text('cubic', 15, 400) {
-        foreground :blue
-      }
-      @path3 = path {
-        antialias :on
-        foreground :blue
-      }
+  @button = button {
+    layout_data :center, :center, true, false
+    text 'Regenerate'
+    enabled false
+    
+    on_widget_selected {
+      @regenerate = true
+      @button.enabled = false
+    }
+  }
+  canvas {
+    layout_data :fill, :fill, true, true
+    background :white
+    
+    text('line', 15, 200) {
+      foreground :red
+    }
+    @path1 = path {
+      antialias :on
+      foreground :red
     }
+    
+    text('quad', 15, 300) {
+      foreground :dark_green
+    }
+    @path2 = path {
+      antialias :on
+      foreground :dark_green
+    }
+    
+    text('cubic', 15, 400) {
+      foreground :blue
+    }
+    @path3 = path {
+      antialias :on
+      foreground :blue
+    }
+  }
   
   on_swt_show {
-    Thread.new {
-      y1 = y2 = y3 = 300
-      800.times.each do |x|
-        x += 55
-        x1 = x - 2
-        x2 = x - 1
-        x3 = x
-        y1 = y3
-        y2 = y1
-        y3 = [[y3 + (rand*24 - 12), 0].max, 700].min
-        @path1.content {
-          line(x1, y1 - 100)
-        }
-        if x % 2 == 0
-          @path2.content {
-            quad(x1, y1, x2, y2)
-          }
+    @regenerate = true
+    @thread = Thread.new {
+      loop {
+        if @regenerate
+          @regenerate = false
+          @path1.clear
+          @path2.clear
+          @path3.clear
+          y1 = y2 = y3 = 300
+          730.times.each do |x|
+            x += 55
+            x1 = x - 2
+            x2 = x - 1
+            x3 = x
+            y1 = y3
+            y2 = y1
+            y3 = [[y3 + (rand*24 - 12), 0].max, 700].min
+            @path1.content {
+              line(x1, y1 - 100)
+            }
+            if x % 2 == 0
+              @path2.content {
+                quad(x1, y1, x2, y2)
+              }
+            end
+            if x % 3 == 0
+              @path3.content {
+                cubic(x1, y1 + 100, x2, y2 + 100, x3, y3 + 100)
+              }
+            end
+            sleep(0.01)
+          end
+          @button.enabled = true
         end
-        if x % 3 == 0
-          @path3.content {
-            cubic(x1, y1 + 100, x2, y2 + 100, x3, y3 + 100)
-          }
-        end
-        sleep(0.01)
-      end
+        sleep(0.1)
+      }
+            
     }
+    
   }
+  
+  on_widget_disposed {
+    @thread.kill # safe to kill since data is in memory only
+  }
+  
 }.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.6.1
+  version: 4.18.6.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -504,6 +504,7 @@ files:
 - 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