glimmer-dsl-swt 4.18.1.0 → 4.18.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 174d5b75d96fe6595809e3f212aa30b4fd17caec61fe98018ce8fcf72880c036
-  data.tar.gz: 42f16bb6b36d68dea3ed1886d1993f65b539cc47e22799a4c7bd02fad2208389
+  metadata.gz: 2aa85c5f6d4f5a71bbc9538f291fff86199d26219c7b919068b5be7f99fc4bfd
+  data.tar.gz: 4db3a940c06f112c309e822ce73b0a1e98317f87ae808c183f261d49d357c490
 SHA512:
-  metadata.gz: 220d7fbbba99b5b9f65c334cd0aec9a3ddb4120227d3ea2876e7ab9327027d70e651b849a4891dd58e5e61f85dce01382919a212c2c39d9d79af83106596bfa3
-  data.tar.gz: ca8a7864a504618abd517aaf97832a185b84e86b7fb21ef4a27ffd70edc068822d1d5aae0ebdd192c9cd5ab106411fd78512354f676e49e1ac2b0dd8a1072154
+  metadata.gz: 96d95b883f011fc5d706382c4a8f1eea500ccd9ad15bf1fb3c82e9c7509348d0dcd16ef4c99ef963eb3bb4760e63aca217d0f4ab43d404ea6c8fa636bdfc8adc
+  data.tar.gz: a5182246e7825790b8c63ed8b7506d0e35e93af1f5a2e60c8ad6e015cee6fb092357ef2ca842d6f4bcf432b9cc5676b8167ec2bb42ef6dde47d007e50e1c2ba0

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+### 4.18.1.1
+
+- Add smart defaults for round rectangle angles (defaults to 60 degrees angles)
+- Add smart default for gradient rectangle vertical option
+- Small update to Hello, Canvas! Sample
+- Convert SWT style symbol to SWT style integer if method takes integer but receives a symbol (or string)
+- Make polygon not require [] for its array args
+- Allow cycle to receive splatted array as varargs
+- Change references to `Display.setAppName` and `Display.setAppVersion` to `Display.app_name =` and `Display.app_version =`
+- Default Glimmer app name to "Glimmer" (instead of previous "SWT") unless `Display.app_name = "Somename"` is set by consumer before instantiating first display
+- Set default background to system widget background default for fill shapes
+- Set default foreground to black for draw shapes
+- Fix issue with shapes always requiring a block (even an empty one) to render
+- Fix issue with animation requiring changes to canvas directly in addition to shapes
+- Fix issue with `glimmer list:gems:dsl` command
+- Fix issue with scaffolding still depending on git-glimmer despite being merged back to git gem
+
 ### 4.18.1.0
 
 - Canvas Shape DSL

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.1.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.1.1
 
 
 ## JRuby Desktop Development GUI Framework
@@ -12,7 +12,7 @@
 
 (The Original Glimmer Library Since 2007. Beware of Imitators!)
 
