glimmer-dsl-swt 4.18.6.3 → 4.18.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db83aea9f51b0f0f2b7dfcb78a5180f00a5c7e7ebe7852f404c879c6417fa66
-  data.tar.gz: af21fa66dff5e22c878fe564dcdeb34c6d83a9b8afd8eb66e1c827c047a8d28c
+  metadata.gz: 3b4bc038d1fcf459041884946826daa84949318cd2d588f30bbc91ce9cc343f3
+  data.tar.gz: 143c076d20310e24ca2a6bd5db70f7bd87bd7c7b171a501c23874cdfd1a989f8
 SHA512:
-  metadata.gz: 80c988832fe70bf8505aca306b88d34e35957e8a8a936c9ef874ad35566c71e98e766cd7b732dd73bf2e3c088a52d1480fabe20f77fc557fcc47c9f4ead8d817
-  data.tar.gz: 2b2a8f85e7ee15dc23f772a92c4ca4f9acad738ee22efc2a36dd45aab73e6f18e2e4f24b1efe1f7f68fa558ce7b2dc42f3a92c427c2c5074dab9a09c5979c0ec
+  metadata.gz: ae508739a7a491f83853d67867b0c1600323216615909a1cca6aac4b2f373d5d74cad21c6dd08275ed83bc4e537e4b13ef357fdda436cbc6966dec821a3aade7
+  data.tar.gz: 7c8110b246fbc0ee40d99fd930be19d782e75846ada53ad2fe09c742cec5bf2de36f59ccbabd4600d81bc6ac4b7183fae397c6590bce2fd8377d7ca38c89e3f1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+### 4.18.7.0
+
+- Support direct use of the `shape` keyword as a shape composite that could contain other shapes and shares common attributes (e.g. background color) with all of them
+- Hello, Shape! Sample (implements a method-based custom shape containing other nested shapes)
+- Support custom shapes via including the Glimmer::UI::CustomShape module to add new shape keywords to the Glimmer GUI DSL / Canvas Shape DSL, representing shapes composed of a group of nested shapes (e.g. `car` shape representing a group of nested `polygon` shapes)
+- Hello, Custom Shape! Sample (redoes Hello, Shape! with the use of a class-based custom shape)
+- Support :max value for Canvas Shape DSL width and height, meaning fill up parent (useful for using rectangles as borders)
+- Upgrade to glimmer v1.2.0
+
 ### 4.18.6.3
 
 - Support `Glimmer::SWT::Custom::Shape::PathSegment#dispose` method

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.6.3
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.7.0
 ## 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.6.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](https://rubygems.org/gems/glimmer-dsl-swt) 4.18.7.0 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.6.3
+jgem install glimmer-dsl-swt -v 4.18.7.0
 ```
 
 `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.6.3'
