glimmer-dsl-swt 4.18.5.0 → 4.18.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae230b3e4a50ef2425a4b5155e98ff598e0bb0e3d1f7a5c15eaadcbf5688d41
-  data.tar.gz: 7ec51028f89ec3ff207aecbb2f91ad43b03e1e6db8d03885e681972cdd9fd1f9
+  metadata.gz: e3086c3823faac7765ca33e069111da2f027462fc9d09a2a9799a2ff094d6692
+  data.tar.gz: be7070377808b55cfa4bde48543b8a98fdff77205c9db0c07d0f4ac42078e00e
 SHA512:
-  metadata.gz: '0954400586b6df73a08070b2f7bd0669b11dca0ecb9ba614e1719b0a41e9966dad2f7d16c5f3b344bb14cbc4074978b793d206d6034dc3ce5034aee98e9732de'
-  data.tar.gz: '086c20606c6319fa70c480b3633d60682723d246a46c7d4f3d2b2e8d3c9ed83f2d22a7e7f3288cc35fb38f11f0895ed3b98b8297ee607767094f179612aabbc2'
+  metadata.gz: 79e966ac5b7c342d8a9b936387e59f299f4895ae93c01600f8289cc06448b4d90beb0bd6e24073728d7a379172e1513b3cdf05fb3cdd4361ee08bd337870f491
+  data.tar.gz: 3c89781755c57a6cfc2990d85352bb37674e41a8d2f55f50c26c0d44f948ab26342b58bc98fcc9f93818cf19036ea0032a84b1565397abc7b7aa93a029b8c851

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 4.18.5.1
+
+- Hello, Color Dialog! Sample
+- Hello, Font Dialog! Sample
+- Handle SWT RGB color data objects when setting colors on widgets (e.g. background)
+- Enhance Hello, Canvas! with Color selector via right-click menu
+- Fixed issue with tree multi selection throwing an exception
+
 ### 4.18.5.0
 
 - Automatic `sync_exec` usage from threads other than the GUI thread, thus absolving software engineers from the need to use `sync_exec` explicitly anymore.

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.5.0
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.5.1
 ## 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)
@@ -342,7 +342,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.5.0
+jgem install glimmer-dsl-swt -v 4.18.5.1
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -360,7 +360,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.5.0'
+gem 'glimmer-dsl-swt', '~> 4.18.5.1'
 ```
 
 And, then run:
@@ -404,6 +404,8 @@ Glimmer configuration may be done via the `Glimmer::Config` module.
 
 ## Samples
 
+See a listing of Glimmer DSL for SWT samples over here, including screenshots and explanations of what each sample demonstrates:
+
 [docs/reference/GLIMMER_SAMPLES.md](docs/reference/GLIMMER_SAMPLES.md)
 
 Check the [samples](samples) directory in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer-dsl-swt` gem first and then use the `glimmer samples` command to run it (alternatively, you may clone the repo, follow [CONTRIBUTING.md](CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer`).

data/VERSION

@@ -1 +1 @@
-4.18.5.0
+4.18.5.1

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -432,7 +432,7 @@ Dialog is a variation on Shell. It is basically a shell that is modal (blocks wh
 
 Glimmer facilitates building dialogs by using the `dialog` keyword, which automatically adds the SWT.DIALOG_TRIM and SWT.APPLICATION_MODAL [widget styles](#widget-styles) needed for a dialog.
 
-Check out [Hello, Dialog!](#hello-dialog) sample to learn more.
+Check out [Hello, Dialog!](GLIMMER_SAMPLES.md#hello-dialog) sample to learn more.
 
 ##### message_box
 
@@ -895,7 +895,7 @@ shell {
 }.open
 ```
 
-You may check out a more full-fledged example in [Hello, Sash Form!](#hello-sash-form)
+You may check out a more full-fledged example in [Hello, Sash Form!](GLIMMER_SAMPLES.md#hello-sash-form)
 
 ![Hello Sash Form](/images/glimmer-hello-sash-form.png)
 
@@ -1473,7 +1473,7 @@ Screenshot:
 
 ![Canvas Animation Example](/images/glimmer-example-canvas.png)
 
-Learn more at the [Hello, Canvas! Sample](#hello-canvas).
+Learn more at the [Hello, Canvas! Sample](GLIMMER_SAMPLES.md#hello-canvas).
 
 If you ever have special needs or optimizations, you could always default to direct SWT painting via [org.eclipse.swt.graphics.GC](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html) instead. Learn more at the [SWT Graphics Guide](https://www.eclipse.org/articles/Article-SWT-graphics/SWT_graphics.html) and [SWT Image Guide](https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html#Saving%20Images).
 
@@ -1517,7 +1517,7 @@ shell {
 
 #### Shapes inside a Widget
 
-Keep in mind that the Shape DSL can be used inside any widget, not just `canvas`. Unlike shapes on a `canvas`, which are standalone graphics, when included in a widget, which already has its own look and feel, shapes are used as a decorative add-on that complements its look by getting painted on top of it. For example, shapes were used to decorate `composite` blocks in the [Tetris](#tetris) sample to have a more bevel look. In summary, Shapes can be used in a hybrid approach (shapes inside a widget), not just standalone in a `canvas`.
+Keep in mind that the Shape DSL can be used inside any widget, not just `canvas`. Unlike shapes on a `canvas`, which are standalone graphics, when included in a widget, which already has its own look and feel, shapes are used as a decorative add-on that complements its look by getting painted on top of it. For example, shapes were used to decorate `composite` blocks in the [Tetris](GLIMMER_SAMPLES.md#tetris) sample to have a more bevel look. In summary, Shapes can be used in a hybrid approach (shapes inside a widget), not just standalone in a `canvas`.
 
 #### Shapes inside an Image
 
@@ -1889,7 +1889,7 @@ transform(1, 1, 4, 2, 2, 4).
   translate(3, 7)
 ```
 
-Learn more at the [Hello, Canvas Transform! Sample](#hello-canvas-transform).
+Learn more at the [Hello, Canvas Transform! Sample](GLIMMER_SAMPLES.md#hello-canvas-transform).
 
 ### Canvas Animation DSL
 
@@ -1955,7 +1955,7 @@ API of Animation Object (returned from `animation` keyword):
 - `#cycle_limited?` returns true if `cycle_count` is specified
 - `#duration_limited?` returns true if `duration_limit` is specified
 
-Learn more at the [Hello, Canvas Animation! Sample](#hello-canvas-animation).
+Learn more at the [Hello, Canvas Animation! Sample](GLIMMER_SAMPLES.md#hello-canvas-animation).
 
 If there is anything missing you would like added to the Glimmer Animation DSL that you saw available in the SWT APIs, you may [report an issue](https://github.com/AndyObtiva/glimmer-dsl-swt/issues) or implement yourself and [contribute](#contributing) via a Pull Request.
 
@@ -1963,7 +1963,7 @@ If there is anything missing you would like added to the Glimmer Animation DSL t
 
 Animation could be alternatively implemented without the `animation` keyword through a loop that invokes model methods inside `sync_exec {}` (or `async_exec {}`), which indirectly cause updates to the GUI via data-binding.
 
-The [Glimmer Tetris](#glimmer-tetris) sample provides a good example of that.
+The [Glimmer Tetris](#tetris) sample provides a good example of that.
 
 ### Data-Binding
 
@@ -3162,7 +3162,7 @@ Simply install the [glimmer-cw-video](https://rubygems.org/gems/glimmer-cw-video
 This [Eclipse guide](https://www.eclipse.org/articles/Article-Writing%20Your%20Own%20Widget/Writing%20Your%20Own%20Widget.htm) for how to write custom SWT widgets is also applicable to Glimmer Custom Widgets written in Ruby. I recommend reading it:
 [https://www.eclipse.org/articles/Article-Writing%20Your%20Own%20Widget/Writing%20Your%20Own%20Widget.htm](https://www.eclipse.org/articles/Article-Writing%20Your%20Own%20Widget/Writing%20Your%20Own%20Widget.htm)
 
-Also, you may check out [Hello, Custom Widget!](#hello-custom-widget) for another example.
+Also, you may check out [Hello, Custom Widget!](GLIMMER_SAMPLES.md#hello-custom-widget) for another example.
 
 ### Custom Shells
 
@@ -3233,7 +3233,7 @@ shell { |app_shell|
 
 If you use a Custom Shell as the top-level app shell, you may invoke the class method `::launch` instead to avoid building an app class yourself or including Glimmer into the top-level namespace (e.g. `Tetris.launch` instead of `include Glimmer; tetris.open`)
 
-You may check out [Hello, Custom Shell!](#hello-custom-shell) for another example.
+You may check out [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) for another example.
 
 ### Drag and Drop
 
@@ -3247,7 +3247,7 @@ To get started, simply follow these steps:
 1. On the drop target widget, add `on_drop` [DropTargetListener](https://help.eclipse.org/2020-03/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/dnd/DropTargetListener.html) event handler block at minimum (you may also add `on_drag_enter` [must set [`event.detail`](https://help.eclipse.org/2020-06/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/dnd/DropTargetEvent.html#detail) if added], `on_drag_over`, `on_drag_leave`, `on_drag_operation_changed` and `on_drop_accept` if needed)
 1. Read `event.data` and consume it (e.g. change widget text) inside the `on_drop` event handler block.
 
-Example (taken from [samples/hello/hello_drag_and_drop.rb](#hello-drag-and-drop) / you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
+Example (taken from [samples/hello/hello_drag_and_drop.rb](GLIMMER_SAMPLES.md#hello-drag-and-drop) / you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
 
 ```ruby
 class Location

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,22 @@ Hello, Canvas!
 
 ![Hello Canvas](/images/glimmer-hello-canvas.png)
 
+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 Animation!
 
 This sample demonstrates the use of the `canvas` widget and [Animation DSL](#canvas-animation-dsl) in Glimmer.
@@ -630,6 +648,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.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.5.0"
+  s.version = "4.18.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-02-22"
+  s.date = "2021-02-23"
   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/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/shape.rb

@@ -174,6 +174,9 @@ 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}
+          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
@@ -188,7 +191,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)
@@ -199,20 +202,20 @@ module Glimmer
           end
           if ['setBackgroundPattern', 'setForegroundPattern'].include?(method_name.to_s)
             @parent.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] = []
@@ -323,7 +326,7 @@ module Glimmer
           if parameter_name?(attribute_name)
             set_parameter_attribute(attribute_name, *args)
           else
-            @properties[attribute_name] = args
+            @properties[ruby_attribute_getter(attribute_name)] = args
           end
           if @content_added && !@parent.is_disposed
             @calculated_paint_args = false
@@ -366,6 +369,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