-[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 version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces while 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](#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](https://rubygems.org/gems/glimmer) offers [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) 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](#custom-shell-gem) on [Linux](https://www.linux.org/).
+[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 version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces while 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](#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](#widgets), but also supports drawing Canvas Graphics like [Shapes](#canvas-shape-dsl) and [Animations](#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) 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](#custom-shell-gem) 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.
 
@@ -456,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.1.0
+jgem install glimmer-dsl-swt -v 4.18.1.1
 
 
 ```
@@ -476,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.1.0
+gem 'glimmer-dsl-swt', '~> 4.18.1.1
 '
 ```
 
@@ -535,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.1.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.1.1
 
 
       
@@ -593,6 +593,8 @@ glimmer samples/hello/hello_world.rb samples/hello/hello_tab.rb
 
 Launches samples/hello/hello_world.rb and samples/hello_tab.rb at the same time, each in a separate JRuby thread.
 
+Note: under Zsh (Z Shell), glimmer can only be used in its advanced TUI mode (e.g. `glimmer` and then selecting a task) not the primitive rake task mode (e.g. `glimmer scaffold[app]`)
+
 ### Glimmer Samples
 
 You can list available Glimmer samples by running:
@@ -1013,8 +1015,8 @@ Output:
   Name         Gem          Version    Author          Description
                                                                          
   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.1.0
+  Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
+  Swt    glimmer-dsl-swt    4.18.1.1
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -2298,31 +2300,45 @@ Glimmer supports drawing graphics directly on a `canvas` widget via SWT (or any
 
 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`
+Shape keywords and their args (including defaults) 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​(x, y, width, height, startAngle, arcAngle, fill: false)`
+- `focus​(x, y, width, height)`
+- `image(image, x, y)`
+- `line(x1, y1, x2, y2)`
+- `oval(x, y, width, height, fill: false)`
+- `point​(x, y)`
+- `polygon(pointArray, fill: false)`
+- `polyline(pointArray)`
+- `rectangle(x, y, width, height, fill: false)`
+- `round_rectangle(x, y, width, height, arcWidth = 60, arcHeight = 60, fill: false)`
+- `gradient_rectangle​(x, y, width, height, vertical = true, fill: false)`
+- `text(String string, x, y)`
+
+Shape keywords that can be filled with color can take an keyword argument `fill: true` (defaults to false when not specified)
 
 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.
 
+Here is a list of supported attributes nestable within a block under shapes:
+- `alpha` sets transparency (integer between 0 and 255)
+- `antialias` enables antialiasing (SWT style value of :default, :off, :on whereby :default applies OS default)
+- `background` sets fill color for fillable shapes (standard color symbol (e.g. :red), `rgb(red_integer, green_integer, blue_integer)` color, or Color/ColorProxy object directly)
+- `clipping​(x, y, width, height)` clips area of painting
+- `fill_rule` sets filling rule (SWT style value of :fill_even_odd or :fill_winding)
+- `font` sets font (Hash of :name, :height, and :style just like standard widget font property, or Font/FontProxy object directly)
+- `line_cap` sets line cap (SWT style value of :cap_flat, :cap_round, or :cap_square)
+- `line_dash` line dash float values (automatically sets `line_style` to SWT style value of :line_custom)
+- `line_join` line join style (SWT style value of :join_miter, :join_round, or :join_bevel)
+- `line_style` line join style (SWT style value of :line_solid, :line_dash, :line_dot, :line_dashdot, or :line_dashdotdot)
+- `line_width` line width in integer (used in draw operations)
+- `text_anti_alias` enables text antialiasing (SWT style value of :default, :off, :on whereby :default applies OS default)
+
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
 
 ```ruby
 include Glimmer
 
 shell {
-  text 'Canvas Example!'
+  text 'Canvas Example'
   minimum_size 320, 400
 
   canvas {
@@ -2344,6 +2360,10 @@ shell {
 }.open
 ```
 
+Screenshot:
+
+![Canvas Animation Example](images/glimmer-example-canvas.png)
+
 Learn more at the [Hello, Canvas! Sample](#hello-canvas).
 
 ### Canvas Animation DSL
@@ -2360,7 +2380,7 @@ This example says it all (it moves a tiny red square across a blue background):
 include Glimmer
 
 shell {
-  text 'Canvas Animation Example!'
+  text 'Canvas Animation Example'
   minimum_size 400, 400
 
   canvas {
@@ -2378,8 +2398,12 @@ shell {
 }.open
 ```
 
-Keywords involved:
-- `animation` declares an animation under a canvas, which renders frames indefinitely or finitely depending on properties
+Screenshot:
+
+![Canvas Animation Example](images/glimmer-example-canvas-animation.png)
+
+Keywords:
+- `animation` declares an animation under a canvas, which renders frames using a frame block indefinitely or finitely depending on (cycle_count/frame_count) 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
@@ -2391,9 +2415,6 @@ 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
@@ -3579,12 +3600,12 @@ Example.new
 
 Application name (shows up on the Mac in top menu bar) and version may be specified upon [packaging](#packaging--distribution) by specifying "-Bmac.CFBundleName" and "-Bmac.CFBundleVersion" options.
 
-Still, if you would like proper application name to show up on the Mac top menu bar during development, you may do so by invoking the SWT Display.setAppName method before any Display object has been instantiated (i.e. before any Glimmer widget like shell has been declared).
+Still, if you would like proper application name to show up on the Mac top menu bar during development, you may do so by invoking the SWT `Display.app_name=` method before any Display object has been instantiated (i.e. before any Glimmer widget like shell has been declared).
 
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
 
 ```ruby
-Display.setAppName('Glimmer Demo')
+Display.app_name = 'Glimmer Demo'
 
 shell(:no_resize) {
   text "Glimmer"
@@ -3594,7 +3615,7 @@ shell(:no_resize) {
 }.open
 ```
 
-Also, you may invoke `Display.setAppVersion('1.0.0')` if needed for OS app version identification reasons during development, replacing `'1.0.0'` with your application version.
+Also, you may invoke `Display.app_version = '1.0.0'` if needed for OS app version identification reasons during development, replacing `'1.0.0'` with your application version.
 
 #### Checkbox Group Widget
 

data/VERSION

@@ -1 +1 @@
-4.18.1.0
+4.18.1.1

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.1.0 ruby lib
+# stub: glimmer-dsl-swt 4.18.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.1.0"
+  s.version = "4.18.1.1"
 
   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-19"
+  s.date = "2021-01-20"
   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]

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

@@ -39,7 +39,7 @@ module Glimmer
         end
         
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::Custom::Shape.new(parent, keyword, *args)
+          Glimmer::SWT::Custom::Shape.new(parent, keyword, *args, &block)
         end
         
         def add_content(parent, &block)

data/lib/glimmer/rake_task/list.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
@@ -57,11 +57,11 @@ module Glimmer
           lines = `gem search -d #{gem_prefix}`.split("\n")
           gems = lines.slice_before {|l| l.match(REGEX_GEM_LINE) }.to_a
           gems = gems.map do |gem|
-            {            
+            {
               name: gem[0].match(REGEX_GEM_LINE)[1],
               version: gem[0].match(REGEX_GEM_LINE)[2],
               author: gem[1].strip,
-              description: gem[4..-1].map(&:strip).join(' ')
+              description: gem[4..-1]&.map(&:strip)&.join(' ').to_s
             }
           end.select do |gem|
             query.nil? || "#{gem[:name]} #{gem[:author]} #{gem[:description]}".downcase.include?(query.to_s.downcase)

data/lib/glimmer/rake_task/scaffold.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
@@ -113,7 +113,6 @@ module Glimmer
           
           group :development do
             gem 'rspec', '~> 3.5.0'
-            gem 'git-glimmer', '1.7.0'
             gem 'juwelier', '2.4.9'
             gem 'warbler', '2.0.5'
             gem 'simplecov', '>= 0'
@@ -133,12 +132,12 @@ module Glimmer
           gem_summary = human_name(app_name)
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
-          system "jruby -r git-glimmer -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           rm_rf 'lib'
           write '.gitignore', GITIGNORE
-          write '.ruby-version', RUBY_VERSION        
+          write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', app_name
           write 'VERSION', '1.0.0'
           write 'LICENSE.txt', "Copyright (c) #{Time.now.year} #{app_name}"
@@ -178,7 +177,7 @@ module Glimmer
             system "bundle"
             system "rspec --init"
           else
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"          
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"
           end
           write 'spec/spec_helper.rb', spec_helper_file
           if OS.windows?
@@ -191,7 +190,7 @@ module Glimmer
             else
               system "glimmer run"
             end
-          end        
+          end
         end
     
         def custom_shell(custom_shell_name, namespace, shell_type = nil, shell_options = {})
@@ -231,11 +230,11 @@ module Glimmer
           end
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
-          system "jruby -r git-glimmer -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           write '.gitignore', GITIGNORE
-          write '.ruby-version', RUBY_VERSION        
+          write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
           write 'Gemfile', GEMFILE
@@ -256,7 +255,7 @@ module Glimmer
             system "rspec --init"
           else
             system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"
-          end      
+          end
           write 'spec/spec_helper.rb', spec_helper_file
     
           mkdir_p 'package/windows'
@@ -283,7 +282,7 @@ module Glimmer
               system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
             else
               system "glimmer run"
-            end        
+            end
           end
           puts "Finished creating #{gem_name} Ruby gem."
           puts 'Edit Rakefile to configure gem details.'
@@ -305,11 +304,11 @@ module Glimmer
           
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
-          system "jruby -r git-glimmer -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           write '.gitignore', GITIGNORE
-          write '.ruby-version', RUBY_VERSION        
+          write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
           write 'Gemfile', GEMFILE
@@ -397,9 +396,9 @@ module Glimmer
             class #{class_name(app_name)}
               include Glimmer
             
-              APP_ROOT = File.expand_path('../..', __FILE__)        
+              APP_ROOT = File.expand_path('../..', __FILE__)
               VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
-              LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))          
+              LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
                         
               def open
                 app_view.open
@@ -443,7 +442,7 @@ module Glimmer
               
               launcher = Glimmer::Launcher.new([runner] + ARGV)
               launcher.launch
-            end            
+            end
           MULTI_LINE_STRING
         end
         
@@ -482,7 +481,7 @@ module Glimmer
               
               launcher = Glimmer::Launcher.new([runner] + ARGV)
               launcher.launch
-            end                        
+            end
           MULTI_LINE_STRING
         end
     
@@ -502,15 +501,15 @@ module Glimmer
           end
           spec_pattern_line_index = lines.index(lines.detect {|l| l.include?('spec.pattern =') })
           lines.insert(spec_pattern_line_index+1, "  spec.ruby_opts = [Glimmer::Launcher.jruby_os_specific_options]")
-          lines << "\nrequire 'glimmer/rake_task'\n"       
+          lines << "\nrequire 'glimmer/rake_task'\n"
           file_content = lines.join("\n")
           if custom_shell_name
-            file_content << <<~MULTI_LINE_STRING  
+            file_content << <<~MULTI_LINE_STRING
               Glimmer::RakeTask::Package.javapackager_extra_args =
                 " -name '#{human_name(custom_shell_name)}'" +
                 " -title '#{human_name(custom_shell_name)}'" +
                 " -Bmac.CFBundleName='#{human_name(custom_shell_name)}'" +
-                " -Bmac.CFBundleIdentifier='org.#{namespace ? compact_name(namespace) : compact_name(custom_shell_name)}.application.#{compact_name(custom_shell_name).camelcase(:upper)}'" 
+                " -Bmac.CFBundleIdentifier='org.#{namespace ? compact_name(namespace) : compact_name(custom_shell_name)}.application.#{compact_name(custom_shell_name).camelcase(:upper)}'"
                 # " -BlicenseType=" +
                 # " -Bmac.category=" +
                 # " -Bmac.signing-key-developer-id-app="
@@ -575,8 +574,8 @@ module Glimmer
           if %i[gem app desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
         before_body {
-          Display.setAppName('#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}')
-          Display.setAppVersion(VERSION)
+          Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
+          Display.app_version = VERSION
           @display = display {
             on_about {
               display_about_dialog
@@ -600,7 +599,7 @@ module Glimmer
         ## Use after_body block to setup observers for widgets in body
         #
         # after_body {
-        # 
+        #
         # }
     
         ## Add widget content inside custom shell body
@@ -616,10 +615,10 @@ module Glimmer
           MULTI_LINE_STRING
             
           if shell_type == :desktopify
-            custom_shell_file_content += <<-MULTI_LINE_STRING            
+            custom_shell_file_content += <<-MULTI_LINE_STRING
             browser {
-              url "#{shell_options[:website]}"              
-            }            
+              url "#{shell_options[:website]}"
+            }
             MULTI_LINE_STRING
           else
             custom_shell_file_content += <<-MULTI_LINE_STRING
@@ -628,7 +627,7 @@ module Glimmer
               text bind(self, :greeting)
               font height: 40
               layout_data :fill, :center, true, true
-            }            
+            }
             MULTI_LINE_STRING
           end
           
@@ -690,7 +689,7 @@ module Glimmer
               text 'Greeting'
               font style: :bold
               [
-                'Hello, World!', 
+                'Hello, World!',
                 'Howdy, Partner!'
               ].each do |greeting_text|
                 button(:radio) {
@@ -733,19 +732,19 @@ module Glimmer
                 #
                 #
                 # before_body {
-                # 
+                #
                 # }
             
                 ## Use after_body block to setup observers for widgets in body
                 #
                 # after_body {
-                # 
+                #
                 # }
             
                 ## Add widget content under custom widget body
                 ##
-                ## If you want to add a shell as the top-most widget, 
-                ## consider creating a custom shell instead 
+                ## If you want to add a shell as the top-most widget,
+                ## consider creating a custom shell instead
                 ## (Glimmer::UI::CustomShell offers shell convenience methods, like show and hide)
                 #
                 body {

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

@@ -28,9 +28,9 @@ module Glimmer
       class Animation
         include Properties # TODO rename to Properties
         
-        attr_reader :parent, :options, :frame_index
+        attr_reader :parent, :options, :frame_index, :cycle
         alias current_frame_index frame_index
-        attr_accessor :frame_block, :every, :cycle, :cycle_count, :frame_count, :started
+        attr_accessor :frame_block, :every, :cycle_count, :frame_count, :started
         # TODO consider supporting an async: false option
         
         def initialize(parent)
@@ -43,43 +43,18 @@ module Glimmer
           @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?
+          swt_display = DisplayProxy.instance.swt_display
           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
+                break unless draw_frame(swt_display)
               end
             else
               loop do
-                break if break_condition?
-                begin
-                  frame_rendering_block.call
-                rescue => e
-                  Glimmer::Config.logger.error {e}
-                  break
-                end
+                # this code has to be duplicated to break from a loop (break keyword only works when literally in a loop block)
+                break unless draw_frame(swt_display)
               end
             end
             @started = false
@@ -102,11 +77,40 @@ module Glimmer
           send(ruby_attribute_getter(attribute_name))
         end
         
+        def cycle=(*args)
+          if args.size == 1
+            if args.first.is_a?(Array)
+              @cycle = args.first
+            else
+              @cycle = [args.first]
+            end
+          elsif args.size > 1
+            @cycle = args
+          end
+        end
+        
         private
         
-        def break_condition?
-          !@started || (@frame_count.is_a?(Integer) && @frame_index == @frame_count)
+        # Returns true on success of painting a frame and false otherwise
+        def draw_frame(swt_display)
+          return false if !@started || (@frame_count.is_a?(Integer) && @frame_index == @frame_count)
+          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)
+            }
+            @parent.redraw
+          end
+          @frame_index += 1
+          sleep(every) if every.is_a?(Numeric)
+          true
+        rescue => e
+          Glimmer::Config.logger.error {e}
+          false
         end
+        
       end
       
     end

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

@@ -55,7 +55,7 @@ module Glimmer
         
         attr_reader :parent, :name, :args, :options, :swt_widget, :paint_listener_proxy
         
-        def initialize(parent, keyword, *args)
+        def initialize(parent, keyword, *args, &property_block)
           @parent = parent
           @name = keyword
           @method_name = self.class.method_name(keyword, args)
@@ -64,6 +64,7 @@ module Glimmer
           @swt_widget = parent.respond_to?(:swt_display) ? parent.swt_display : parent.swt_widget
           @properties = {}
           @parent.shapes << self
+          post_add_content if property_block.nil?
         end
         
         def fill?
@@ -76,11 +77,15 @@ module Glimmer
         
         def post_add_content
           event_handler = lambda do |event|
+            @properties['background'] = [DisplayProxy.instance.get_system_color(SWTProxy(:color_widget_background))] if fill? && !@properties.keys.map(&:to_s).include?('background')
+            @properties['foreground'] = [ColorProxy.new(0, 0, 0)] if draw? && !@properties.keys.map(&:to_s).include?('foreground')
             @properties.each do |property, args|
               method_name = attribute_setter(property)
-              handle_conversions(method_name, args)
+              apply_property_arg_conversions(method_name, args)
               event.gc.send(method_name, *args)
             end
+            apply_shape_arg_conversions(@method_name, @args)
+            apply_shape_arg_defaults(@method_name, @args)
             event.gc.send(@method_name, *@args)
           end
           if parent.respond_to?(:swt_display)
@@ -90,28 +95,42 @@ module Glimmer
           end
         end
         
-        def handle_conversions(method_name, args)
+        def apply_property_arg_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 (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
+            if the_java_method.parameter_types.first == Java::int.java_class
+              args[0] = SWTProxy[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
+          if args.first.is_a?(Hash) && the_java_method.parameter_types.first == Font.java_class
+            args[0] = FontProxy.new(args[0])
           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 apply_shape_arg_conversions(method_name, args)
+          if args.size > 1 && (method_name.include?('polygon') || method_name.include?('polyline'))
+            args[0] = args.dup
+            args[1..-1] = []
+          end
+        end
+        
+        def apply_shape_arg_defaults(method_name, args)
+          if method_name.include?('round_rectangle') && args.size.between?(4, 5)
+            (6 - args.size).times {args << 60}
+          elsif method_name.include?('gradient_rectangle') && args.size == 4
+            args << true
+          end
+        end
+                
         def has_attribute?(attribute_name, *args)
           # TODO test that attribute getter responds too
           self.class.gc_instance_methods.include?(attribute_setter(attribute_name))

data/lib/glimmer/swt/display_proxy.rb

@@ -56,6 +56,7 @@ module Glimmer
       attr_reader :swt_display
 
       def initialize(*args)
+        Display.app_name ||= 'Glimmer'
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
       end

data/samples/elaborate/meta_sample.rb

@@ -150,7 +150,7 @@ class MetaSampleApplication
   end
   
   def launch
-    Display.setAppName('Glimmer Meta-Sample')
+    Display.app_name = 'Glimmer Meta-Sample'
     shell {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'

data/samples/hello/hello_canvas.rb

@@ -1,31 +1,10 @@
-# 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 {
+  canvas { |prox|
     background :yellow
     rectangle(0, 0, 220, 400, fill: true) {
       background :red
@@ -41,8 +20,8 @@ shell {
       background :magenta
       foreground :dark_blue
     }
-    rectangle(200, 80, 108, 36) {
-      foreground color(:dark_blue)
+    rectangle(205, 50, 88, 96) {
+      foreground color(:yellow)
     }
     text('Picasso', 60, 80) {
       background :yellow
@@ -55,8 +34,10 @@ shell {
     arc(210, 210, 100, 100, 30, -77, fill: true) {
       background :red
     }
-    polygon([250, 210, 260, 170, 270, 210, 290, 230, 250, 210]) {
+    polygon(250, 210, 260, 170, 270, 210, 290, 230, 250, 210, fill: true) {
       background :dark_yellow
+      foreground :yellow
     }
+    polygon(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
   }
 }.open

data/samples/hello/hello_canvas_animation.rb

@@ -35,7 +35,7 @@ shell {
         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
+        arc(0, 0, 400, 400, -1.4*index%360, 10, fill: true) {  # x, y, width, height, start angle, arc angle
           background rgb(200, 200, 50) # sets arc background color
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.1.0
+  version: 4.18.1.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement