glimmer-dsl-swt 4.18.7.2 → 4.18.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d53b49c974e0ce9b4f3d0a715ab59785d2b23fde0abe4bda5ad20de58e68a7
-  data.tar.gz: db8c3d1030700bda5faed413c1719336e12e110fd65c154b5650d2b69e3d7eee
+  metadata.gz: 98ad3496a7f7eec9bebe867be21b6fefd3764baf67b8336a2177086826fc6e0c
+  data.tar.gz: 6093daa8c240d0e02f43078590f84eb77c9cdba070c2c8ba5c7e665fb4455338
 SHA512:
-  metadata.gz: 9630530911bcd671a335cef7a1911db6150382532d03b85cd8e6629d02c6d10c44e7901fe40ee48f114c73465c56efff53d13b984cf53393999a449e83c394ca
-  data.tar.gz: 0d07793e4f0a79b75a1eaf073a39dad0af872c19e6c325bd9d4632ce3b9cf53f0735d1bf7e9a2a1e7a46a7d95ebe202e38626400c128cff78d88a5c15d0154a3
+  metadata.gz: 43d3ffa17ae9ad9fae4f867d483439116d0e08055614f83c2ef59f87a38268472ace3821ee6b2521588d02fda8da6a6f009ff9ea93085dc60170835cb6aa4aff
+  data.tar.gz: 0f4bb8712916ddb9ee5cd25ded0bdce6b5fc008f2ab23a53ccac07f19eac556daf4eb3594944e91c3a47efd3df3794012abd572fb6ea17ed74357622a67a5253

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+### 4.18.7.3
+
+- Support the ability for nested shapes to override their parent `shape` common shared properties
+- Refactor Tetris to use a custom shape (`bevel`) for its blocks given they are used in both the game and the icon, thus achieving code reuse
+- Fix issue with moving filled polygon (moving drawn polygon works)
+
 ### 4.18.7.2
 
 - Enable defining custom shapes with direct args just like basic shapes (alternative to using keyword arg options)

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.7.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.7.3
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -13,7 +13,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.18.7.2 includes [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.18.7.3 includes [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
 
 [Glimmer DSL for SWT receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) with your Ruby desktop GUI development needs! [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) brings great ideas to the table, such as declarative programming via domain specific languages, currently under-utilized in the GUI domain. That said, it may not be feature complete enough for everybody's needs, so please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) even better by providing feedback and [contributing](#contributing) when possible. The project is very active, so any feature suggestions that are accepted could be implemented within weeks if not days. Also, you are welcome to [hire me](#hire-me) full-time if you want long-term development of [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) for your project needs.
 
@@ -340,7 +340,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.7.2
+jgem install glimmer-dsl-swt -v 4.18.7.3
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -358,7 +358,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.18.7.2'
+gem 'glimmer-dsl-swt', '~> 4.18.7.3'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-4.18.7.2
+4.18.7.3

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.7.2 ruby lib
+# stub: glimmer-dsl-swt 4.18.7.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.7.2"
+  s.version = "4.18.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-03-06"
+  s.date = "2021-03-09"
   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]
@@ -176,6 +176,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/tetris/model/game.rb",
     "samples/elaborate/tetris/model/past_game.rb",
     "samples/elaborate/tetris/model/tetromino.rb",
+    "samples/elaborate/tetris/view/bevel.rb",
     "samples/elaborate/tetris/view/block.rb",
     "samples/elaborate/tetris/view/high_score_dialog.rb",
     "samples/elaborate/tetris/view/playfield.rb",

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

@@ -171,7 +171,13 @@ module Glimmer
         
         # The bounding box top-left x, y, width, height in absolute positioning
         def bounds
-          org.eclipse.swt.graphics.Rectangle.new(absolute_x, absolute_y, calculated_width, calculated_height)
+          bounds_dependencies = [absolute_x, absolute_y, calculated_width, calculated_height]
+          if bounds_dependencies != @bounds_dependencies
+            # avoid repeating calculations
+            absolute_x, absolute_y, calculated_width, calculated_height = @bounds_dependencies = bounds_dependencies
+            @bounds = org.eclipse.swt.graphics.Rectangle.new(absolute_x, absolute_y, calculated_width, calculated_height)
+          end
+          @bounds
         end
         
         # The bounding box top-left x and y
@@ -181,7 +187,13 @@ module Glimmer
         
         # The bounding box width and height (as a Point object with x being width and y being height)
         def size
-          org.eclipse.swt.graphics.Point.new(calculated_width, calculated_height)
+          size_dependencies = [calculated_width, calculated_height]
+          if size_dependencies != @size_dependencies
+            # avoid repeating calculations
+            calculated_width, calculated_height = @size_dependencies = size_dependencies
+            @size = org.eclipse.swt.graphics.Point.new(calculated_width, calculated_height)
+          end
+          @size
         end
         
         def extent
@@ -308,10 +320,10 @@ module Glimmer
             end
             @pattern_args ||= {}
             pattern_type = method_name.to_s.match(/set(.+)Pattern/)[1]
-            if args.first.is_a?(Pattern)
+            if args.first.is_a?(org.eclipse.swt.graphics.Pattern)
               new_args = @pattern_args[pattern_type]
             else
-              new_args = args.first.is_a?(Display) ? args : ([DisplayProxy.instance.swt_display] + args)
+              new_args = args.first.is_a?(org.eclipse.swt.widgets.Display) ? args : ([DisplayProxy.instance.swt_display] + args)
               @pattern_args[pattern_type] = new_args.dup
             end
             args[0] = pattern(*new_args, type: pattern_type)
@@ -429,6 +441,10 @@ module Glimmer
           parameter_names.index(attribute_name.to_s.to_sym)
         end
         
+        def get_parameter_attribute(attribute_name)
+          @args[parameter_index(ruby_attribute_getter(attribute_name))]
+        end
+        
         def set_parameter_attribute(attribute_name, *args)
           @args[parameter_index(ruby_attribute_getter(attribute_name))] = args.size == 1 ? args.first : args
         end
@@ -444,31 +460,43 @@ module Glimmer
           args.pop if !options.nil? && !options[:redraw].nil?
           perform_redraw = @perform_redraw
           perform_redraw = options[:redraw] if perform_redraw.nil? && !options.nil?
-          perform_redraw = true if perform_redraw.nil?
+          perform_redraw ||= true
+          property_change = nil
+          ruby_attribute_getter_name = ruby_attribute_getter(attribute_name)
+          ruby_attribute_setter_name = ruby_attribute_setter(attribute_name)
           if parameter_name?(attribute_name)
-            set_parameter_attribute(attribute_name, *args)
-          elsif (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter(attribute_name), super: true))
-            self.send(ruby_attribute_setter(attribute_name), *args)
+            return if ruby_attribute_getter_name == (args.size == 1 ? args.first : args)
+            set_parameter_attribute(ruby_attribute_getter_name, *args)
+          elsif (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter_name, super: true))
+            return if self.send(ruby_attribute_getter_name) == (args.size == 1 ? args.first : args)
+            self.send(ruby_attribute_setter_name, *args)
           else
