glimmer-dsl-swt 4.18.5.0 → 4.18.5.5

data/docs/reference/GLIMMER_SAMPLES.md

@@ -36,6 +36,8 @@
     - [Hello, Cursor!](#hello-cursor)
     - [Hello, Progress Bar!](#hello-progress-bar)
     - [Hello, Tree!](#hello-tree)
+    - [Hello, Color Dialog!](#hello-color-dialog)
+    - [Hello, Font Dialog!](#hello-font-dialog)
   - [Elaborate Samples](#elaborate-samples)
     - [User Profile](#user-profile)
     - [Login](#login)
@@ -562,6 +564,30 @@ Hello, Canvas!
 
 ![Hello Canvas](/images/glimmer-hello-canvas.png)
 
+Hello, Canvas! Moving Shapes and Nested Shapes via Drag'n'Drop
+
+![Hello Canvas Moving Shapes](/images/glimmer-hello-canvas-moving-shapes.gif)
+
+Hello, Canvas! with Moved Shapes (via Drag'n'Drop)
+
+![Hello Canvas Moved Shapes](/images/glimmer-hello-canvas-moved-shapes.png)
+
+Hello, Canvas! Menu (for background/foreground color changes)
+
+![Hello Canvas Menu](/images/glimmer-hello-canvas-menu.png)
+
+Hello, Canvas! Color Dialog
+
+![Hello Canvas Color Dialog](/images/glimmer-hello-canvas-color-dialog.png)
+
+Hello, Canvas! Colors Changed
+
+![Hello Canvas Colors Changed](/images/glimmer-hello-canvas-colors-changed.png)
+
+Hello, Canvas! Data-Binding (changing a `text` shape `string` via data-binding changes from another thread)
+
+![Hello Canvas Data Binding](/images/glimmer-hello-canvas-data-binding.gif)
+
 #### Hello, Canvas Animation!
 
 This sample demonstrates the use of the `canvas` widget and [Animation DSL](#canvas-animation-dsl) in Glimmer.
@@ -630,6 +656,38 @@ Hello, Tree!
 
 ![Hello Tree](/images/glimmer-hello-tree.png)
 
+#### Hello, Color Dialog!
+
+This sample demonstrates the use of the `color_dialog` keyword.
+
+Code:
+
+[samples/hello/hello_color_dialog.rb](/samples/hello/hello_color_dialog.rb)
+
+Hello, Color Dialog!
+
+![Hello Color Dialog](/images/glimmer-hello-color-dialog.png)
+
+![Hello Color Dialog Choose Color](/images/glimmer-hello-color-dialog-choose-color.png)
+
+![Hello Color Dialog Color Changed](/images/glimmer-hello-color-dialog-color-changed.png)
+
+#### Hello, Font Dialog!
+
+This sample demonstrates the use of the `font_dialog` keyword.
+
+Code:
+
+[samples/hello/hello_font_dialog.rb](/samples/hello/hello_font_dialog.rb)
+
+Hello, Font Dialog!
+
+![Hello Font Dialog](/images/glimmer-hello-font-dialog.png)
+
+![Hello Font Dialog Choose Font](/images/glimmer-hello-font-dialog-choose-font.png)
+
+![Hello Font Dialog Font Changed](/images/glimmer-hello-font-dialog-font-changed.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

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.5.0 ruby lib
+# stub: glimmer-dsl-swt 4.18.5.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.5.0"
+  s.version = "4.18.5.5"
 
   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-02-22"
+  s.date = "2021-02-27"
   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]
@@ -69,13 +69,11 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/custom_widget_expression.rb",
     "lib/glimmer/dsl/swt/data_binding_expression.rb",
     "lib/glimmer/dsl/swt/dialog_expression.rb",
-    "lib/glimmer/dsl/swt/directory_dialog_expression.rb",
     "lib/glimmer/dsl/swt/display_expression.rb",
     "lib/glimmer/dsl/swt/dnd_expression.rb",
     "lib/glimmer/dsl/swt/dsl.rb",
     "lib/glimmer/dsl/swt/exec_expression.rb",
     "lib/glimmer/dsl/swt/expand_item_expression.rb",
-    "lib/glimmer/dsl/swt/file_dialog_expression.rb",
     "lib/glimmer/dsl/swt/font_expression.rb",
     "lib/glimmer/dsl/swt/image_expression.rb",
     "lib/glimmer/dsl/swt/layout_data_expression.rb",
@@ -127,11 +125,10 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/custom/shape/rectangle.rb",
     "lib/glimmer/swt/custom/shape/text.rb",
     "lib/glimmer/swt/date_time_proxy.rb",
-    "lib/glimmer/swt/directory_dialog_proxy.rb",
+    "lib/glimmer/swt/dialog_proxy.rb",
     "lib/glimmer/swt/display_proxy.rb",
     "lib/glimmer/swt/dnd_proxy.rb",
     "lib/glimmer/swt/expand_item_proxy.rb",
-    "lib/glimmer/swt/file_dialog_proxy.rb",
     "lib/glimmer/swt/font_proxy.rb",
     "lib/glimmer/swt/image_proxy.rb",
     "lib/glimmer/swt/layout_data_proxy.rb",
@@ -140,6 +137,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/message_box_proxy.rb",
     "lib/glimmer/swt/packages.rb",
     "lib/glimmer/swt/properties.rb",
+    "lib/glimmer/swt/proxy_properties.rb",
     "lib/glimmer/swt/sash_form_proxy.rb",
     "lib/glimmer/swt/scrolled_composite_proxy.rb",
     "lib/glimmer/swt/shell_proxy.rb",
@@ -186,6 +184,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_code_text.rb",
+    "samples/hello/hello_color_dialog.rb",
     "samples/hello/hello_combo.rb",
     "samples/hello/hello_computed.rb",
     "samples/hello/hello_computed/contact.rb",
@@ -198,6 +197,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_drag_and_drop.rb",
     "samples/hello/hello_expand_bar.rb",
     "samples/hello/hello_file_dialog.rb",
+    "samples/hello/hello_font_dialog.rb",
     "samples/hello/hello_group.rb",
     "samples/hello/hello_link.rb",
     "samples/hello/hello_list_multi_selection.rb",

data/lib/glimmer/data_binding/widget_binding.rb

@@ -52,7 +52,10 @@ module Glimmer
             unregister_all_observables
             return
           end
-          @widget.set_attribute(@property, value) unless evaluate_property == value
+          # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
+          unless ((value == evaluate_property) rescue false) # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
+            @widget.set_attribute(@property, value)
+          end
         end
       end
       

data/lib/glimmer/dsl/swt/dialog_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,24 +23,33 @@ require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/swt/shell_proxy'
+require 'glimmer/swt/dialog_proxy'
 
 module Glimmer
   module DSL
     module SWT
-      class DialogExpression < StaticExpression
+      class DialogExpression < Expression
         include TopLevelExpression
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'dialog' and
-            (parent.nil? or parent.is_a?(Glimmer::SWT::ShellProxy))
+          (
+            (keyword == 'dialog') or
+            (keyword.to_s.end_with?('dialog') and Glimmer::SWT::DialogProxy.dialog_class(keyword))
+          ) and
+            (parent.nil? or parent.is_a?(org.eclipse.swt.widgets.Shell) or parent.is_a?(Glimmer::SWT::ShellProxy))
         end
   
         def interpret(parent, keyword, *args, &block)
           # TODO reconcile this with the actual org.eclipse.swt.widgets.Dialog widget (maybe rename this as dialog_shell)
-          args = [parent] + args unless parent.nil?
-          args += [:dialog_trim, :application_modal]
-          Glimmer::SWT::ShellProxy.send(:new, *args)
+          if keyword == 'dialog'
+            args = [parent] + args unless parent.nil?
+            args += [:dialog_trim, :application_modal]
+            Glimmer::SWT::ShellProxy.new(*args)
+          else
+            args = [parent] + args unless parent.nil?
+            Glimmer::SWT::DialogProxy.new(keyword, *args)
+          end
         end
       end
     end

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

@@ -53,6 +53,7 @@ module Glimmer
           multiply
           property
           block_property
+          dialog
           widget
           custom_widget
           shape

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

@@ -37,7 +37,7 @@ module Glimmer
             (parent.nil? || !parent.respond_to?('font')) and
             !parent.is_a?(Glimmer::SWT::Custom::Shape) and
             args.size == 1 and
-            args.first.is_a?(Hash)
+            (args.first.is_a?(Hash) || args.first.is_a?(org.eclipse.swt.graphics.FontData))
         end
   
         def interpret(parent, keyword, *args, &block)

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

@@ -32,7 +32,7 @@ module Glimmer
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::SWT::Custom::Drawable) and
+          (parent.is_a?(Glimmer::SWT::Custom::Drawable) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
             Glimmer::SWT::Custom::Shape.valid?(parent, keyword, *args, &block)
         end
         

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

@@ -38,7 +38,7 @@ module Glimmer
   
         def interpret(parent, keyword, *args, &block)
           args = [parent] + args unless parent.nil?
-          Glimmer::SWT::ShellProxy.send(:new, *args)
+          Glimmer::SWT::ShellProxy.new(*args)
         end
       end
       class WindowExpression < ShellExpression

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

@@ -34,12 +34,20 @@ module Glimmer
           @shapes ||= []
         end
         
+        def expanded_shapes
+          @shapes.map do |shape|
+            [shape] + shape.expanded_shapes
+          end.flatten
+        end
+        
         def image_buffered_shapes
           @image_buffered_shapes ||= []
         end
         
+        # TODO add a method like shapes that specifies drawable_properties to be able to adjust properties like transform in between shapes
+          
         def shape_at_location(x, y)
-          shapes.reverse.detect {|shape| shape.include?(x, y)}
+          expanded_shapes.reverse.detect {|shape| shape.include?(x, y)}
         end
         
         def add_shape(shape)
@@ -132,7 +140,7 @@ module Glimmer
               @paint_listener_proxy = on_swt_paint(&shape_painter)
             end
           else
-            redraw if @finished_add_content && !is_disposed
+            redraw if respond_to?(:redraw) && @finished_add_content && !is_disposed
           end
         end
         alias resetup_shape_painting setup_shape_painting

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

@@ -26,6 +26,34 @@ require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/transform_proxy'
 
+class Java::OrgEclipseSwtGraphics::GC
+  def setLineDashOffset(value)
+    lineMiterLimit = getLineAttributes&.miterLimit || 999_999
+    setLineAttributes(Java::OrgEclipseSwtGraphics::LineAttributes.new(getLineWidth, getLineCap, getLineJoin, getLineStyle, getLineDash.map(&:to_f).to_java(:float), value, lineMiterLimit))
+  end
+  alias set_line_dash_offset setLineDashOffset
+  alias line_dash_offset= setLineDashOffset
+  
+  def getLineDashOffset
+    getLineAttributes&.dashOffset
+  end
+  alias get_line_dash_offset getLineDashOffset
+  alias line_dash_offset getLineDashOffset
+  
+  def setLineMiterLimit(value)
+    lineDashOffset = getLineAttributes&.dashOffset || 0
+    setLineAttributes(Java::OrgEclipseSwtGraphics::LineAttributes.new(getLineWidth, getLineCap, getLineJoin, getLineStyle, getLineDash.map(&:to_f).to_java(:float), lineDashOffset, value))
+  end
+  alias set_line_miter_limit setLineMiterLimit
+  alias line_miter_limit= setLineMiterLimit
+  
+  def getLineMiterLimit
+    getLineAttributes&.miterLimit
+  end
+  alias get_line_miter_limit getLineMiterLimit
+  alias line_miter_limit getLineMiterLimit
+end
+
 module Glimmer
   module SWT
     module Custom
@@ -34,8 +62,6 @@ module Glimmer
       class Shape
         include Packages
         include Properties
-        # TODO support textExtent sized shapes nested within text/string
-        # TODO support a Pattern DSL for methods that take Pattern arguments
         
         class << self
           def create(parent, keyword, *args, &property_block)
@@ -100,15 +126,18 @@ module Glimmer
           end
         end
         
-        attr_reader :parent, :name, :args, :options
+        attr_reader :drawable, :parent, :name, :args, :options, :shapes
+        attr_accessor :extent
         
         def initialize(parent, keyword, *args, &property_block)
           @parent = parent
+          @drawable = @parent.is_a?(Drawable) ? @parent : @parent.drawable
           @name = keyword
           @options = self.class.arg_options(args, extract: true)
           @method_name = self.class.method_name(keyword, @options)
           @args = args
           @properties = {}
+          @shapes = [] # nested shapes
           @options.reject {|key, value| %w[fill gradient round].include?(key.to_s)}.each do |property, property_args|
             @properties[property] = property_args
           end
@@ -116,13 +145,20 @@ module Glimmer
           post_add_content if property_block.nil?
         end
         
+        def add_shape(shape)
+          @shapes << shape
+          calculated_args_changed_for_defaults!
+        end
+        
         def draw?
           !fill?
         end
+        alias drawn? draw?
         
         def fill?
           @options[:fill]
         end
+        alias filled? fill?
         
         def gradient?
           @options[:gradient]
@@ -132,26 +168,60 @@ module Glimmer
           @options[:round]
         end
         
-        # subclasses (like polygon) may override to indicate if a point x,y coordinates fall inside the shape
-        # has a default implementation for rectangle and oval
+        # 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)
+        end
+        
+        # The bounding box top-left x and y
+        def location
+          org.eclipse.swt.graphics.Point.new(bounds.x, bounds.y)
+        end
+        
+        # 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)
+        end
+        
+        def extent
+          @extent || size
+        end
+        
+        # Returns if shape contains a point
+        # Subclasses (like polygon) may override to indicate if a point x,y coordinates falls inside the shape
+        # some shapes may choose to provide a fuzz factor to make usage of this method for mouse clicking more user friendly
+        def contain?(x, y)
+          # assume a rectangular filled shape by default (works for several shapes like image, text, and focus)
+          x.between?(self.absolute_x, self.absolute_x + calculated_width) && y.between?(self.absolute_y, self.absolute_y + calculated_height)
+        end
+        
+        # Returns if shape includes a point. When the shape is filled, this is the same as contain. When the shape is drawn, it only returns true if the point lies on the edge (boundary/border)
+        # Subclasses (like polygon) may override to indicate if a point x,y coordinates falls on the edge of a drawn shape or inside a filled shape
+        # some shapes may choose to provide a fuzz factor to make usage of this method for mouse clicking more user friendly
         def include?(x, y)
-          case @name
-          when 'rectangle', 'oval', 'arc'
-            self_x = self.x
-            self_y = self.y
-            width = self.width
-            height = self.height
-            x.between?(self_x, self_x + width) && y.between?(self_y, self_y + height)
-          else
-            false
-          end
+          # assume a rectangular shape by default
+          contain?(x, y)
+        end
+
+        # Indicates if a shape's x, y, width, height differ from its bounds calculation (e.g. arc / polygon)
+        def irregular?
+          false
         end
         
+        # moves by x delta and y delta. Subclasses must implement
+        # provdies a default implementation that assumes moving x and y is sufficient by default (not for polygons though, which must override)
         def move_by(x_delta, y_delta)
-          case @name
-          when 'rectangle', 'oval', 'arc'
-            self.x += x_delta
-            self.y += y_delta
+          if respond_to?(:x) && respond_to?(:y) && respond_to?(:x=) && respond_to?(:y=)
+            if default_x?
+              self.default_x_delta += x_delta
+            else
+              self.x += x_delta
+            end
+            if default_y?
+              self.default_y_delta += y_delta
+            else
+              self.y += y_delta
+            end
           end
         end
         
@@ -166,7 +236,7 @@ module Glimmer
         def post_add_content
           unless @content_added
             amend_method_name_options_based_on_properties!
-            @parent.setup_shape_painting unless @parent.is_a?(ImageProxy)
+            @drawable.setup_shape_painting unless @drawable.is_a?(ImageProxy)
             @content_added = true
           end
         end
@@ -174,10 +244,18 @@ module Glimmer
         def apply_property_arg_conversions(method_name, property, args)
           args = args.dup
           the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
+          return args if the_java_method.nil?
+          if the_java_method.parameter_types.first == Color.java_class && args.first.is_a?(RGB)
+            args[0] = [args[0].red, args[0].green, args[0].blue]
+          end
           if ['setBackground', 'setForeground'].include?(method_name.to_s) && args.first.is_a?(Array)
             args[0] = ColorProxy.new(args[0])
           end
-          if args.first.is_a?(Symbol) || args.first.is_a?(String)
+          if method_name.to_s == 'setLineDash' && args.size > 1
+            args[0] = args.dup
+            args[1..-1] = []
+          end
+          if args.first.is_a?(Symbol) || args.first.is_a?(::String)
             if the_java_method.parameter_types.first == Color.java_class
               args[0] = ColorProxy.new(args[0])
             end
@@ -188,7 +266,7 @@ module Glimmer
           if args.first.is_a?(ColorProxy)
             args[0] = args[0].swt_color
           end
-          if args.first.is_a?(Hash) && the_java_method.parameter_types.first == Font.java_class
+          if (args.first.is_a?(Hash) || args.first.is_a?(FontData)) && the_java_method.parameter_types.first == Font.java_class
             args[0] = FontProxy.new(args[0])
           end
           if args.first.is_a?(FontProxy)
@@ -198,21 +276,21 @@ module Glimmer
             args[0] = args[0].swt_transform
           end
           if ['setBackgroundPattern', 'setForegroundPattern'].include?(method_name.to_s)
-            @parent.requires_shape_disposal = true
+            @drawable.requires_shape_disposal = true
+            args = args.first if args.first.is_a?(Array)
             args.each_with_index do |arg, i|
-              if arg.is_a?(Symbol) || arg.is_a?(String)
-                args[i] = ColorProxy.new(arg).swt_color
-              elsif arg.is_a?(ColorProxy)
-                args[i] = arg.swt_color
-              end
+              arg = ColorProxy.new(arg.red, arg.green, arg.blue) if arg.is_a?(RGB)
+              arg = ColorProxy.new(arg) if arg.is_a?(Symbol) || arg.is_a?(::String)
+              arg = arg.swt_color if arg.is_a?(ColorProxy)
+              args[i] = arg
             end
             @pattern_args ||= {}
             pattern_type = method_name.to_s.match(/set(.+)Pattern/)[1]
             if args.first.is_a?(Pattern)
               new_args = @pattern_args[pattern_type]
             else
-              new_args = [DisplayProxy.instance.swt_display] + args
-              @pattern_args[pattern_type] = new_args
+              new_args = args.first.is_a?(Display) ? args : ([DisplayProxy.instance.swt_display] + args)
+              @pattern_args[pattern_type] = new_args.dup
             end
             args[0] = pattern(*new_args, type: pattern_type)
             args[1..-1] = []
@@ -226,7 +304,7 @@ module Glimmer
             @args[1..-1] = []
           end
           if @name == 'image'
-            if @args.first.is_a?(String)
+            if @args.first.is_a?(::String)
               @args[0] = ImageProxy.new(@args[0])
             end
             if @args.first.is_a?(ImageProxy)
@@ -237,7 +315,7 @@ module Glimmer
             end
           end
           if @name == 'text'
-            if @args[3].is_a?(Symbol) || @args[3].is_a?(String)
+            if @args[3].is_a?(Symbol) || @args[3].is_a?(::String)
               @args[3] = [@args[3]]
             end
             if @args[3].is_a?(Array)
@@ -250,19 +328,21 @@ module Glimmer
         end
         
         def apply_shape_arg_defaults!
+          self.x = :default if current_parameter_name?(:x) && x.nil?
+          self.y = :default if current_parameter_name?(:y) && y.nil?
+          self.dest_x = :default if current_parameter_name?(:dest_x) && dest_x.nil?
+          self.dest_y = :default if current_parameter_name?(:dest_y) && dest_y.nil?
+          self.width = :default if current_parameter_name?(:width) && width.nil?
+          self.height = :default if current_parameter_name?(:height) && height.nil?
           if @name.include?('rectangle') && round? && @args.size.between?(4, 5)
             (6 - @args.size).times {@args << 60}
           elsif @name.include?('rectangle') && gradient? && @args.size == 4
-            @args << true
-          elsif (@name.include?('text') || @name.include?('String')) && !@properties.keys.map(&:to_s).include?('background') && @args.size == 3
-            @args << true
+            set_attribute('vertical', true, redraw: false)
+          elsif (@name.include?('text') || @name.include?('string')) && !@properties.keys.map(&:to_s).include?('background') && @args.size < 4
+            set_attribute('is_transparent', true, redraw: false)
           end
           if @name.include?('image')
-            @parent.requires_shape_disposal = true
-            if @args.size == 1
-              @args[1] = 0
-              @args[2] = 0
-            end
+            @drawable.requires_shape_disposal = true
           end
         end
                 
@@ -279,7 +359,7 @@ module Glimmer
         
         def amend_method_name_options_based_on_properties!
           return if @name == 'point'
-          if @name != 'text' && has_some_background? && !has_some_foreground?
+          if @name != 'text' && @name != 'string' && has_some_background? && !has_some_foreground?
             @options[:fill] = true
           elsif !has_some_background? && has_some_foreground?
             @options[:fill] = false
@@ -298,6 +378,12 @@ module Glimmer
           []
         end
         
+        # subclasses may override to specify location parameter names if different from x and y (e.g. all polygon points are location parameters)
+        # used in calculating movement changes
+        def location_parameter_names
+          [:x, :y]
+        end
+        
         def possible_parameter_names
           parameter_names
         end
@@ -306,8 +392,12 @@ module Glimmer
           possible_parameter_names.map(&:to_s).include?(ruby_attribute_getter(attribute_name))
         end
         
+        def current_parameter_name?(attribute_name)
+          parameter_names.include?(attribute_name.to_s.to_sym)
+        end
+        
         def parameter_index(attribute_name)
-          parameter_names.map(&:to_s).index(attribute_name.to_s)
+          parameter_names.index(attribute_name.to_s.to_sym)
         end
         
         def set_parameter_attribute(attribute_name, *args)
@@ -316,24 +406,44 @@ module Glimmer
         
         def has_attribute?(attribute_name, *args)
           self.class.gc_instance_methods.include?(attribute_setter(attribute_name)) or
-            parameter_name?(attribute_name)
+            parameter_name?(attribute_name) or
+            (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter(attribute_name), super: true))
         end
-  
+        
         def set_attribute(attribute_name, *args)
+          options = args.last if args.last.is_a?(Hash)
+          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?
           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)
           else
-            @properties[attribute_name] = args
+            @properties[ruby_attribute_getter(attribute_name)] = args
           end
-          if @content_added && !@parent.is_disposed
+          if @content_added && perform_redraw && !drawable.is_disposed
             @calculated_paint_args = false
-            @parent.redraw
+            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!
+            end
+            # TODO consider redrawing an image proxy's gc in the future
+            drawable.redraw unless drawable.is_a?(ImageProxy)
           end
         end
         
         def get_attribute(attribute_name)
           if parameter_name?(attribute_name)
-            @args[parameter_index(attribute_name)]
+            arg_index = parameter_index(attribute_name)
+            @args[arg_index] if arg_index
+          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]
           end
@@ -350,7 +460,9 @@ module Glimmer
         end
         
         def respond_to?(method_name, *args, &block)
-          if has_attribute?(method_name)
+          options = args.last if args.last.is_a?(Hash)
+          super_invocation = options && options[:super]
+          if !super_invocation && has_attribute?(method_name)
             true
           else
             super
@@ -366,6 +478,18 @@ module Glimmer
           the_pattern
         end
         
+        def pattern_args(type: nil)
+          @pattern_args && @pattern_args[type.to_s.capitalize]
+        end
+        
+        def background_pattern_args
+          pattern_args(type: 'background')
+        end
+        
+        def foreground_pattern_args
+          pattern_args(type: 'foreground')
+        end
+        
         def dispose(dispose_images: true, dispose_patterns: true)
           if dispose_patterns
             @background_pattern&.dispose
@@ -379,21 +503,297 @@ module Glimmer
           end
           @parent.shapes.delete(self)
         end
-                
+        
         def paint(paint_event)
+          # pre-paint children an extra-time first when default width/height need to be calculated for defaults
+          paint_children(paint_event) if default_width? || default_height?
+          paint_self(paint_event)
+          # re-paint children from scratch in the special case of pre-calculating parent width/height to re-center within new parent dimensions
+          shapes.each(&:calculated_args_changed!) if default_width? || default_height?
+          paint_children(paint_event)
+        rescue => e
+          Glimmer::Config.logger.error {"Error encountered in painting shape (#{self.inspect}) with calculated args (#{@calculated_args}) and args (#{@args})"}
+          Glimmer::Config.logger.error {e.full_message}
+        end
+        
+        def paint_self(paint_event)
+          @painting = true
           calculate_paint_args!
+          @original_properties_backup = {}
           @properties.each do |property, args|
             method_name = attribute_setter(property)
-            # TODO consider optimization of not setting a background/foreground/font if it didn't change from last shape
+            @original_properties_backup[method_name] = paint_event.gc.send(method_name.sub('set', 'get')) rescue nil
             paint_event.gc.send(method_name, *args)
             if property == 'transform' && args.first.is_a?(TransformProxy)
               args.first.swt_transform.dispose
             end
           end
-          paint_event.gc.send(@method_name, *@args)
+          ensure_extent(paint_event)
+          if !@calculated_args || parent_shape_absolute_location_changed?
+            @calculated_args = calculated_args
+          end
+          # 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_properties_backup.each do |method_name, value|
+            paint_event.gc.send(method_name, value)
+          end
+          @painting = false
         rescue => e
-          Glimmer::Config.logger.error {"Error encountered in painting shape: #{self.inspect}"}
+          Glimmer::Config.logger.error {"Error encountered in painting shape (#{self.inspect}) with calculated args (#{@calculated_args}) and args (#{@args})"}
           Glimmer::Config.logger.error {e.full_message}
+        ensure
+          @painting = false
+        end
+        
+        def paint_children(paint_event)
+          shapes.to_a.each do |shape|
+            shape.paint(paint_event)
+          end
+        end
+        
+        def ensure_extent(paint_event)
+          old_extent = @extent
+          if ['text', 'string'].include?(@name)
+            extent_args = [string]
+            extent_flags = SWTProxy[:draw_transparent] if current_parameter_name?(:is_transparent) && is_transparent
+            extent_flags = flags if current_parameter_name?(:flags)
+            extent_args << extent_flags unless extent_flags.nil?
+            self.extent = paint_event.gc.send("#{@name}Extent", *extent_args)
+          end
+          if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y)
+            calculated_args_changed!
+            parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
+          end
+        end
+        
+        def expanded_shapes
+          if shapes.to_a.any?
+            shapes.map do |shape|
+              [shape] + shape.expanded_shapes
+            end.flatten
+          else
+            []
+          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
+        
+        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
+          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)
+          end
+        end
+        
+        def calculated_args?
+          !!@calculated_args
+        end
+                
+        # args translated to absolute coordinates
+        def calculated_args
+          return @args if !default_x? && !default_y? && !default_width? && !default_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 + default_width_delta
+          end
+          if default_height?
+            original_height = height
+            self.height = default_height + default_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_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
+          end
+          @perform_redraw = true
+          result_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'))
+        end
+        
+        def default_y?
+          current_parameter_name?(:y) and
+            (y.nil? || y.to_s == 'default' || (y.is_a?(Array) && y.first.to_s == 'default'))
+        end
+        
+        def default_width?
+          return false unless current_parameter_name?(:width)
+          width = self.width
+          (width.nil? || width == :default || width == 'default' || (width.is_a?(Array) && (width.first.to_s == :default || width.first.to_s == 'default')))
+        end
+        
+        def default_height?
+          return false unless current_parameter_name?(:height)
+          height = self.height
+          (height.nil? || height == :default || height == 'default' || (height.is_a?(Array) && (height.first.to_s == :default || height.first.to_s == 'default')))
+        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
+        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
+        end
+        
+        def default_width
+          # TODO consider caching
+          x_ends = shapes.map do |shape|
+            shape_width = shape.calculated_width.to_f
+            shape_x = shape.default_x? ? 0 : shape.x.to_f
+            shape_x + shape_width
+          end
+          x_ends.max.to_f
+        end
+        
+        def default_height
+          # TODO consider caching
+          y_ends = shapes.map do |shape|
+            shape_height = shape.calculated_height.to_f
+            shape_y = shape.default_y? ? 0 : shape.y.to_f
+            shape_y + shape_height
+          end
+          y_ends.max.to_f
+        end
+        
+        def calculated_width
+          default_width? ? (default_width + default_width_delta) : width
+        end
+        
+        def calculated_height
+          default_height? ? (default_height + default_height_delta) : height
+        end
+        
+        def default_x_delta
+          return 0 unless default_x? && x.is_a?(Array)
+          x[1].to_f
+        end
+        
+        def default_y_delta
+          return 0 unless default_y? && y.is_a?(Array)
+          y[1].to_f
+        end
+        
+        def default_width_delta
+          return 0 unless default_width? && width.is_a?(Array)
+          width[1].to_f
+        end
+        
+        def default_height_delta
+          return 0 unless default_height? && height.is_a?(Array)
+          height[1].to_f
+        end
+        
+        def default_x_delta=(delta)
+          return unless default_x?
+          self.x = [:default, delta]
+        end
+        
+        def default_y_delta=(delta)
+          return unless default_y?
+          self.y = [:default, delta]
+        end
+        
+        def default_width_delta=(delta)
+          return unless default_width?
+          self.width = [:default, delta]
+        end
+        
+        def default_height_delta=(delta)
+          return unless default_height?
+          self.height = [:default, delta]
+        end
+        
+        def calculated_x
+          result = default_x? ? default_x : self.x
+          result += default_x_delta
+          result
+        end
+        
+        def calculated_y
+          result = default_y? ? default_y : self.y
+          result += default_y_delta
+          result
+        end
+        
+        def absolute_x
+          x = calculated_x
+          if parent.is_a?(Shape)
+            parent.absolute_x + x
+          else
+            x
+          end
+        end
+        
+        def absolute_y
+          y = calculated_y
+          if parent.is_a?(Shape)
+            parent.absolute_y + y
+          else
+            y
+          end
+        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}}>"
+        rescue => e
+          "#<#{self.class.name}:0x#{self.hash.to_s(16)}"
         end
         
         def calculate_paint_args!
@@ -405,7 +805,7 @@ module Glimmer
                 if @properties[:foreground].is_a?(Array)
                   @properties[:foreground] = ColorProxy.new(@properties[:foreground], ensure_bounds: false)
                 end
-                if @properties[:foreground].is_a?(Symbol) || @properties[:foreground].is_a?(String)
+                if @properties[:foreground].is_a?(Symbol) || @properties[:foreground].is_a?(::String)
                  @properties[:foreground] = ColorProxy.new(@properties[:foreground], ensure_bounds: false)
                 end
                 if @properties[:foreground].is_a?(ColorProxy)
@@ -413,14 +813,14 @@ module Glimmer
                 end
               end
             else
-              @properties['background'] = [@parent.background] if fill? && !has_some_background?
-              @properties['foreground'] = [@parent.foreground] if @parent.respond_to?(:foreground) && draw? && !has_some_foreground?
+              @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'] = [@parent.font] if @parent.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
+              @properties['font'] = [@drawable.font] if @drawable.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
               # TODO regarding transform, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes
               # Also do that with all future-added properties
-              @properties['transform'] = [nil] if @parent.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
+              @properties['transform'] = [nil] if @drawable.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)