glimmer-dsl-swt 4.18.0.2 → 4.18.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aaf0dca4f250ba15d538f31b0d127fa1f49187208dde61e11fb7d59ce54b33b
-  data.tar.gz: 2fc8e9ea4778467e9f29c90c1e5eaa908eb73fa2df0fea2680141f2c89492174
+  metadata.gz: 174d5b75d96fe6595809e3f212aa30b4fd17caec61fe98018ce8fcf72880c036
+  data.tar.gz: 42f16bb6b36d68dea3ed1886d1993f65b539cc47e22799a4c7bd02fad2208389
 SHA512:
-  metadata.gz: 5babde26d2b5440917f5b30ba2409701f11fa7210e190922ab3d4873d2db03113b5a3b68adfe1a97767cff2ed931259728dc4735cee596aec09c0f21cc9ed3d6
-  data.tar.gz: 198238910b291593d4249716b29e7ce52fce909d3f1b4e8606d1451c9c22b19a74cc0f19fdda2f6f7a3f4182cc0fc595770bc5359ca82890db5b4892204e54bb
+  metadata.gz: 220d7fbbba99b5b9f65c334cd0aec9a3ddb4120227d3ea2876e7ab9327027d70e651b849a4891dd58e5e61f85dce01382919a212c2c39d9d79af83106596bfa3
+  data.tar.gz: ca8a7864a504618abd517aaf97832a185b84e86b7fb21ef4a27ffd70edc068822d1d5aae0ebdd192c9cd5ab106411fd78512354f676e49e1ac2b0dd8a1072154

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 4.18.1.0
+
+- Canvas Shape DSL
+- Hello, Canvas! Sample
+- Animation DSL
+- Hello, Canvas Animation! Sample
+- Fixed issue with async_exec not working in ShellProxy when delegate widget is nil
+
 ### 4.18.0.2
 
 - Minor update on Hello, Dialog! Sample

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.0.2
+# [<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.1.0
 
 
 ## JRuby Desktop Development GUI Framework
@@ -286,6 +286,8 @@ Glimmer App:
     - [Cursor](#cursor)
     - [Layouts](#layouts)
     - [Layout Data](#layout-data)
+    - [Canvas Shape DSL](#canvas-shape-dsl)
+    - [Canvas Animation DSL](#canvas-animation-dsl)
     - [Data-Binding](#data-binding)
       - [General Examples](#general-examples)
       - [Combo](#combo)
@@ -359,6 +361,8 @@ Glimmer App:
       - [Hello, Button!](#hello-button)
       - [Hello, Link!](#hello-link)
       - [Hello, Dialog!](#hello-dialog)
+      - [Hello, Canvas!](#hello-canvas)
+      - [Hello, Canvas Animation!](#hello-canvas-animation)
     - [Elaborate Samples](#elaborate-samples)
       - [User Profile](#user-profile)
       - [Login](#login)
@@ -452,7 +456,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.0.2
+jgem install glimmer-dsl-swt -v 4.18.1.0
 
 
 ```
@@ -472,7 +476,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.0.2
+gem 'glimmer-dsl-swt', '~> 4.18.1.0
 '
 ```
 
@@ -531,7 +535,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.0.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.1.0
 
 
       
@@ -1010,7 +1014,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.8.0     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.0.2
+  Swt    glimmer-dsl-swt    4.18.1.0
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -2285,6 +2289,113 @@ Also, for a reference, check the SWT API:
 
 https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/api/index.html
 
+
+### Canvas Shape DSL
+
+(note: this is a very new feature of Glimmer. It may change a bit while getting battle tested. As always, you could default to basic SWT usage if needed.)
+
+Glimmer supports drawing graphics directly on a `canvas` widget via SWT (or any widget for that matter though `canvas` is recommended for drawing).
+
+This is accomplished via the Shape DSL a sub-DSL of the Glimmer GUI DSL, which makes it possible to draw graphics declaratively with very understandable and maintainable syntax.
+
+Shape keywords are listed below (they basically match method names and arguments on [org.eclipse.swt.graphics.GC](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html) minus the `draw` or `fill` prefix in downcase):
+- `arc​(int x, int y, int width, int height, int startAngle, int arcAngle)`
+- `focus​(int x, int y, int width, int height)`
+- `image(Image image, int x, int y)`
+- `line(int x1, int y1, int x2, int y2)`
+- `oval(int x, int y, int width, int height)`
+- `point​(int x, int y)`
+- `polygon(int[] pointArray)`
+- `polyline(int[] pointArray)`
+- `rectangle(int x, int y, int width, int height)`
+- `round_rectangle(int x, int y, int width, int height, int arcWidth, int arcHeight)`
+- `gradiant_rectangle​(int x, int y, int width, int height, boolean vertical)`
+- `text(String string, int x, int y)`
+
+Shape keywords that can be filled with color can take an additional keyword argument `fill: true`
+
+Optionally, a shape keyword takes a block that can set any attributes from [org.eclipse.swt.graphics.GC](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html) (methods starting with `set`), which enable setting the `background` for filling and `foreground` for drawing.
+
+Example (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
+
+```ruby
+include Glimmer
+
+shell {
+  text 'Canvas Example!'
+  minimum_size 320, 400
+
+  canvas {
+    background :yellow
+    rectangle(0, 0, 220, 400, fill: true) {
+      background :red
+    }
+    round_rectangle(50, 20, 300, 150, 30, 50, fill: true) {
+      background :magenta
+    }
+    gradient_rectangle(150, 200, 100, 70, true, fill: true) {
+      background :dark_magenta
+      foreground :yellow
+    }
+    rectangle(200, 80, 108, 36) {
+      foreground color(:dark_blue)
+    }
+  }
+}.open
+```
+
+Learn more at the [Hello, Canvas! Sample](#hello-canvas).
+
+### Canvas Animation DSL
+
+(note: this is a very new feature of Glimmer. It may change a bit while getting battle tested. As always, you could default to basic SWT usage if needed.)
+
+Glimmer additionally provides built-in support for animations via a declarative Animation DSL, another sub-DSL of the Glimmer GUI DSL.
+
+Animations take advantage of multi-threading, each animation runs in its own independent thread of execution while updating the GUI asynchronously.
+
+This example says it all (it moves a tiny red square across a blue background):
+
+```ruby
+include Glimmer
+
+shell {
+  text 'Canvas Animation Example!'
+  minimum_size 400, 400
+
+  canvas {
+    animation {
+      every 0.1
+      
+      frame { |index|
+        background rgb(index%100, index%100 + 100, index%55 + 200)
+        rectangle(index, index, 20, 20, fill: true) {
+          background :red
+        }
+      }
+    }
+  }
+}.open
+```
+
+Keywords involved:
+- `animation` declares an animation under a canvas, which renders frames indefinitely or finitely depending on properties
+- `every` specifies delay in seconds between every two frame renders
+- `frame` a block that can contain Shape DSL syntax that is rendered dynamically with variables calculated on the fly
+- `cycle` a property that takes an array to cycle into a second variable for the `frame` block
+- `cycle_count` an optional cycle count limit after which the animation stops
+- `frame_count` an optional frame count limit after which the animation stops
+- `started` a boolean indicating if the animation is started right away or stopped waiting for manual startup via `#start` method
+
+API:
+- `#start` starts animation as a method on the animation object (returned from `animation` keyword)
+- `#stop` stops animation gracefully as a method on the animation object (returned from `animation` keyword)
+
+Caveat:
+In order for animation to occur, the frame block must include changes that happen directly on the canvas (like setting initial background updating every frame) not just changes to shapes. This should be fixed in the future.
+
+Learn more at the [Hello, Canvas Animation! Sample](#hello-canvas-animation).
+
 ### Data-Binding
 
 Data-binding is done with `bind` command following widget property to bind and taking model and bindable attribute as arguments.
@@ -4357,6 +4468,34 @@ Hello, Dialog! Open Dialog
 
 ![Hello Dialog Open Dialog](images/glimmer-hello-dialog-open-dialog.png)
 
+#### Hello, Canvas!
+
+This sample demonstrates the use of the `canvas` widget and [Shape DSL](#canvas-shape-dsl) in Glimmer.
+
+Code:
+
+[samples/hello/hello_canvas.rb](samples/hello/hello_canvas.rb)
+
+Hello, Canvas!
+
+![Hello Canvas](images/glimmer-hello-canvas.png)
+
+#### Hello, Canvas Animation!
+
+This sample demonstrates the use of the `canvas` widget and [Animation DSL](#canvas-animation-dsl) in Glimmer.
+
+Code:
+
+[samples/hello/hello_canvas_animation.rb](samples/hello/hello_canvas_animation.rb)
+
+Hello, Canvas Animation!
+
+![Hello Canvas Animation](images/glimmer-hello-canvas-animation.png)
+
+Hello, Canvas Animation Another Frame!
+
+![Hello Canvas Animation Frame 2](images/glimmer-hello-canvas-animation-frame2.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

data/VERSION

@@ -1 +1 @@
-4.18.0.2
+4.18.1.0

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.0.2 ruby lib
+# stub: glimmer-dsl-swt 4.18.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.0.2"
+  s.version = "4.18.1.0"
 
   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-01-13"
+  s.date = "2021-01-19"
   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 version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces while 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. 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]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/data_binding/table_items_binding.rb",
     "lib/glimmer/data_binding/tree_items_binding.rb",
     "lib/glimmer/data_binding/widget_binding.rb",
+    "lib/glimmer/dsl/swt/animation_expression.rb",
     "lib/glimmer/dsl/swt/async_exec_expression.rb",
     "lib/glimmer/dsl/swt/bind_expression.rb",
     "lib/glimmer/dsl/swt/block_property_expression.rb",
@@ -73,6 +74,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb",
     "lib/glimmer/dsl/swt/rgb_expression.rb",
     "lib/glimmer/dsl/swt/rgba_expression.rb",
+    "lib/glimmer/dsl/swt/shape_expression.rb",
     "lib/glimmer/dsl/swt/shell_expression.rb",
     "lib/glimmer/dsl/swt/swt_expression.rb",
     "lib/glimmer/dsl/swt/sync_exec_expression.rb",
@@ -89,9 +91,12 @@ Gem::Specification.new do |s|
     "lib/glimmer/rake_task/scaffold.rb",
     "lib/glimmer/swt/color_proxy.rb",
     "lib/glimmer/swt/cursor_proxy.rb",
+    "lib/glimmer/swt/custom/animation.rb",
     "lib/glimmer/swt/custom/checkbox_group.rb",
     "lib/glimmer/swt/custom/code_text.rb",
+    "lib/glimmer/swt/custom/drawable.rb",
     "lib/glimmer/swt/custom/radio_group.rb",
+    "lib/glimmer/swt/custom/shape.rb",
     "lib/glimmer/swt/date_time_proxy.rb",
     "lib/glimmer/swt/directory_dialog_proxy.rb",
     "lib/glimmer/swt/display_proxy.rb",
@@ -105,6 +110,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/menu_proxy.rb",
     "lib/glimmer/swt/message_box_proxy.rb",
     "lib/glimmer/swt/packages.rb",
+    "lib/glimmer/swt/properties.rb",
     "lib/glimmer/swt/sash_form_proxy.rb",
     "lib/glimmer/swt/scrolled_composite_proxy.rb",
     "lib/glimmer/swt/shell_proxy.rb",
@@ -132,6 +138,8 @@ Gem::Specification.new do |s|
     "samples/elaborate/user_profile.rb",
     "samples/hello/hello_browser.rb",
     "samples/hello/hello_button.rb",
+    "samples/hello/hello_canvas.rb",
+    "samples/hello/hello_canvas_animation.rb",
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_combo.rb",
@@ -174,7 +182,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.7"])
+      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.8"])
       s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -193,7 +201,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
       s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     else
-      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.7"])
+      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.8"])
       s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -213,7 +221,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     end
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.7"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.8"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])

data/lib/ext/glimmer/config.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -30,7 +30,7 @@ module Glimmer
       'org.eclipse.swt.graphics',
       'org.eclipse.swt.browser',
       'org.eclipse.swt.custom',
-      'org.eclipse.swt.dnd',  
+      'org.eclipse.swt.dnd',
     ]
     
     class << self
@@ -99,9 +99,9 @@ module Glimmer
       end
       
       def reset_logger!
-        @first_time = !defined?(@@logger)        
+        @first_time = !defined?(@@logger)
         old_level = logger.level unless @first_time
-        self.logger = Logging.logger['glimmer'].tap do |logger| 
+        self.logger = Logging.logger['glimmer'].tap do |logger|
           logger.level = old_level || :error
           appenders = []
           appenders << Logging.appenders.stdout(logging_appender_options) if logging_devices.include?(:stdout)

data/lib/glimmer-dsl-swt.rb

@@ -37,6 +37,7 @@ require 'super_module'
 require 'rouge'
 require 'date'
 require 'facets/string/capitalized'
+require 'facets/hash/symbolize_keys'
 
 # Internal requires
 require 'ext/glimmer/config'

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

@@ -0,0 +1,43 @@
+# 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/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/custom/animation'
+
+module Glimmer
+  module DSL
+    module SWT
+      class AnimationExpression < StaticExpression
+        include ParentExpression
+        
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::Custom::Animation.new(parent)
+        end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -54,6 +54,7 @@ module Glimmer
           block_property
           widget
           custom_widget
+          shape
         ]
       )
     end

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

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -22,6 +22,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/swt/font_proxy'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module DSL
@@ -32,9 +33,10 @@ module Glimmer
         include TopLevelExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          keyword.to_s == 'font' and     
+          keyword.to_s == 'font' and
             (parent.nil? || !parent.respond_to?('font')) and
-            args.size == 1 and 
+            !parent.is_a?(Glimmer::SWT::Custom::Shape) and
+            args.size == 1 and
             args.first.is_a?(Hash)
         end
   

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

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

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

@@ -0,0 +1,56 @@
+# 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/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/custom/shape'
+
+module Glimmer
+  module DSL
+    module SWT
+      class ShapeExpression < Expression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          (
+            (parent.respond_to?(:swt_widget) and parent.swt_widget.is_a?(org.eclipse.swt.graphics.Drawable)) or
+            (parent.respond_to?(:swt_display) and parent.swt_display.is_a?(org.eclipse.swt.graphics.Drawable))
+          ) and
+            Glimmer::SWT::Custom::Shape.valid?(parent, keyword, *args, &block)
+        end
+        
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::Custom::Shape.new(parent, keyword, *args)
+        end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+      
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -32,9 +32,10 @@ module Glimmer
         EXCLUDED_KEYWORDS = %w[shell display tab_item]
 
         def can_interpret?(parent, keyword, *args, &block)
-          !EXCLUDED_KEYWORDS.include?(keyword) and
-            parent.respond_to?(:swt_widget) and #TODO change to composite?(parent)
+          result = !EXCLUDED_KEYWORDS.include?(keyword) &&
+            parent.respond_to?(:swt_widget) && #TODO change to composite?(parent)
             Glimmer::SWT::WidgetProxy.widget_exists?(keyword)
+          (keyword.to_s == 'text' && args.first.is_a?(String)) ? false : result
         end
 
         def interpret(parent, keyword, *args, &block)
@@ -47,8 +48,11 @@ module Glimmer
         end
 
       end
+      
     end
+    
   end
+  
 end
 
 require 'glimmer/swt/widget_proxy'

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

@@ -0,0 +1,116 @@
+# 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/swt/properties'
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents an animation declaratively
+      class Animation
+        include Properties # TODO rename to Properties
+        
+        attr_reader :parent, :options, :frame_index
+        alias current_frame_index frame_index
+        attr_accessor :frame_block, :every, :cycle, :cycle_count, :frame_count, :started
+        # TODO consider supporting an async: false option
+        
+        def initialize(parent)
+          @parent = parent
+          @started = true
+          @frame_index = 0
+        end
+        
+        def post_add_content
+          @parent.on_widget_disposed { stop }
+          start if @started
+        end
+    
+        def start
+          swt_display = Glimmer::SWT::DisplayProxy.instance.swt_display
+          return if swt_display.is_disposed?
+          Thread.new do
+            frame_rendering_block = lambda do
+              block_args = [@frame_index]
+              block_args << @cycle[@frame_index % @cycle.length] if @cycle.is_a?(Array)
+              swt_display.async_exec do
+                @parent.clear_shapes
+                @parent.content {
+                  frame_block.call(*block_args)
+                }
+              end
+              @frame_index += 1
+              sleep(every) if every.is_a?(Numeric)
+            end
+  
+            if cycle_count.is_a?(Integer) && cycle.is_a?(Array)
+              (cycle_count * cycle.length).times do
+                break if break_condition?
+                begin
+                  frame_rendering_block.call
+                rescue => e
+                  Glimmer::Config.logger.error {e}
+                  break
+                end
+              end
+            else
+              loop do
+                break if break_condition?
+                begin
+                  frame_rendering_block.call
+                rescue => e
+                  Glimmer::Config.logger.error {e}
+                  break
+                end
+              end
+            end
+            @started = false
+          end
+        end
+        
+        def stop
+          @started = false
+        end
+        
+        def has_attribute?(attribute_name, *args)
+          respond_to?(ruby_attribute_setter(attribute_name)) && respond_to?(ruby_attribute_getter(attribute_name))
+        end
+  
+        def set_attribute(attribute_name, *args)
+          send(ruby_attribute_setter(attribute_name), *args)
+        end
+  
+        def get_attribute(attribute_name)
+          send(ruby_attribute_getter(attribute_name))
+        end
+        
+        private
+        
+        def break_condition?
+          !@started || (@frame_count.is_a?(Integer) && @frame_index == @frame_count)
+        end
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,43 @@
+# 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.
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents SWT drawable controls (widgets like canvas) and display
+      module Drawable
+        def shapes
+          @shapes ||= []
+        end
+        
+        def clear_shapes
+          shapes.dup.each do |shape|
+            shape.paint_listener_proxy&.unregister
+            shapes.delete(shape)
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,135 @@
+# 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/swt/properties'
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
+      # swt_widget returns the parent (e.g. a `canvas` WidgetProxy), equivalent to `parent.swt_widget`
+      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
+      class Shape
+        include Properties
+        # TODO support textExtent as an option
+        # TODO support a Pattern DSL for methods that take Pattern arguments
+        
+        class << self
+          def valid?(parent, keyword, *args, &block)
+            gc_instance_methods.include?(method_name(keyword, args))
+          end
+          
+          def gc_instance_methods
+            org.eclipse.swt.graphics.GC.instance_methods.map(&:to_s)
+          end
+          
+          def arg_options(args, extract: false)
+            arg_options_method = extract ? :pop : :last
+            options = args.send(arg_options_method) if args.last.is_a?(Hash)
+            options.nil? ? {} : options.symbolize_keys
+          end
+          
+          def method_name(keyword, args)
+            gc_instance_method_name_prefix = arg_options(args)[:fill] ? 'fill_' : 'draw_'
+            "#{gc_instance_method_name_prefix}#{keyword}"
+          end
+        end
+        
+        attr_reader :parent, :name, :args, :options, :swt_widget, :paint_listener_proxy
+        
+        def initialize(parent, keyword, *args)
+          @parent = parent
+          @name = keyword
+          @method_name = self.class.method_name(keyword, args)
+          @options = self.class.arg_options(args, extract: true)
+          @args = args
+          @swt_widget = parent.respond_to?(:swt_display) ? parent.swt_display : parent.swt_widget
+          @properties = {}
+          @parent.shapes << self
+        end
+        
+        def fill?
+          !draw?
+        end
+        
+        def draw?
+          !@options[:fill]
+        end
+        
+        def post_add_content
+          event_handler = lambda do |event|
+            @properties.each do |property, args|
+              method_name = attribute_setter(property)
+              handle_conversions(method_name, args)
+              event.gc.send(method_name, *args)
+            end
+            event.gc.send(@method_name, *@args)
+          end
+          if parent.respond_to?(:swt_display)
+            @paint_listener_proxy = @parent.on_swt_paint(&event_handler)
+          else
+            @paint_listener_proxy = @parent.on_paint_control(&event_handler)
+          end
+        end
+        
+        def handle_conversions(method_name, args)
+          the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
+          if args.first.is_a?(Symbol) || args.first.is_a?(String)
+            if the_java_method.parameter_types.first == Color.java_class
+              args[0] = ColorProxy.new(args[0])
+            end
+          end
+          if args.first.is_a?(ColorProxy)
+            args[0] = args[0].swt_color
+          end
+          if args.first.is_a?(Hash)
+            if the_java_method.parameter_types.first == Font.java_class
+              args[0] = FontProxy.new(args[0])
+            end
+          end
+          if args.first.is_a?(FontProxy)
+            args[0] = args[0].swt_font
+          end
+          
+          # TODO convert SWT style symbol to integer if method takes integer
+        end
+        
+        def has_attribute?(attribute_name, *args)
+          # TODO test that attribute getter responds too
+          self.class.gc_instance_methods.include?(attribute_setter(attribute_name))
+        end
+  
+        def set_attribute(attribute_name, *args)
+          # TODO special treatment for color symbols
+          @properties[attribute_name] = args
+        end
+  
+        def get_attribute(attribute_name)
+          @properties.symbolize_keys[attribute_name.to_s.to_sym]
+        end
+    
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/display_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/widget_listener_proxy'
+require 'glimmer/swt/custom/drawable'
 
 module Glimmer
   module SWT
@@ -36,6 +37,8 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class DisplayProxy
       include_package 'org.eclipse.swt.widgets'
+      
+      include Custom::Drawable
 
       OBSERVED_MENU_ITEMS = ['about', 'preferences']
 
@@ -60,6 +63,18 @@ module Glimmer
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
       end
+      
+      def async_exec(&block)
+        @swt_display.async_exec(&block)
+      end
+
+      def sync_exec(&block)
+        @swt_display.sync_exec(&block)
+      end
+
+      def timer_exec(&block)
+        @swt_display.timer_exec(&block)
+      end
 
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)

data/lib/glimmer/swt/font_proxy.rb

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

data/lib/glimmer/swt/properties.rb

@@ -0,0 +1,49 @@
+# 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.
+
+module Glimmer
+  module SWT
+    module Properties
+      def ruby_attribute_setter(attribute_name)
+        "#{normalized_attribute(attribute_name)}="
+      end
+
+      def attribute_setter(attribute_name)
+        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
+      end
+
+      def attribute_getter(attribute_name)
+        "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
+      end
+      
+      def normalized_attribute(attribute_name)
+        attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
+        attribute_name = attribute_name.underscore unless attribute_name.downcase?
+        attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
+        attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
+        attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
+        attribute_name
+      end
+      alias ruby_attribute_getter normalized_attribute
+      
+    end
+  end
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -64,10 +64,11 @@ module Glimmer
           @swt_widget.setLayout(FillLayout.new)
           @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
           # TODO make this an option not the default
+          shell_swt_display = Glimmer::SWT::DisplayProxy.instance.swt_display
           on_swt_show do
             Thread.new do
               sleep(0.25)
-              async_exec do
+              shell_swt_display.async_exec do
                 @swt_widget.setActive unless @swt_widget.isDisposed
               end
             end

data/lib/glimmer/swt/widget_proxy.rb

@@ -26,6 +26,8 @@ require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/dnd_proxy'
 require 'glimmer/swt/image_proxy'
+require 'glimmer/swt/properties'
+require 'glimmer/swt/custom/drawable'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
 
@@ -42,6 +44,8 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
+      include Properties
+      include Custom::Drawable
 
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
@@ -667,28 +671,6 @@ module Glimmer
         DEFAULT_STYLES[underscored_widget_name] || [:none]
       end
 
-      def ruby_attribute_setter(attribute_name)
-        "#{normalized_attribute(attribute_name)}="
-      end
-
-      def attribute_setter(attribute_name)
-        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
-      end
-
-      def attribute_getter(attribute_name)
-        "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
-      end
-      
-      def normalized_attribute(attribute_name)
-        attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
-        attribute_name = attribute_name.underscore unless attribute_name.downcase?
-        attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
-        attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
-        attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
-        attribute_name
-      end
-      alias ruby_attribute_getter normalized_attribute
-
       # TODO refactor following methods to eliminate duplication
       # perhaps consider relying on raising an exception to avoid checking first
       # unless that gives obscure SWT errors

data/samples/hello/hello_canvas.rb

@@ -0,0 +1,62 @@
+# 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.
+
+include Glimmer
+
+shell {
+  text 'Hello, Canvas!'
+  minimum_size 320, 400
+
+  canvas {
+    background :yellow
+    rectangle(0, 0, 220, 400, fill: true) {
+      background :red
+    }
+    round_rectangle(50, 20, 300, 150, 30, 50, fill: true) {
+      background :magenta
+    }
+    gradient_rectangle(150, 200, 100, 70, true, fill: true) {
+      background :dark_magenta
+      foreground :yellow
+    }
+    gradient_rectangle(50, 200, 30, 70, false, fill: true) {
+      background :magenta
+      foreground :dark_blue
+    }
+    rectangle(200, 80, 108, 36) {
+      foreground color(:dark_blue)
+    }
+    text('Picasso', 60, 80) {
+      background :yellow
+      foreground :dark_magenta
+      font name: 'Courier', height: 30
+    }
+    oval(110, 310, 100, 100, fill: true) {
+      background rgb(128, 138, 248)
+    }
+    arc(210, 210, 100, 100, 30, -77, fill: true) {
+      background :red
+    }
+    polygon([250, 210, 260, 170, 270, 210, 290, 230, 250, 210]) {
+      background :dark_yellow
+    }
+  }
+}.open

data/samples/hello/hello_canvas_animation.rb

@@ -0,0 +1,66 @@
+# 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.
+
+include Glimmer
+
+shell {
+  text 'Hello, Canvas Animation!'
+  minimum_size 800, 420
+
+  canvas {
+    animation {
+      every 0.01 # in seconds (one hundredth)
+            
+      frame { |index| # frame block loops indefinitely (unless frame_count is set to an integer)
+        background rgb(index%255, 100, 200) # sets canvas background color
+        
+        oval(0, 0, 400, 400) { # x, y, width, height
+          foreground :black # sets oval background color
+        }
+        arc(0, 0, 400, 400, -1*index%360, 10, fill: true) {  # x, y, width, height, start angle, arc angle
+          background rgb(200, 200, 50) # sets arc background color
+        }
+      }
+    }
+  }
+
+  canvas {
+    colors = [:yellow, :red]
+    animation {
+      every 0.25 # in seconds (one quarter)
+      cycle colors # cycles array of colors into the second variable of the frame block below
+
+      frame { |index, color| # frame block loops indefinitely (unless frame_count or cycle_count is set to an integer)
+        outside_color = colors[index % 2]
+        inside_color = colors[(index + 1) % 2]
+        
+        background outside_color # sets canvas background color
+        
+        rectangle(0, 0, 200, 200, fill: true) {
+          background inside_color # sets rectangle background color
+        }
+        rectangle(200, 200, 200, 200, fill: true) {
+          background inside_color # sets rectangle background color
+        }
+      }
+    }
+  }
+}.open

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.0.2
+  version: 4.18.1.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -373,6 +373,7 @@ files:
 - lib/glimmer/data_binding/table_items_binding.rb
 - lib/glimmer/data_binding/tree_items_binding.rb
 - lib/glimmer/data_binding/widget_binding.rb
+- lib/glimmer/dsl/swt/animation_expression.rb
 - lib/glimmer/dsl/swt/async_exec_expression.rb
 - lib/glimmer/dsl/swt/bind_expression.rb
 - lib/glimmer/dsl/swt/block_property_expression.rb
@@ -404,6 +405,7 @@ files:
 - lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/swt/rgb_expression.rb
 - lib/glimmer/dsl/swt/rgba_expression.rb
+- lib/glimmer/dsl/swt/shape_expression.rb
 - lib/glimmer/dsl/swt/shell_expression.rb
 - lib/glimmer/dsl/swt/swt_expression.rb
 - lib/glimmer/dsl/swt/sync_exec_expression.rb
@@ -420,9 +422,12 @@ files:
 - lib/glimmer/rake_task/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/cursor_proxy.rb
+- lib/glimmer/swt/custom/animation.rb
 - lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/code_text.rb
+- lib/glimmer/swt/custom/drawable.rb
 - lib/glimmer/swt/custom/radio_group.rb
+- lib/glimmer/swt/custom/shape.rb
 - lib/glimmer/swt/date_time_proxy.rb
 - lib/glimmer/swt/directory_dialog_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
@@ -436,6 +441,7 @@ files:
 - lib/glimmer/swt/menu_proxy.rb
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/packages.rb
+- lib/glimmer/swt/properties.rb
 - lib/glimmer/swt/sash_form_proxy.rb
 - lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
@@ -463,6 +469,8 @@ files:
 - samples/elaborate/user_profile.rb
 - samples/hello/hello_browser.rb
 - samples/hello/hello_button.rb
+- samples/hello/hello_canvas.rb
+- samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
 - samples/hello/hello_combo.rb