-            @properties[ruby_attribute_getter(attribute_name)] = args
+            # TODO consider this optimization of preconverting args (removing conversion from other methods) to reject equal args
+            args = apply_property_arg_conversions(ruby_attribute_getter_name, args)
+            return if @properties[ruby_attribute_getter_name] == args
+            @properties[ruby_attribute_getter_name] = args
+            property_change = true
           end
           if @content_added && perform_redraw && !drawable.is_disposed
-            @calculated_paint_args = false
-            if is_a?(PathSegment)
-              root_path&.calculated_path_args = @calculated_path_args = false
-              calculated_args_changed!
-              root_path&.calculated_args_changed!
-            end
-            attribute_name = ruby_attribute_getter(attribute_name)
-            if location_parameter_names.map(&:to_s).include?(attribute_name)
-              @calculated_args = nil
-              parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
-            end
-            if ['width', 'height'].include?(attribute_name)
-              calculated_args_changed_for_defaults!
+            redrawn = false
+            unless property_change
+              @calculated_paint_args = false
+              if is_a?(PathSegment)
+                root_path&.calculated_path_args = @calculated_path_args = false
+                calculated_args_changed!
+                root_path&.calculated_args_changed!
+              end
+              if location_parameter_names.map(&:to_s).include?(ruby_attribute_getter_name)
+                calculated_args_changed!(children: true)
+                redrawn = parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
+              end
+              if ['width', 'height'].include?(ruby_attribute_getter_name)
+                redrawn = calculated_args_changed_for_defaults!
+              end
             end
             # TODO consider redrawing an image proxy's gc in the future
-            drawable.redraw unless drawable.is_a?(ImageProxy)
+            # TODO consider ensuring only a single redraw happens for a hierarchy of nested shapes
+            drawable.redraw unless redrawn || drawable.is_a?(ImageProxy)
           end
         end
         
@@ -479,7 +507,7 @@ module Glimmer
           elsif (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter(attribute_name), super: true))
             self.send(attribute_name)
           else
-            @properties.symbolize_keys[attribute_name.to_s.to_sym]
+            @properties[attribute_name.to_s]
           end
         end
         
@@ -555,35 +583,73 @@ module Glimmer
           drawable.redraw if redraw && !drawable.is_a?(ImageProxy)
         end
         
-        # Indicate if this is a shape composite (meaning a shape bag that just contains nested shapes, but doesn't render anything of its own)
-        def shape_composite?
+        # Indicate if this is a container shape (meaning a shape bag that is just there to contain nested shapes, but doesn't render anything of its own)
+        def container?
           @name == 'shape'
         end
         
+        # Indicate if this is a composite shape (meaning a shape that contains nested shapes like a rectangle with ovals inside it)
+        def composite?
+          !shapes.empty?
+        end
+        
         # ordered from closest to farthest parent
         def parent_shapes
-          current_parent = parent
-          the_parent_shapes = []
-          until current_parent.is_a?(Drawable)
-            the_parent_shapes << current_parent
-            current_parent = current_parent.parent
+          if @parent_shapes.nil?
+            if parent.is_a?(Drawable)
+              @parent_shapes = []
+            else
+              @parent_shapes = parent.parent_shapes + [parent]
+            end
+          end
+          @parent_shapes
+        end
+        
+        # ordered from closest to farthest parent
+        def parent_shape_containers
+          if @parent_shape_containers.nil?
+            if parent.is_a?(Drawable)
+              @parent_shape_containers = []
+            elsif !parent.container?
+              @parent_shape_containers = parent.parent_shape_containers
+            else
+              @parent_shape_containers = parent.parent_shape_containers + [parent]
+            end
           end
