glimmer-dsl-swt 4.18.3.3 → 4.18.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59c5aae689604e6024a5bffb1053cd50cc05c1598dca6fc3a01510f17371deab
-  data.tar.gz: 5fc97483b96bf334b1e25b30b8455ad41af3e6f56ae6f5310ac31504ce87c41d
+  metadata.gz: 63410b8b302bc061b5089d24bcadaacbd54b83bbb581ffecd0a46c7c026329c1
+  data.tar.gz: 60da9c410a221130713e209c0e6127d3e04f17feccbcb29788c2234a90802bb9
 SHA512:
-  metadata.gz: fdf5681c5632aa64d15c9e2037757d4e7599fbcaeacc14acc1af1dd1669c205ca7a8730551277ae0a3cff5bb435a802dcbdb824e7dbc749f75471ba15079e999
-  data.tar.gz: 5f96f41c1bdd491da20ae87ad1b2a5f072eeaca78c6e8f15a1a942390c2cc23b07259465452b242e0d61111a6881954458b5fe5214d77bfd4f45dd365ae0eb14
+  metadata.gz: 81a1feac2ef1bf9c7329d26714d0d7c61b926f710a785f0b7d2e1a424b2548cf159604ada03f368996c99cb45d0834bb362a715cbfae0fa5ec1b4e5af659ee8b
+  data.tar.gz: a4c1e06cf9aa7f3b656e9d5d22d56883f1def62865b1aa56555041c8238c07e0f333f17cd6f6108ada800e1738294f148757752e4609e1dd34dcbdc8183bd1ba

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Change Log
 
+### 4.18.3.4
+
+- Support building Image objects with the Glimmer Canvas Shape DSL
+- Tetris build icon image in-game by nesting Glimmer Shape DSL syntax
+- Canvas Make shapes auto-fill if you specify a background only (no need to say fill: true) or not fill if you specify a foreground only
+- Tetris option to switch Up Arrow between Instant Down, Rotate Right, and Rotate Left
+
 ### 4.18.3.3
 
 - Support Table data binding read_only_sort: true option to allow visual sorting without affecting model data
+-  on_quit to
 - Tetris Add lines and level to High Score Dialog
 - Tetris Immediate Drop on Arrow Up
 - Tetris Pause on showing High Score Dialog

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.3.3
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.3.4
 ## 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)
@@ -493,7 +493,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.3.3
+jgem install glimmer-dsl-swt -v 4.18.3.4
 
 
 ```
@@ -513,7 +513,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.3.3
+gem 'glimmer-dsl-swt', '~> 4.18.3.4
 '
 ```
 
@@ -572,7 +572,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.3.3
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.4
 
 
       