+gem 'glimmer-dsl-swt', '~> 4.18.7.0'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-4.18.6.3
+4.18.7.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -39,6 +39,7 @@ This guide should help you get started with Glimmer DSL for SWT. For more advanc
     - [Shapes inside a Shape](#shapes-inside-a-shape)
     - [Shapes inside a Widget](#shapes-inside-a-widget)
     - [Shapes inside an Image](#shapes-inside-an-image)
+    - [Custom Shapes](#custom-shapes)
     - [Canvas Shape API](#canvas-shape-api)
     - [Pixel Graphics](#pixel-graphics)
   - [Canvas Path DSL](#canvas-path-dsl)
@@ -1767,6 +1768,21 @@ shell {
 
 ![Image Shape DSL](/images/glimmer-example-image-shape-dsl-app-switcher-icon.png)
 
+#### Custom Shapes
+
+Glimmer enables defining custom shape keywords, which represent shapes made up of other nested shapes.
+
+Custom shapes expand a software engineer's Glimmer GUI DSL vocabulary in their app development to be able to represent
+higher visual concepts like vehicles, scenes, and characters with a single keyword (e.g. `car`, `beach`, `player`),
+which embody and abstract all the details relating to the visual concept. This enables orders of magnitudes in increased
+productivity and readability/maintainability as a result.
+
+Just like [custom widgets](#custom-widgets), custom shapes can be defined in one of two ways:
+- method-based custom shapes: Use the `shape` keyword as a parent to represent a shape composite (similar to widget composite) and include other shapes like rectangles, polygons, and lines within.
+- class-based custom shapes: Include the `Glimmer::UI::CustomShape` supermodule and define the `options`, `body {}` block, and `before_body/after_body` hooks (similar to how it is down with [custom widgets](#custom-widgets))
+
+Check out [Hello, Shape!](/docs/reference/GLIMMER_SAMPLES.md#hello-shape) and [Hello, Custom Shape!](/docs/reference/GLIMMER_SAMPLES.md#hello-custom-shape) for examples of both approaches.
+
 #### Canvas Shape API
 
 These Canvas Shape API methods help with manipulating shapes upon user interaction, such as mouse clicking a specific shape.
@@ -1798,6 +1814,7 @@ They are implemented with the help of the highly robust Java built-in shape geom
 
 Check [Hello, Canvas!](GLIMMER_SAMPLES.md#hello-canvas) for an example.
 
+
 #### Pixel Graphics
 
 **(Early Alpha Feature)**

data/docs/reference/GLIMMER_SAMPLES.md

@@ -40,6 +40,8 @@
     - [Hello, Tree!](#hello-tree)
     - [Hello, Color Dialog!](#hello-color-dialog)
     - [Hello, Font Dialog!](#hello-font-dialog)
+    - [Hello, Shape!](#hello-shape)
+    - [Hello, Custom Shape!](#hello-custom-shape)
   - [Elaborate Samples](#elaborate-samples)
     - [User Profile](#user-profile)
     - [Login](#login)
@@ -717,6 +719,32 @@ Hello, Font Dialog!
 
 ![Hello Font Dialog Font Changed](/images/glimmer-hello-font-dialog-font-changed.png)
 
+#### Hello, Shape!
+
+This sample demonstrates the use of the `shape` keyword, which represents shape composites that contain other nested shapes.
+
+Code:
+
+[samples/hello/hello_shape.rb](/samples/hello/hello_shape.rb)
+
+Hello, Shape!
+
+![Hello Shape](/images/glimmer-hello-shape.png)
+
+#### Hello, Custom Shape!
+
+This sample demonstrates the use of the `Glimmer::UI::CustomShape` module, which is used to author new custom shape keywords.
+It reimplements Hello, Shape! with a class-based custom shape instead of a method-based custom shape.
+Just provides another option that is useful when defining more elaborate shapes to separate them from the main app code.
+
+Code:
+
+[samples/hello/hello_custom_shape.rb](/samples/hello/hello_custom_shape.rb)
+
+Hello, Custom Shape!
+
+![Hello Custom Shape](/images/glimmer-hello-custom-shape.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.6.3 ruby lib
+# stub: glimmer-dsl-swt 4.18.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.6.3"
+  s.version = "4.18.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-03-03"
+  s.date = "2021-03-04"
   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]
@@ -66,6 +66,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/column_properties_expression.rb",
     "lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb",
     "lib/glimmer/dsl/swt/cursor_expression.rb",
+    "lib/glimmer/dsl/swt/custom_shape_expression.rb",
     "lib/glimmer/dsl/swt/custom_widget_expression.rb",
     "lib/glimmer/dsl/swt/data_binding_expression.rb",
     "lib/glimmer/dsl/swt/dialog_expression.rb",
@@ -157,6 +158,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/widget_listener_proxy.rb",
     "lib/glimmer/swt/widget_proxy.rb",
     "lib/glimmer/ui.rb",
+    "lib/glimmer/ui/custom_shape.rb",
     "lib/glimmer/ui/custom_shell.rb",
     "lib/glimmer/ui/custom_widget.rb",
     "lib/glimmer/util/proc_tracker.rb",
@@ -197,6 +199,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_computed.rb",
     "samples/hello/hello_computed/contact.rb",
     "samples/hello/hello_cursor.rb",
+    "samples/hello/hello_custom_shape.rb",
     "samples/hello/hello_custom_shell.rb",
     "samples/hello/hello_custom_widget.rb",
     "samples/hello/hello_date_time.rb",
@@ -217,6 +220,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_radio.rb",
     "samples/hello/hello_radio_group.rb",
     "samples/hello/hello_sash_form.rb",
+    "samples/hello/hello_shape.rb",
     "samples/hello/hello_spinner.rb",
     "samples/hello/hello_styled_text.rb",
     "samples/hello/hello_tab.rb",
@@ -238,7 +242,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.1.2"])
+      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -256,7 +260,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
       s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     else
-      s.add_dependency(%q<glimmer>.freeze, ["~> 1.1.2"])
+      s.add_dependency(%q<glimmer>.freeze, ["~> 1.2.0"])
       s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -275,7 +279,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     end
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.1.2"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.2.0"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])

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

@@ -33,7 +33,7 @@ module Glimmer
           Glimmer::SWT::Custom::Animation.new(parent)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

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

@@ -0,0 +1,61 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer'
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/ui/custom_shape'
+require 'glimmer/swt/custom/code_text'
+require 'glimmer/swt/custom/checkbox_group'
+
+module Glimmer
+  module DSL
+    module SWT
+      class CustomShapeExpression < Expression
+        # TODO Make custom shapes automatically generate static expressions
+        include ParentExpression
+        include TopLevelExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          !!UI::CustomShape.for(keyword)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.pop : {}
+            UI::CustomShape.for(keyword).new(parent, *args, options, &block).tap do |new_custom_shape|
+            new_custom_shape.body_root.paint_pixel_by_pixel(&block) if block&.parameters&.count == 2
+          end
+        end
+  
+        def add_content(parent, keyword, *args, &block)
+          # TODO consider avoiding source_location
+          return if block&.parameters&.count == 2
+          if block.source_location == parent.content&.__getobj__.source_location
+            parent.content.call(parent) unless parent.content.called?
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -51,7 +51,7 @@ module Glimmer
           end
         end
   
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           # TODO consider avoiding source_location
           return if block&.parameters&.count == 2
           if block.source_location == parent.content&.__getobj__.source_location

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

@@ -57,6 +57,7 @@ module Glimmer
           widget
           custom_widget
           shape
+          custom_shape
         ]
       )
     end

data/lib/glimmer/dsl/swt/expand_item_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
@@ -49,7 +49,7 @@ module Glimmer
           Glimmer::SWT::ExpandItemProxy.new(parent, args)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

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

@@ -57,7 +57,7 @@ module Glimmer
           end
         end
 
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           return if @create_pixel_by_pixel || block&.parameters&.count == 2
           super
           parent.post_add_content

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

@@ -39,7 +39,7 @@ module Glimmer
           Glimmer::SWT::TransformProxy.new(parent, *args, multiply: true)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

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

@@ -40,7 +40,7 @@ module Glimmer
           Glimmer::SWT::Custom::Shape.create(parent, keyword, *args, &block)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

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

@@ -41,7 +41,7 @@ module Glimmer
           Glimmer::SWT::TransformProxy.new(parent, *args)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

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

@@ -46,7 +46,7 @@ module Glimmer
           end
         end
 
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           return if block&.parameters&.count == 2
           super
           parent.post_add_content

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

@@ -73,6 +73,7 @@ module Glimmer
           end
         
           def valid?(parent, keyword, *args, &block)
+            return true if keyword.to_s == 'shape'
             gc_instance_methods.include?(method_name(keyword, arg_options(args))) ||
               constants.include?(keyword.to_s.camelcase(:upper).to_sym)
           end
@@ -126,7 +127,7 @@ module Glimmer
           end
         end
         
-        attr_reader :drawable, :parent, :name, :args, :options, :shapes
+        attr_reader :drawable, :parent, :name, :args, :options, :shapes, :properties
         attr_accessor :extent
         
         def initialize(parent, keyword, *args, &property_block)
@@ -134,7 +135,7 @@ module Glimmer
           @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)
+          @method_name = self.class.method_name(keyword, @options) unless keyword.to_s == 'shape'
           @args = args
           @properties = {}
           @shapes = [] # nested shapes
@@ -227,7 +228,7 @@ module Glimmer
         
         def content(&block)
           Glimmer::SWT::DisplayProxy.instance.auto_exec do
-            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::ShapeExpression.new, &block)
+            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::ShapeExpression.new, @name, &block)
             calculated_args_changed!(children: false)
           end
         end
@@ -248,7 +249,8 @@ module Glimmer
           end
         end
         
-        def apply_property_arg_conversions(method_name, property, args)
+        def apply_property_arg_conversions(property, args)
+          method_name = attribute_setter(property)
           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?
@@ -348,10 +350,16 @@ 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?
+          if current_parameter_name?(:dest_x) && dest_x.nil?
+            self.dest_x = :default
+          elsif parameter_name?(:x) && x.nil?
+            self.x = :default
+          end
+          if current_parameter_name?(:dest_y) && dest_y.nil?
+            self.dest_y = :default
+          elsif parameter_name?(:y) && y.nil?
+            self.y = :default
+          end
           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)
@@ -396,7 +404,7 @@ module Glimmer
         
         # parameter names for arguments to pass to SWT GC.xyz method for rendering shape (e.g. draw_image(image, x, y) yields :image, :x, :y parameter names)
         def parameter_names
-          []
+          [:x, :y, :width, :height]
         end
         
         # subclasses may override to specify location parameter names if different from x and y (e.g. all polygon points are location parameters)
@@ -532,8 +540,39 @@ 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?
+          @name == 'shape'
+        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
+          end
+          the_parent_shapes
+        end
+        
+        # ordered from closest to farthest parent
+        def parent_shape_composites
+          parent_shapes.select(&:shape_composite?)
+        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)
+            end
+            all_properties.merge(parent_properties)
+          end
+        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
@@ -546,24 +585,29 @@ module Glimmer
         
         def paint_self(paint_event)
           @painting = true
-          calculate_paint_args!
-          @original_properties_backup = {}
-          @properties.each do |property, args|
-            method_name = attribute_setter(property)
-            @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
+          unless shape_composite?
+            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|
+              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)
+              if property == 'transform' && args.first.is_a?(TransformProxy)
+                args.first.swt_transform.dispose
+              end
             end
+            ensure_extent(paint_event)
           end
-          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)
+          unless shape_composite?
+            # 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|
+              paint_event.gc.send(method_name, value)
+            end
           end
           @painting = false
         rescue => e
@@ -648,11 +692,19 @@ module Glimmer
           end
           if default_width?
             original_width = width
-            self.width = default_width + default_width_delta
+            self.width = default_width + width_delta
           end
           if default_height?
             original_height = height
-            self.height = default_height + default_height_delta
+            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
@@ -707,6 +759,16 @@ module Glimmer
           (height.nil? || height == :default || height == 'default' || (height.is_a?(Array) && (height.first.to_s == :default || height.first.to_s == 'default')))
         end
         
+        def max_width?
+          current_parameter_name?(:width) and
+            (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'))
+        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?
@@ -722,29 +784,61 @@ module Glimmer
         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
+            if shape.max_width?
+              0
+            else
+              shape_width = shape.calculated_width.to_f
+              shape_x = shape.default_x? ? 0 : shape.x.to_f
+              shape_x + shape_width
+            end
+          end
+          if shapes.size == 1 && shapes.first.max_width?
+            self.parent.size.x
+          else
+            x_ends.max.to_f
           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
+            if shape.max_height?
+              0
+            else
+              shape_height = shape.calculated_height.to_f
+              shape_y = shape.default_y? ? 0 : shape.y.to_f
+              shape_y + shape_height
+            end
+          end
+          if shapes.size == 1 && shapes.first.max_height?
+            self.parent.size.y
+          else
+            y_ends.max.to_f
           end
-          y_ends.max.to_f
+        end
+        
+        def max_width
+          # consider caching
+          parent.is_a?(Drawable) ? parent.size.x : parent.calculated_width
+        end
+        
+        def max_height
+          # consider caching
+          parent.is_a?(Drawable) ? parent.size.y : parent.calculated_height
         end
         
         def calculated_width
-          default_width? ? (default_width + default_width_delta) : width
+          result_width = width
+          result_width = (default_width + width_delta) if default_width?
+          result_width = (max_width + width_delta) if max_width?
+          result_width
         end
         
         def calculated_height
-          default_height? ? (default_height + default_height_delta) : height
+          result_height = height
+          result_height = (default_height + height_delta) if default_height?
+          result_height = (max_height + height_delta) if max_height?
+          result_height
         end
         
         def default_x_delta
@@ -757,12 +851,12 @@ module Glimmer
           y[1].to_f
         end
         
-        def default_width_delta
+        def width_delta
           return 0 unless default_width? && width.is_a?(Array)
           width[1].to_f
         end
         
-        def default_height_delta
+        def height_delta
           return 0 unless default_height? && height.is_a?(Array)
           height[1].to_f
         end
@@ -777,12 +871,12 @@ module Glimmer
           self.y = [:default, delta]
         end
         
-        def default_width_delta=(delta)
+        def width_delta=(delta)
           return unless default_width?
           self.width = [:default, delta]
         end
         
-        def default_height_delta=(delta)
+        def height_delta=(delta)
           return unless default_height?
           self.height = [:default, delta]
         end
@@ -850,9 +944,7 @@ module Glimmer
               # 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|
-                method_name = attribute_setter(property)
-                converted_args = apply_property_arg_conversions(method_name, property, args)
-                @properties[property] = converted_args
+                @properties[property] = apply_property_arg_conversions(property, args)
               end
               apply_shape_arg_conversions!
               apply_shape_arg_defaults!