-          the_parent_shapes
+          @parent_shape_containers
         end
         
         # ordered from closest to farthest parent
         def parent_shape_composites
-          parent_shapes.select(&:shape_composite?)
+          if @parent_shape_composites.nil?
+            if parent.is_a?(Drawable)
+              @parent_shape_composites = []
+            elsif !parent.container?
+              @parent_shape_composites = parent.parent_shape_composites
+            else
+              @parent_shape_composites = parent.parent_shape_composites + [parent]
+            end
+          end
+          @parent_shape_composites
         end
         
-        def all_parent_properties
-          # TODO consider providing a converted property version of this ready for consumption
-          @all_parent_properties ||= parent_shape_composites.reverse.reduce({}) do |all_properties, parent_shape|
-            parent_properties = parent_shape.properties
-            parent_properties.each do |property, args|
-              parent_properties[property] = apply_property_arg_conversions(property, args)
+        def convert_properties!
+          if @properties != @converted_properties
+            @properties.each do |property, args|
+              @properties[property] = apply_property_arg_conversions(property, args)
             end
-            all_properties.merge(parent_properties)
+            @converted_properties = @properties.dup
+          end
+        end
+        
+        def converted_properties
+          convert_properties!
+          @properties
+        end
+        
+        def all_parent_properties
+          @all_parent_properties ||= parent_shape_containers.reverse.reduce({}) do |all_properties, parent_shape|
+            all_properties.merge(parent_shape.converted_properties)
           end
         end
         
@@ -600,11 +666,10 @@ module Glimmer
         
         def paint_self(paint_event)
           @painting = true
-          unless shape_composite?
+          unless container?
             calculate_paint_args!
             @original_gc_properties = {} # this stores GC properties before making calls to updates TODO avoid using in pixel graphics
-            @original_properties = @properties # this stores original shape attributes like background/foreground/font
-            @properties.merge(all_parent_properties).each do |property, args|
+            @properties.each do |property, args|
               method_name = attribute_setter(property)
               @original_gc_properties[method_name] = paint_event.gc.send(method_name.sub('set', 'get')) rescue nil
               paint_event.gc.send(method_name, *args)
@@ -614,10 +679,8 @@ module Glimmer
             end
             ensure_extent(paint_event)
           end
-          if !@calculated_args || parent_shape_absolute_location_changed?
-            @calculated_args = calculated_args
-          end
-          unless shape_composite?
+          @calculated_args ||= calculate_args!
+          unless container?
             # paint unless parent's calculated args are not calculated yet, meaning it is about to get painted and trigger a paint on this child anyways
             paint_event.gc.send(@method_name, *@calculated_args) unless (parent.is_a?(Shape) && !parent.calculated_args?)
             @original_gc_properties.each do |method_name, value|
@@ -663,26 +726,27 @@ module Glimmer
           end
         end
         
-        def parent_shape_absolute_location_changed?
-          (parent.is_a?(Shape) && (parent.absolute_x != @parent_absolute_x || parent.absolute_y != @parent_absolute_y))
-        end
-        
         def calculated_args_changed!(children: true)
           # TODO add a children: true option to enable setting to false to avoid recalculating children args
           @calculated_args = nil
           shapes.each(&:calculated_args_changed!) if children
         end
         
+        # Notifies object that calculated args changed for defaults. Returns true if redrawing and false otherwise.
         def calculated_args_changed_for_defaults!
           has_default_dimensions = default_width? || default_height?
           parent_calculated_args_changed_for_defaults = has_default_dimensions
-          @calculated_args = nil if default_x? || default_y? || has_default_dimensions
+          calculated_args_changed!(children: false) if default_x? || default_y? || has_default_dimensions
           if has_default_dimensions && parent.is_a?(Shape)
             parent.calculated_args_changed_for_defaults!
           elsif @content_added && !drawable.is_disposed
             # TODO consider optimizing in the future if needed by ensuring one redraw for all parents in the hierarchy at the end instead of doing one per parent that needs it
-            drawable.redraw if !@painting && !drawable.is_a?(ImageProxy)
+            if !@painting && !drawable.is_a?(ImageProxy)
+              drawable.redraw
+              return true
+            end
           end
+          false
         end
         
         def calculated_args?
@@ -690,76 +754,101 @@ module Glimmer
         end
                 
         # args translated to absolute coordinates