@@ -1053,7 +1053,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.3.3
+  Swt    glimmer-dsl-swt    4.18.3.4
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -2357,7 +2357,7 @@ Shape keywords and their args (including defaults) are listed below (they basica
 - `rectangle​(x, y, width, height, vertical = true, fill: true, gradient: true)` gradient rectangle, which is always filled, and takes an optional extra argument to specify true for vertical gradient (default) and false for horizontal gradient
 - `text(string, x, y, flags = nil)` text with optional flags (flag format is `swt(comma_separated_flags)` where flags can be :draw_delimiter (i.e. new lines), :draw_tab, :draw_mnemonic, and :draw_transparent as explained in [GC API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html))
 
-Shape keywords that can be filled with color can take an keyword argument `fill: true` (defaults to false when not specified)
+Shape keywords that can be filled with color can take an keyword argument `fill: true`. Defaults to false when not specified unless background is set with no foreground (or foreground is set with no background), in which case a smart default is applied.
 
 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.
 
@@ -2395,10 +2395,10 @@ shell {
 
   canvas {
     background :dark_yellow
-    rectangle(0, 0, 220, 400, fill: true) {
+    rectangle(0, 0, 220, 400) {
       background :dark_red
     }
-    rectangle(50, 20, 300, 150, 30, 50, round: true, fill: true) {
+    rectangle(50, 20, 300, 150, 30, 50, round: true) {
       background :yellow
     }
     rectangle(150, 200, 100, 70, true, gradient: true) {
@@ -2468,6 +2468,103 @@ In any case, if there is anything missing you would like added to the Glimmer Sh
 
 Keep in mind that the Shape DSL can be used inside any widget, not just `canvas`. Unlike shapes on a `canvas`, which are standalone graphics, when included in a widget, which already has its own look and feel, shapes are used as a decorative add-on that complements its look by getting painted on top of it. For example, shapes were used to decorate `composite` blocks in the [Tetris](#tetris) sample to have a more bevel look. In summary, Shapes can be used in a hybrid approach (shapes inside a widget), not just standalone in a `canvas`.
 
+#### Shapes inside an Image
+
+You can build an image using the Canvas Shape DSL (including setting the icon of the application).
+
+Example (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
+
+```
+include Glimmer
+
+shell {
+  text 'Image Shape DSL Example'
+  label {
+    bevel_constant = 20
+    icon_block_size = 64
+    icon_bevel_size = icon_block_size.to_f / 25.to_f
+    icon_bevel_pixel_size = 0.16*icon_block_size.to_f
+    icon_size = 8
+    icon_pixel_size = icon_block_size * icon_size
+    image(icon_pixel_size, icon_pixel_size) {
+      icon_size.times { |row|
+        icon_size.times { |column|
+          colored = row >= 1 && column.between?(1, 6)
+          color = colored ? color([:white, :red, :blue, :green, :yellow, :magenta, :cyan, :dark_blue].sample) : color(:white)
+          x = column * icon_block_size
+          y = row * icon_block_size
+          rectangle(x, y, icon_block_size, icon_block_size) {
+            background color
+          }
+          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
+            background rgb(color.red + 4*bevel_constant, color.green + 4*bevel_constant, color.blue + 4*bevel_constant)
+          }
+          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size) {
+            background rgb(color.red - bevel_constant, color.green - bevel_constant, color.blue - bevel_constant)
+          }
+          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size) {
+            background rgb(color.red - 2*bevel_constant, color.green - 2*bevel_constant, color.blue - 2*bevel_constant)
+          }
+          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
+            background rgb(color.red - bevel_constant, color.green - bevel_constant, color.blue - bevel_constant)
+          }
+        }
+      }
+    }
+  }
+}.open
+```
+
+![Image Shape DSL](images/glimmer-example-image-shape-dsl.png)
+
+Example setting the icon of the application (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
+
+```
+include Glimmer
+
+shell {
+  text 'Image Shape DSL Example'
+  label {
+    text 'Image Shape DSL Example'
+    font height: 30
+  }
+  bevel_constant = 20
+  icon_block_size = 64
+  icon_bevel_size = icon_block_size.to_f / 25.to_f
+  icon_bevel_pixel_size = 0.16*icon_block_size.to_f
+  icon_size = 8
+  icon_pixel_size = icon_block_size * icon_size
+  image(icon_pixel_size, icon_pixel_size) {
+    icon_size.times { |row|
+      icon_size.times { |column|
+        colored = row >= 1 && column.between?(1, 6)
+        color = colored ? color([:white, :red, :blue, :green, :yellow, :magenta, :cyan, :dark_blue].sample) : color(:white)
+        x = column * icon_block_size
+        y = row * icon_block_size
+        rectangle(x, y, icon_block_size, icon_block_size) {
+          background color
+        }
+        polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
+          background rgb(color.red + 4*bevel_constant, color.green + 4*bevel_constant, color.blue + 4*bevel_constant)
+        }
+        polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size) {
+          background rgb(color.red - bevel_constant, color.green - bevel_constant, color.blue - bevel_constant)
+        }
+        polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size) {
+          background rgb(color.red - 2*bevel_constant, color.green - 2*bevel_constant, color.blue - 2*bevel_constant)
+        }
+        polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
+          background rgb(color.red - bevel_constant, color.green - bevel_constant, color.blue - bevel_constant)
+        }
+      }
+    }
+  }
+}.open
+```
+
+![Image Shape DSL](images/glimmer-example-image-shape-dsl-app-switcher-icon.png)
+
+
 ### Canvas Transform DSL
 
 The transform DSL builds [org.eclipse.swt.graphics.Transform](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/Transform.html) objects with a nice declarative syntax.
@@ -2573,7 +2670,7 @@ shell {
       
       frame { |index|
         background rgb(index%100, index%100 + 100, index%55 + 200)
-        rectangle(index, index, 20, 20, fill: true) {
+        rectangle(index, index, 20, 20) {
           background :red
         }
       }
@@ -4851,12 +4948,14 @@ Contact Manager - Edit Done
 
 #### Tetris
 
-This sample demonstrates how to build an interactive animated game with MVC architecture, custom-shell/custom-widgets, multi-threading, asynchronous programming, data-binding, canvas shape graphic decorations, and keyboard events.
+This sample demonstrates how to build an interactive animated game with MVC architecture, custom-shell/custom-widgets, multi-threading, asynchronous programming, data-binding, canvas shape graphic decorations, canvas shape icon image generation, and keyboard events/shortcuts.
 
 Code:
 
 [samples/elaborate/tetris.rb](samples/elaborate/tetris.rb)
 
+![Tetris Icon](images/glimmer-tetris-icon.png)
+
 ![Tetris](images/glimmer-tetris.png)
 
 ![Tetris Game Over](images/glimmer-tetris-game-over.png)

data/VERSION

@@ -1 +1 @@
-4.18.3.3
+4.18.3.4

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.3.3 ruby lib
+# stub: glimmer-dsl-swt 4.18.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.3.3"
+  s.version = "4.18.3.4"
 
   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-29"
+  s.date = "2021-01-30"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]

data/lib/glimmer/dsl/swt/image_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
@@ -28,13 +28,21 @@ module Glimmer
       # image expression
       # Note: Cannot be a static expression because it clashes with image property expression
       class ImageExpression < Expression
+        include ParentExpression
+        
         def can_interpret?(parent, keyword, *args, &block)
-          keyword.to_s == 'image' and
-            (parent.nil? or !parent.respond_to?('image'))
+          (keyword == 'image') and
+            (parent.nil? or parent.respond_to?('image='))
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::ImageProxy.new(*args)
+          args.unshift(parent) unless parent.nil?
+          Glimmer::SWT::ImageProxy.new(*args, &block)
+        end
+
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
         end
       end
     end

data/lib/glimmer/dsl/swt/layout_data_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
@@ -33,7 +33,7 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'layout_data' and
+          super and
             parent.respond_to?(:swt_widget)
         end
   

data/lib/glimmer/dsl/swt/layout_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
@@ -23,6 +23,7 @@ require 'glimmer'
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/layout_proxy'
+require 'glimmer/swt/image_proxy'
 
 module Glimmer
   module DSL
@@ -31,6 +32,7 @@ module Glimmer
         include ParentExpression
   
         include_package 'org.eclipse.swt.widgets'
+        include_package 'org.eclipse.swt.graphics'
   
         def can_interpret?(parent, keyword, *args, &block)
           keyword.to_s.end_with?('_layout') and

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

@@ -35,11 +35,12 @@ module Glimmer
           end
         end
         
-        def resetup_shape_paint_listeners
+        def resetup_shape_painting
           # TODO consider performance optimization relating to order of shape rendering (affecting only further shapes not previous ones)
+          reset_gc if respond_to?(:reset_gc)
           shapes.each do |shape|
             shape.paint_listener_proxy&.unregister
-            shape.setup_paint_listener
+            shape.setup_painting
           end
         end
       end

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

@@ -30,7 +30,6 @@ 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 Packages
@@ -78,9 +77,11 @@ module Glimmer
           def flyweight_method_names
             @flyweight_method_names ||= {}
           end
+          
+          
         end
         
-        attr_reader :parent, :name, :args, :options, :swt_widget, :paint_listener_proxy
+        attr_reader :parent, :name, :args, :options, :paint_listener_proxy
         
         def initialize(parent, keyword, *args, &property_block)
           @parent = parent
@@ -88,7 +89,6 @@ module Glimmer
           @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
           post_add_content if property_block.nil?
@@ -111,7 +111,8 @@ module Glimmer
         end
         
         def post_add_content
-          setup_paint_listener
+          amend_method_name_options_based_on_properties
+          setup_painting
           @content_added = true
         end
         
@@ -186,6 +187,15 @@ module Glimmer
             args[the_java_method_arg_count..-1] = []
           end
         end
+        
+        def amend_method_name_options_based_on_properties
+          if @properties.keys.map(&:to_s).include?('background') && !@properties.keys.map(&:to_s).include?('foreground')
+            @options[:fill] = true
+          elsif @properties.keys.map(&:to_s).include?('foreground') && !@properties.keys.map(&:to_s).include?('background')
+            @options[:fill] = false
+          end
+          @method_name = self.class.method_name(@name, @args + [@options])
+        end
                 
         def has_attribute?(attribute_name, *args)
           self.class.gc_instance_methods.include?(attribute_setter(attribute_name))
@@ -194,7 +204,7 @@ module Glimmer
         def set_attribute(attribute_name, *args)
           @properties[attribute_name] = args
           if @content_added && !@parent.is_disposed
-            @parent.resetup_shape_paint_listeners
+            @parent.resetup_shape_painting
             @parent.redraw
           end
         end
@@ -203,10 +213,13 @@ module Glimmer
           @properties.symbolize_keys[attribute_name.to_s.to_sym]
         end
         
-        def setup_paint_listener
+        def setup_painting
+          # TODO consider moving this method to parent (making the logic polymorphic)
           return if @parent.is_disposed
           if parent.respond_to?(:swt_display)
             @paint_listener_proxy = @parent.on_swt_paint(&method(:paint))
+          elsif parent.respond_to?(:swt_image)
+            paint(parent) # treat parent as paint event since you don't do repaints with images, it's a one time deal.
           elsif parent.respond_to?(:swt_widget)
             @paint_listener_proxy = @parent.on_paint_control(&method(:paint))
           end
@@ -214,9 +227,9 @@ module Glimmer
         
         def paint(paint_event)
           @properties['background'] = [@parent.background] if fill? && !@properties.keys.map(&:to_s).include?('background')
-          @properties['foreground'] = [@parent.foreground] if draw? && !@properties.keys.map(&:to_s).include?('foreground')
-          @properties['font'] = [@parent.font] if draw? && !@properties.keys.map(&:to_s).include?('font')
-          @properties['transform'] = [nil] if !@properties.keys.map(&:to_s).include?('transform')
+          @properties['foreground'] = [@parent.foreground] if @parent.respond_to?(:foreground) && draw? && !@properties.keys.map(&:to_s).include?('foreground')
+          @properties['font'] = [@parent.font] if @parent.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
+          @properties['transform'] = [nil] if @parent.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
           @properties.each do |property, args|
             method_name = attribute_setter(property)
             converted_args = apply_property_arg_conversions(method_name, property, args)

data/lib/glimmer/swt/image_proxy.rb

@@ -19,6 +19,9 @@
 # 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/custom/drawable'
+require 'glimmer/swt/properties'
+
 module Glimmer
   module SWT
     # Proxy for org.eclipse.swt.graphics.Image
@@ -27,6 +30,9 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ImageProxy
+      include Custom::Drawable
+      include Properties
+      
       class << self
         def create(*args)
           if args.size == 1 && args.first.is_a?(ImageProxy)
@@ -37,6 +43,7 @@ module Glimmer
         end
       end
       
+      include_package 'org.eclipse.swt.widgets'
       include_package 'org.eclipse.swt.graphics'
       
       attr_reader :file_path, :jar_file_path, :image_data, :swt_image
@@ -46,8 +53,13 @@ module Glimmer
       # Takes the same args as the SWT Image class
       # Alternatively, takes a file path string or a uri:classloader file path string (generated by JRuby when invoking `File.expand_path` inside a JAR file)
       # and returns an image object.
-      def initialize(*args)
+      def initialize(*args, &content)
         @args = args
+        @parent_proxy = nil
+        if @args.first.is_a?(WidgetProxy)
+          @parent_proxy = @args.shift
+          @parent = @parent_proxy.swt_widget
+        end
         options = @args.last.is_a?(Hash) ? @args.delete_at(-1) : {}
         options[:swt_image] = @args.first if @args.size == 1 && @args.first.is_a?(Image)
         @file_path = @args.first if @args.size == 1 && @args.first.is_a?(String)
@@ -55,6 +67,9 @@ module Glimmer
         if options&.keys&.include?(:swt_image)
           @swt_image = options[:swt_image]
           @original_image_data = @image_data = @swt_image.image_data
+        elsif args.size == 1 && args.first.is_a?(ImageProxy)
+          @swt_image = @args.first.swt_image
+          @original_image_data = @image_data = @swt_image.image_data
         elsif @file_path
           @original_image_data = @image_data = ImageData.new(input_stream || @file_path)
           @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
@@ -64,9 +79,15 @@ module Glimmer
           width = (@image_data.width.to_f / @image_data.height.to_f)*height.to_f if !height.nil? && width.nil?
           scale_to(width, height) unless width.nil? || height.nil?
         else
+          @args.prepend(DisplayProxy.instance.swt_display) unless @args.first.is_a?(Display)
           @swt_image = Image.new(*@args)
           @original_image_data = @image_data = @swt_image.image_data
         end
+        post_add_content if content.nil?
+      end
+      
+      def post_add_content
+        @parent&.image = swt_image
       end
       
       def input_stream
@@ -91,6 +112,52 @@ module Glimmer
         self
       end
       
+      def gc
+        @gc ||= reset_gc
+      end
+      
+      def reset_gc
+        @gc = org.eclipse.swt.graphics.GC.new(swt_image)
+      end
+      
+      def has_attribute?(attribute_name, *args)
+        @swt_image.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
+      end
+
+      def set_attribute(attribute_name, *args)
+        # TODO consider refactoring/unifying this code with WidgetProxy and elsewhere
+        if args.count == 1
+          if args.first.is_a?(Symbol) || args.first.is_a?(String)
+            args[0] = ColorProxy.new(args.first).swt_color
+          end
+          if args.first.is_a?(ColorProxy)
+            args[0] = args.first.swt_color
+          end
+        end
+
+        if @swt_image.respond_to?(attribute_setter(attribute_name))
+          @swt_image.send(attribute_setter(attribute_name), *args) unless @swt_image.send(attribute_getter(attribute_name)) == args.first
+        elsif @swt_image.respond_to?(ruby_attribute_setter(attribute_name))
+          @swt_image.send(ruby_attribute_setter(attribute_name), args)
+        else
+          send(ruby_attribute_setter(attribute_name), args)
+        end
+      end
+
+      def get_attribute(attribute_name)
+        if @swt_image.respond_to?(attribute_getter(attribute_name))
+          @swt_image.send(attribute_getter(attribute_name))
+        elsif @swt_image.respond_to?(ruby_attribute_getter(attribute_name))
+          @swt_image.send(ruby_attribute_getter(attribute_name))
+        elsif @swt_image.respond_to?(attribute_name)
+          @swt_image.send(attribute_name)
+        elsif respond_to?(ruby_attribute_getter(attribute_name))
+          send(ruby_attribute_getter(attribute_name))
+        else
+          send(attribute_name)
+        end
+      end
+      
       def method_missing(method, *args, &block)
         swt_image.send(method, *args, &block)
       rescue => e

data/lib/glimmer/swt/widget_proxy.rb

@@ -77,7 +77,7 @@ module Glimmer
           composite.layout = GridLayout.new if composite.get_layout.nil?
         end,
         canvas: lambda do |canvas|
-          canvas.layout = nil unless canvas.get_layout.nil?
+          canvas.layout = nil if canvas.respond_to?('layout=') && !canvas.get_layout.nil?
         end,
         scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true

data/lib/glimmer/ui/custom_widget.rb

@@ -163,8 +163,8 @@ module Glimmer
       attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
-        @parent = parent
-        @parent_proxy = @parent&.get_data('proxy')
+        @parent_proxy = @parent = parent
+        @parent_proxy = @parent&.get_data('proxy') if @parent.respond_to?(:get_data) && @parent.get_data('proxy')
         @swt_style = SWT::SWTProxy[*swt_constants]
         options ||= {}
         @options = self.class.options.merge(options)

data/samples/elaborate/tetris.rb

@@ -35,6 +35,7 @@ class Tetris
   FONT_NAME = 'Menlo'
   FONT_TITLE_HEIGHT = 32
   FONT_TITLE_STYLE = :bold
+  BEVEL_CONSTANT = 20
   
   option :playfield_width, default: Model::Game::PLAYFIELD_WIDTH
   option :playfield_height, default: Model::Game::PLAYFIELD_HEIGHT
@@ -56,7 +57,14 @@ class Tetris
         when swt(:arrow_down), 's'.bytes.first
           game.down!
         when swt(:arrow_up)
-          game.down!(immediate: true)
+          case game.up_arrow_action
+          when :instant_down
+            game.down!(instant: true)
+          when :rotate_right
+            game.rotate!(:right)
+          when :rotate_left
+            game.rotate!(:left)
+          end
         when swt(:arrow_left), 'a'.bytes.first
           game.left!
         when swt(:arrow_right), 'd'.bytes.first
@@ -110,10 +118,10 @@ class Tetris
         margin_height 0
         horizontal_spacing 0
       }
-
+      
       text 'Glimmer Tetris'
       minimum_size 475, 500
-      background :gray
+      image tetris_icon
 
       tetris_menu_bar(game: game)
 
@@ -129,6 +137,39 @@ class Tetris
     }
   }
   
+  def tetris_icon
+    icon_block_size = 64
+    icon_bevel_size = icon_block_size.to_f / 25.to_f
+    icon_bevel_pixel_size = 0.16*icon_block_size.to_f
+    icon_size = 8
+    icon_pixel_size = icon_block_size * icon_size
+    image(icon_pixel_size, icon_pixel_size) {
+      icon_size.times { |row|
+        icon_size.times { |column|
+          colored = row >= 1 && column.between?(1, 6)
+          color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
+          x = column * icon_block_size
+          y = row * icon_block_size
+          rectangle(x, y, icon_block_size, icon_block_size, fill: true) {
+            background color
+          }
+          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
+          }
+          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size, fill: true) {
+            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+          }
+          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
+          }
+          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+          }
+        }
+      }
+    }
+  end
+  
   def start_moving_tetrominos_down
     Thread.new do
       @mutex.synchronize do

data/samples/elaborate/tetris/model/game.rb

@@ -38,7 +38,7 @@ class Tetris
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
       
       attr_reader :playfield_width, :playfield_height
-      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score, :show_high_scores
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score, :show_high_scores, :up_arrow_action
       alias game_over? game_over
       alias paused? paused
       alias beeping? beeping
@@ -50,6 +50,7 @@ class Tetris
         @high_scores = []
         @show_high_scores = false
         @beeping = true
+        @up_arrow_action = :instant_down
         load_high_scores!
       end
       
@@ -117,9 +118,9 @@ class Tetris
         File.join(tetris_dir, "high_scores.txt")
       end
       
-      def down!(immediate: false)
+      def down!(instant: false)
         return unless game_in_progress?
-        current_tetromino.down!(immediate: immediate)
+        current_tetromino.down!(instant: instant)
         game_over! if current_tetromino.row <= 0 && current_tetromino.stopped?
       end
       
@@ -204,6 +205,30 @@ class Tetris
         @beeper&.call if beeping
       end
       
+      def instant_down_on_up=(value)
+        self.up_arrow_action = :instant_down if value
+      end
+      
+      def instant_down_on_up
+        self.up_arrow_action == :instant_down
+      end
+      
+      def rotate_right_on_up=(value)
+        self.up_arrow_action = :rotate_right if value
+      end
+      
+      def rotate_right_on_up
+        self.up_arrow_action == :rotate_right
+      end
+      
+      def rotate_left_on_up=(value)
+        self.up_arrow_action = :rotate_left if value
+      end
+      
+      def rotate_left_on_up
+        self.up_arrow_action == :rotate_left
+      end
+      
       def reset_tetrominoes
         @tetrominoes = []
       end

data/samples/elaborate/tetris/model/tetromino.rb

@@ -182,11 +182,11 @@ class Tetris
         @blocks.size
       end
       
-      def down!(immediate: false)
+      def down!(instant: false)
         launch! if preview?
         unless stopped?
           block_count = 1
-          if immediate
+          if instant
             remaining_height, bottom_touching_block = remaining_height_and_bottom_touching_block
             block_count = remaining_height - @row
           end

data/samples/elaborate/tetris/view/block.rb

@@ -26,36 +26,31 @@ class Tetris
   
       options :game_playfield, :block_size, :row, :column
   
-      before_body {
-        @bevel_constant = 20
-      }
-  
       body {
         canvas {
-          layout nil
           background bind(game_playfield[row][column], :color)
-          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4, fill: true) {
+          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red + 4*@bevel_constant, color.green + 4*@bevel_constant, color.blue + 4*@bevel_constant)
+              rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
             }
           }
-          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size, fill: true) {
+          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
             }
           }