-        def calculated_args
-          return @args if !default_x? && !default_y? && !default_width? && !default_height? && !max_width? && !max_height? && parent.is_a?(Drawable)
-          # Note: Must set x and move_by because not all shapes have a real x and some must translate all their points with move_by
-          # TODO change that by setting a bounding box for all shapes with a calculated top-left x, y and
-          # a setter that does the moving inside them instead so that I could rely on absolute_x and absolute_y
-          # here to get the job done of calculating absolute args
-          @perform_redraw = false
-          original_x = nil
-          original_y = nil
-          original_width = nil
-          original_height = nil
-          if parent.is_a?(Shape)
-            @parent_absolute_x = parent.absolute_x
-            @parent_absolute_y = parent.absolute_y
-          end
-          if default_width?
-            original_width = width
-            self.width = default_width + width_delta
-          end
-          if default_height?
-            original_height = height
-            self.height = default_height + height_delta
-          end
-          if max_width?
-            original_width = width
-            self.width = max_width + width_delta
-          end
-          if max_height?
-            original_height = height
-            self.height = max_height + height_delta
-          end
-          if default_x?
-            original_x = x
-            self.x = default_x + self.x_delta
-          end
-          if default_y?
-            original_y = y
-            self.y = default_y + self.y_delta
-          end
-          if parent.is_a?(Shape)
-            move_by(@parent_absolute_x, @parent_absolute_y)
-            result_args = @args.clone
-            move_by(-1*@parent_absolute_x, -1*@parent_absolute_y)
-          else
-            result_args = @args.clone
-          end
-          if original_x
-            self.x = original_x
-          end
-          if original_y
-            self.y = original_y
-          end
-          if original_width
-            self.width = original_width
-          end
-          if original_height
-            self.height = original_height
+        def calculate_args!
+        # TODO add conditions for parent having default width/height too
+          return @args if parent.is_a?(Drawable) && !default_x? && !default_y? && !default_width? && !default_height? && !max_width? && !max_height?
+          calculated_args_dependencies = [
+            x,
+            y,
+            parent.is_a?(Shape) && parent.absolute_x,
+            parent.is_a?(Shape) && parent.absolute_y,
+            default_width? && default_width,
+            default_width? && width_delta,
+            default_height? && default_height,
+            default_height? && height_delta,
+            max_width? && max_width,
+            max_width? && width_delta,
+            max_height? && max_height,
+            max_height? && height_delta,
+            default_x? && default_x,
+            default_x? && x_delta,
+            default_y? && default_y,
+            default_y? && y_delta,
+          ]
+          if calculated_args_dependencies != @calculated_args_dependencies
+            # avoid recalculating values again
+            x, y, parent_absolute_x, parent_absolute_y, default_width, default_width_delta, default_height, default_height_delta, max_width, max_width_delta, max_height, max_height_delta, default_x, default_x_delta, default_y, default_y_delta = @calculated_args_dependencies = calculated_args_dependencies
+            # Note: Must set x and move_by because not all shapes have a real x and some must translate all their points with move_by
+            # TODO change that by setting a bounding box for all shapes with a calculated top-left x, y and
+            # a setter that does the moving inside them instead so that I could rely on absolute_x and absolute_y
+            # here to get the job done of calculating absolute args
+            @perform_redraw = false
+            original_x = nil
+            original_y = nil
+            original_width = nil
+            original_height = nil
+            if parent.is_a?(Shape)
+              @parent_absolute_x = parent_absolute_x
+              @parent_absolute_y = parent_absolute_y
+            end
+            if default_width?
+              original_width = width
+              self.width = default_width + default_width_delta
+            end
+            if default_height?
+              original_height = height
+              self.height = default_height + default_height_delta
+            end
+            if max_width?
+              original_width = width
+              self.width = max_width + max_width_delta
+            end
+            if max_height?
+              original_height = height
+              self.height = max_height + max_height_delta
+            end
+            if default_x?
+              original_x = x
+              self.x = default_x + default_x_delta
+            end
+            if default_y?
+              original_y = y
+              self.y = default_y + default_y_delta
+            end
+            if parent.is_a?(Shape)
+              move_by(@parent_absolute_x, @parent_absolute_y)
+              @result_calculated_args = @args.clone
+              move_by(-1*@parent_absolute_x, -1*@parent_absolute_y)
+            else
+              @result_calculated_args = @args.clone
+            end
+            if original_x
+              self.x = original_x
+            end
+            if original_y
+              self.y = original_y
+            end
+            if original_width
+              self.width = original_width
+            end
+            if original_height
+              self.height = original_height
+            end
+            @perform_redraw = true
           end
-          @perform_redraw = true
-          result_args
+          @result_calculated_args
         end
         
         def default_x?
-          current_parameter_name?(:x) and
-            (x.nil? || x.to_s == 'default' || (x.is_a?(Array) && x.first.to_s == 'default'))
+          return false unless current_parameter_name?(:x)
+          x = self.x
+          x.nil? || x.to_s == 'default' || (x.is_a?(Array) && x.first.to_s == 'default')
         end
         
         def default_y?
-          current_parameter_name?(:y) and
-            (y.nil? || y.to_s == 'default' || (y.is_a?(Array) && y.first.to_s == 'default'))
+          return false unless current_parameter_name?(:y)
+          y = self.y
+          y.nil? || y.to_s == 'default' || (y.is_a?(Array) && y.first.to_s == 'default')
         end
         
         def default_width?
@@ -775,108 +864,157 @@ module Glimmer
         end
         
         def max_width?
-          current_parameter_name?(:width) and
-            (width.nil? || width.to_s == 'max' || (width.is_a?(Array) && width.first.to_s == 'max'))
+          return false unless current_parameter_name?(:width)
+          width = self.width
+          (width.nil? || width.to_s == 'max' || (width.is_a?(Array) && width.first.to_s == 'max'))
         end
         
         def max_height?
-          current_parameter_name?(:height) and
-            (height.nil? || height.to_s == 'max' || (height.is_a?(Array) && height.first.to_s == 'max'))
+          return false unless current_parameter_name?(:height)
+          height = self.height
+          (height.nil? || height.to_s == 'max' || (height.is_a?(Array) && height.first.to_s == 'max'))
         end
         
         def default_x
-          result = ((parent.size.x - size.x) / 2)
-          result += parent.bounds.x - parent.absolute_x if parent.is_a?(Shape) && parent.irregular?
-          result
+          default_x_dependencies = [parent.size.x, size.x, parent.is_a?(Shape) && parent.irregular? && parent.bounds.x, parent.is_a?(Shape) && parent.irregular? && parent.absolute_x]
+          if default_x_dependencies != @default_x_dependencies
+            @default_x_dependencies = default_x_dependencies
+            result = ((parent.size.x - size.x) / 2)
+            result += parent.bounds.x - parent.absolute_x if parent.is_a?(Shape) && parent.irregular?
+            @default_x = result
+          end
+          @default_x
         end
         
         def default_y
-          result = ((parent.size.y - size.y) / 2)
-          result += parent.bounds.y - parent.absolute_y if parent.is_a?(Shape) && parent.irregular?
-          result
+          default_y_dependencies = [parent.size.y, size.y, parent.is_a?(Shape) && parent.irregular? && parent.bounds.y, parent.is_a?(Shape) && parent.irregular? && parent.absolute_y]
+          if default_y_dependencies != @default_y_dependencies
+            result = ((parent.size.y - size.y) / 2)
+            result += parent.bounds.y - parent.absolute_y if parent.is_a?(Shape) && parent.irregular?
+            @default_y = result
+          end
+          @default_y
+        end
+        
+        # right-most x coordinate in this shape (adding up its width and location)
+        def x_end
+          x_end_dependencies = [calculated_width, default_x?, !default_x? && x]
+          if x_end_dependencies != @x_end_dependencies
+            # avoid recalculation of dependencies
+            calculated_width, is_default_x, x = @x_end_dependencies = x_end_dependencies
+            shape_width = calculated_width.to_f
+            shape_x = is_default_x ? 0 : x.to_f
+            @x_end = shape_x + shape_width
+          end
+          @x_end
+        end
+        
+        # right-most y coordinate in this shape (adding up its height and location)
+        def y_end
+          y_end_dependencies = [calculated_height, default_y?, !default_y? && y]
+          if y_end_dependencies != @y_end_dependencies
+            # avoid recalculation of dependencies
+            calculated_height, is_default_y, y = @y_end_dependencies = y_end_dependencies
+            shape_height = calculated_height.to_f
+            shape_y = is_default_y ? 0 : y.to_f
+            @y_end = shape_y + shape_height
+          end
+          @y_end
         end
         
         def default_width
-          # TODO consider caching
-          x_ends = shapes.map do |shape|
-            if shape.max_width?
-              0
+          default_width_dependencies = [shapes.empty? && max_width, shapes.size == 1 && shapes.first.max_width? && parent.size.x, shapes.size >= 1 && !shapes.first.max_width? && shapes.map {|s| s.max_width? ? 0 : s.x_end}]
+          if default_width_dependencies != @default_width_dependencies
+            # Do not repeat calculations
+            max_width, parent_size_x, x_ends = @default_width_dependencies = default_width_dependencies
+            @default_width = if shapes.empty?
+              max_width
+            elsif shapes.size == 1 && shapes.first.max_width?
+              parent_size_x
             else
-              shape_width = shape.calculated_width.to_f
-              shape_x = shape.default_x? ? 0 : shape.x.to_f
-              shape_x + shape_width
+              x_ends.max.to_f
             end
           end
-          if shapes.empty?
-            max_width
-          elsif shapes.size == 1 && shapes.first.max_width?
-            self.parent.size.x
-          else
-            x_ends.max.to_f
-          end
+          @default_width
         end
         
         def default_height
-          # TODO consider caching
-          y_ends = shapes.map do |shape|
-            if shape.max_height?
-              0
+          default_height_dependencies = [shapes.empty? && max_height, shapes.size == 1 && shapes.first.max_height? && parent.size.y, shapes.size >= 1 && !shapes.first.max_height? && shapes.map {|s| s.max_height? ? 0 : s.y_end}]
+          if default_height_dependencies != @default_height_dependencies
+            # Do not repeat calculations
+            max_height, parent_size_y, y_ends = @default_height_dependencies = default_height_dependencies
+            @default_height = if shapes.empty?
+              max_height
+            elsif shapes.size == 1 && shapes.first.max_height?
+              parent_size_y
             else
-              shape_height = shape.calculated_height.to_f
-              shape_y = shape.default_y? ? 0 : shape.y.to_f
-              shape_y + shape_height
+              y_ends.max.to_f
             end
           end
-          if shapes.empty?
-            max_height
-          elsif shapes.size == 1 && shapes.first.max_height?
-            self.parent.size.y
-          else
-            y_ends.max.to_f
-          end
+          @default_height
         end
         
         def max_width
-          # consider caching
-          parent.is_a?(Drawable) ? parent.size.x : parent.calculated_width
+          max_width_dependencies = [parent.is_a?(Drawable) && parent.size.x, !parent.is_a?(Drawable) && parent.calculated_width]
+          if max_width_dependencies != @max_width_dependencies
+            # do not repeat calculations
+            parent_size_x, parent_calculated_width = @max_width_dependencies = max_width_dependencies
+            @max_width = parent.is_a?(Drawable) ? parent_size_x : parent_calculated_width
+          end
+          @max_width
         end
         
         def max_height