-          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4, fill: true) {
+          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red - 2*@bevel_constant, color.green - 2*@bevel_constant, color.blue - 2*@bevel_constant)
+              rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
             }
           }
-          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4, fill: true) {
+          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4) {
             background bind(game_playfield[row][column], :color) { |color_value|
               color = color(color_value)
-              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
             }
           }
           rectangle(0, 0, block_size, block_size) {

data/samples/elaborate/tetris/view/playfield.rb

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        canvas {
+        composite {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

data/samples/elaborate/tetris/view/tetris_menu_bar.rb

@@ -94,6 +94,24 @@ class Tetris
               accelerator :command, :b
               selection bind(game, :beeping)
             }
+            menu {
+              text 'Up Arrow'
+              menu_item(:radio) {
+                text '&Instant Down'
+                accelerator :command, :shift, :i
+                selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
+              }
+              menu_item(:radio) {
+                text 'Rotate &Right'
+                accelerator :command, :shift, :r
+                selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
+              }
+              menu_item(:radio) {
+                text 'Rotate &Left'
+                accelerator :command, :shift, :l
+                selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
+              }
+            }
           } # end of menu
           
           menu {

data/samples/hello/hello_canvas.rb

@@ -30,7 +30,7 @@ shell {
     rectangle(0, 0, 220, 400, fill: true) {
       background :red
     }
-    rectangle(50, 20, 300, 150, 30, 50, round: true, fill: true) {
+    rectangle(50, 20, 300, 150, 30, 50, round: true) {
       background :magenta
     }
     rectangle(150, 200, 100, 70, true, gradient: true) {
@@ -49,13 +49,13 @@ shell {
       foreground :dark_magenta
       font name: 'Courier', height: 30
     }
-    oval(110, 310, 100, 100, fill: true) {
+    oval(110, 310, 100, 100) {
       background rgb(128, 138, 248)
     }
-    arc(210, 210, 100, 100, 30, -77, fill: true) {
+    arc(210, 210, 100, 100, 30, -77) {
       background :red
     }
-    polygon(250, 210, 260, 170, 270, 210, 290, 230, fill: true) {
+    polygon(250, 210, 260, 170, 270, 210, 290, 230) {
       background :dark_yellow
     }
     polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)

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

metadata

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