-          # consider caching
-          parent.is_a?(Drawable) ? parent.size.y : parent.calculated_height
+          max_height_dependencies = [parent.is_a?(Drawable) && parent.size.y, !parent.is_a?(Drawable) && parent.calculated_height]
+          if max_height_dependencies != @max_height_dependencies
+            # do not repeat calculations
+            parent_size_y, parent_calculated_height = @max_height_dependencies = max_height_dependencies
+            @max_height = parent.is_a?(Drawable) ? parent_size_y : parent_calculated_height
+          end
+          @max_height
         end
         
         def calculated_width
-          result_width = width
-          result_width = (default_width + width_delta) if default_width?
-          result_width = (max_width + width_delta) if max_width?
-          result_width
+          calculated_width_dependencies = [width, default_width? && (default_width + width_delta), max_width? && (max_width + width_delta)]
+          if calculated_width_dependencies != @calculated_width_dependencies
+            @calculated_width_dependencies = calculated_width_dependencies
+            result_width = width
+            result_width = (default_width + width_delta) if default_width?
+            result_width = (max_width + width_delta) if max_width?
+            @calculated_width = result_width
+          end
+          @calculated_width
         end
         
         def calculated_height
-          result_height = height
-          result_height = (default_height + height_delta) if default_height?
-          result_height = (max_height + height_delta) if max_height?
-          result_height
+          calculated_height_dependencies = [height, default_height? && (default_height + height_delta), max_height? && (max_height + height_delta)]
+          if calculated_height_dependencies != @calculated_height_dependencies
+            @calculated_height_dependencies = calculated_height_dependencies
+            result_height = height
+            result_height = (default_height + height_delta) if default_height?
+            result_height = (max_height + height_delta) if max_height?
+            @calculated_height = result_height
+          end
+          @calculated_height
         end
         
         def x_delta
-          return 0 unless default_x? && x.is_a?(Array)
+          return 0 unless x.is_a?(Array) && default_x?
           x[1].to_f
         end
         
         def y_delta
-          return 0 unless default_y? && y.is_a?(Array)
+          return 0 unless y.is_a?(Array) && default_y?
           y[1].to_f
         end
         
         def width_delta
-          return 0 unless (default_width? || max_width?) && width.is_a?(Array)
+          return 0 unless width.is_a?(Array) && (default_width? || max_width?)
           width[1].to_f
         end
         
         def height_delta
-          return 0 unless (default_height? || max_height?) && height.is_a?(Array)
+          return 0 unless height.is_a?(Array) && (default_height? || max_height?)
           height[1].to_f
         end
         
@@ -905,39 +1043,68 @@ module Glimmer
         end
         
         def calculated_x
-          result = default_x? ? default_x : self.x
-          result += self.x_delta
-          result
+          calculated_x_dependencies = [default_x? && default_x, !default_x? && self.x, self.x_delta]
+          if calculated_x_dependencies != @calculated_x_dependencies
+            default_x, x, x_delta = @calculated_x_dependencies = calculated_x_dependencies
+            result = default_x? ? default_x : x
+            result += x_delta
+            @calculated_x = result
+          end
+          @calculated_x
         end
         
         def calculated_y
-          result = default_y? ? default_y : self.y
-          result += self.y_delta
-          result
+          calculated_y_dependencies = [default_y? && default_y, !default_y? && self.y, self.y_delta]
+          if calculated_y_dependencies != @calculated_y_dependencies
+            default_y, y, y_delta = @calculated_y_dependencies = calculated_y_dependencies
+            result = default_y? ? default_y : y
+            result += y_delta
+            @calculated_y = result
+          end
+          @calculated_y
         end
         
         def absolute_x
-          x = calculated_x
-          if parent.is_a?(Shape)
-            parent.absolute_x + x
-          else
-            x
+          absolute_x_dependencies = [calculated_x, parent.is_a?(Shape) && parent.absolute_x]
+          if absolute_x_dependencies != @absolute_x_dependencies
+            # do not repeat calculations
+            calculated_x, parent_absolute_x = @absolute_x_dependencies = absolute_x_dependencies
+            x = calculated_x
+            @absolute_x = if parent.is_a?(Shape)
+              parent_absolute_x + x
+            else
+              x
+            end
           end
+          @absolute_x
         end
         
         def absolute_y
-          y = calculated_y
-          if parent.is_a?(Shape)
-            parent.absolute_y + y
-          else
-            y
+          absolute_y_dependencies = [calculated_y, parent.is_a?(Shape) && parent.absolute_y]
+          if absolute_y_dependencies != @absolute_y_dependencies
+            calculated_y, parent_absolute_y = @absolute_y_dependencies = absolute_y_dependencies
+            y = calculated_y
+            @absolute_y = if parent.is_a?(Shape)
+              parent_absolute_y + y
+            else
+              y
+            end
           end
+          @absolute_y
         end
         
-        # Overriding inspect to avoid printing very long shape hierarchies
-        def inspect
-          "#<#{self.class.name}:0x#{self.hash.to_s(16)} args=#{@args.inspect}, properties=#{@properties.inspect}}>"
+        # Overriding inspect to avoid printing very long nested shape hierarchies (recurses onces only)
+        def inspect(recursive: 1, calculated: false, args: true, properties: true, calculated_args: false)
+          recurse = recursive == true || recursive.is_a?(Integer) && recursive.to_i > 0
+          recursive = [recursive -= 1, 0].max if recursive.is_a?(Integer)
+          args_string = " args=#{@args.inspect}" if args
+          properties_string = " properties=#{@properties.inspect}}" if properties
+          calculated_args_string = " calculated_args=#{@calculated_args.inspect}" if calculated_args
+          calculated_string = " absolute_x=#{absolute_x} absolute_y=#{absolute_y} calculated_width=#{calculated_width} calculated_height=#{calculated_height}" if calculated
+          recursive_string = " shapes=#{@shapes.map {|s| s.inspect(recursive: recursive, calculated: calculated, args: args, properties: properties)}}" if recurse
+          "#<#{self.class.name}:0x#{self.hash.to_s(16)}#{args_string}#{properties_string}#{calculated_args_string}#{calculated_string}#{recursive_string}>"
         rescue => e
+          Glimmer::Config.logger.error { e.full_message }
           "#<#{self.class.name}:0x#{self.hash.to_s(16)}"
         end
         
@@ -958,17 +1125,14 @@ module Glimmer
                 end
               end
             else
+              @properties = all_parent_properties.merge(@properties)
               @properties['background'] = [@drawable.background] if fill? && !has_some_background?
               @properties['foreground'] = [@drawable.foreground] if @drawable.respond_to?(:foreground) && draw? && !has_some_foreground?
               # TODO regarding alpha, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes
-              @properties['alpha'] ||= [255]
-              @properties['font'] = [@drawable.font] if @drawable.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
+              @properties['font'] = [@drawable.font] if @drawable.respond_to?(:font) && @name == 'text' && draw? && !@properties.keys.map(&:to_s).include?('font')
               # TODO regarding transform, make sure to reset it to parent stored transform once we allow setting shape properties on parents directly without shapes
               # Also do that with all future-added properties
-              @properties['transform'] = [nil] if @drawable.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
-              @properties.each do |property, args|
-                @properties[property] = apply_property_arg_conversions(property, args)
-              end
+              convert_properties!
               apply_shape_arg_conversions!
               apply_shape_arg_defaults!
               tolerate_shape_extra_args!

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

@@ -34,13 +34,9 @@ module Glimmer
       class Shape
         class Image < Shape
           def parameter_names
-            if @args.to_a.size > 3
-              image_part_parameter_names
-            else
-              image_whole_parameter_names
-            end
+            @parameter_names || image_whole_parameter_names
           end
-          
+        
           def possible_parameter_names
             (image_part_parameter_names + image_whole_parameter_names).uniq
           end
@@ -53,13 +49,15 @@ module Glimmer
             [:image, :x, :y]
           end
           
-          def parameter_index(attribute_name)
+          def set_parameter_attribute(attribute_name, *args)
+            return super if @parameter_names.to_a.map(&:to_s).include?(attribute_name.to_s)
             ####TODO refactor and improve this method through meta-programming (and share across other shapes)
             if image_part_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              image_part_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = image_part_parameter_names
             elsif image_whole_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              image_whole_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = image_whole_parameter_names
             end
+            super
           end
           
           def x

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

@@ -112,11 +112,7 @@ module Glimmer
             end
           end
           
-          def calculated_args_changed!(children: true)
-            super
-          end
-          
-          def calculated_args
+          def calculate_args!
             new_swt_path = @swt_path.nil? || !@calculated_paint_args || !@calculated_path_args
             if new_swt_path
               Glimmer::SWT::DisplayProxy.instance.auto_exec do

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

@@ -119,16 +119,28 @@ module Glimmer
           
           # Logical x coordinate relative to parent
           def x
-            x_value = bounds.x
-            x_value -= parent.absolute_x if parent.is_a?(Shape)
-            x_value
+            x_dependencies = [bounds.x, parent.is_a?(Shape) && parent.absolute_x]
+            if x_dependencies != @x_dependencies
+              # avoid recalculating values
+              bounds_x, parent_absolute_x = @x_dependencies = x_dependencies
+              x_value = bounds_x
+              x_value -= parent_absolute_x if parent.is_a?(Shape)
+              @x = x_value
+            end
+            @x
           end
           
           # Logical y coordinate relative to parent
           def y
-            y_value = bounds.y
-            y_value -= parent.absolute_y if parent.is_a?(Shape)
-            y_value
+            y_dependencies = [bounds.y, parent.is_a?(Shape) && parent.absolute_y]
+            if y_dependencies != @y_dependencies
+              # avoid recalculating values
+              bounds_y, parent_absolute_y = @y_dependencies = y_dependencies
+              y_value = bounds_y
+              y_value -= parent_absolute_y if parent.is_a?(Shape)
+              @y = y_value
+            end
+            @y
           end
           
           def width
@@ -144,8 +156,12 @@ module Glimmer
           end
 
           def include?(x, y)
-            comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
-            comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
+            if filled?
+              contain?(x, y)
+            else
+              comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
+              comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
+            end
           end
                     
           def move_by(x_delta, y_delta)

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

@@ -42,19 +42,23 @@ module Glimmer
           end
           
           def point_count
+            point_array = args.size > 1 ? args : self.point_array
             point_array.count / 2
           end
           
           def [](index)
+            point_array = args.size > 1 ? args : self.point_array
             index = 0 if index == point_count
             org.eclipse.swt.graphics.Point.new(point_array[index * 2], point_array[index * 2 + 1])
           end
           
           def x_array
+            point_array = args.size > 1 ? args : self.point_array
             point_array.each_with_index.select {|pair| pair.last.even?}.map(&:first)
           end
           
           def y_array
+            point_array = args.size > 1 ? args : self.point_array
             point_array.each_with_index.select {|pair| pair.last.odd?}.map(&:first)
           end
           
@@ -63,6 +67,7 @@ module Glimmer
           end
           
           def absolute_point_array
+            point_array = args.size > 1 ? args : self.point_array
             if parent.is_a?(Shape)
               point_array.each_with_index.map do |coordinate, i|
                 if i.even?

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

@@ -23,7 +23,6 @@ require 'glimmer/swt/custom/shape'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/color_proxy'
-require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/transform_proxy'
 
 module Glimmer
@@ -34,16 +33,7 @@ module Glimmer
       class Shape
         class Rectangle < Shape
           def parameter_names
-            # TODO consider optimizing just like text where it is set upon updating attribute and here you just return a variable
-            if @args.to_a.size >= 6
-              rectangle_round_parameter_names
-            elsif @args.to_a.size == 5
-              rectangle_gradient_parameter_names
-            elsif @args.to_a.size == 1
-              rectangle_rectangle_parameter_names
-            else
-              rectangle_parameter_names
-            end
+            @parameter_names || rectangle_parameter_names
           end
           
           def possible_parameter_names
@@ -68,17 +58,18 @@ module Glimmer
             [:rectangle]
           end
           
-          def parameter_index(attribute_name)
-            ####TODO refactor and improve this method through meta-programming (and share across other shapes)
-            if rectangle_round_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_round_parameter_names.map(&:to_s).index(attribute_name.to_s)
+          def set_parameter_attribute(attribute_name, *args)
+            return super if @parameter_names.to_a.map(&:to_s).include?(attribute_name.to_s)
+            if rectangle_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = rectangle_parameter_names
+            elsif rectangle_round_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = rectangle_round_parameter_names
             elsif rectangle_gradient_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_gradient_parameter_names.map(&:to_s).index(attribute_name.to_s)
-            elsif rectangle_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = rectangle_gradient_parameter_names
             elsif rectangle_rectangle_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_rectangle_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = rectangle_rectangle_parameter_names
             end
+            super
           end
           
           def point_xy_array

data/samples/elaborate/tetris.rb

@@ -158,18 +158,7 @@ class Tetris
           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)
+            bevel(base_color: color, size: icon_block_size)
           }
         }
       }

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

@@ -33,6 +33,8 @@ class Tetris
     class Game
       PLAYFIELD_WIDTH = 10
       PLAYFIELD_HEIGHT = 20
+#       PLAYFIELD_WIDTH = 5
+#       PLAYFIELD_HEIGHT = 5
       PREVIEW_PLAYFIELD_WIDTH = 4
       PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
@@ -199,6 +201,7 @@ class Tetris
       
       def delay
         [1.1 - (level.to_i * 0.1), 0.001].max
+#         99999
       end
       
       def beep

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

@@ -0,0 +1,78 @@
+# 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.
+
+# Creates a class-based custom shape representing the `bevel` keyword by convention
+class Tetris
+  module View
+    class Bevel
+      include Glimmer::UI::CustomShape
+      
+      options :base_color, :size, :bevel_pixel_size
+      
+      before_body {
+        self.bevel_pixel_size = 0.16*size.to_f if bevel_pixel_size.nil?
+      }
+      
+      body {
+        shape(0, 0, size, size) {
+          polygon(0, 0, size, 0, size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
+              end
+            }
+          }
+          polygon(size, 0, size - bevel_pixel_size, bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size, size, size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+              end
+            }
+          }
+          polygon(size, size, 0, size, bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
+              end
+            }
+          }
+          polygon(0, 0, 0, size, bevel_pixel_size, size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+              end
+            }
+          }
+          rectangle(0, 0, size, size) {
+            foreground bind(self, :base_color) { |color_value|
+              # use gray instead of white for the border
+              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
+            }
+          }
+        }
+      }
+    end
+  end
+end

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

@@ -19,6 +19,8 @@
 # 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_relative 'bevel'
+
 class Tetris
   module View
     class Block
@@ -27,36 +29,11 @@ class Tetris
       options :game_playfield, :block_size, :row, :column
   
       body {
-        canvas {
+        canvas { |canvas_proxy|
           background bind(game_playfield[row][column], :color)
-          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)
-            }
-          }
-          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)
-            }
-          }
-          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)
-            }
-          }
-          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)
-            }
-          }
-          rectangle(0, 0, block_size, block_size) {
-            foreground bind(game_playfield[row][column], :color) { |color_value|
-              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
-            }
+          
+          bevel(base_color: game_playfield[row][column].color, size: block_size) {
+            base_color bind(game_playfield[row][column], :color)
           }
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.7.2
+  version: 4.18.7.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -495,6 +495,7 @@ files:
 - samples/elaborate/tetris/model/game.rb
 - samples/elaborate/tetris/model/past_game.rb
 - samples/elaborate/tetris/model/tetromino.rb
+- samples/elaborate/tetris/view/bevel.rb
 - samples/elaborate/tetris/view/block.rb
 - samples/elaborate/tetris/view/high_score_dialog.rb
 - samples/elaborate/tetris/view/playfield.rb