glimmer-dsl-swt 4.22.2.1 → 4.22.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38c5a6fcb0bc02d02b4b2b4566e86bcdcfc037730b344bc0868afca2bbaf045d
-  data.tar.gz: b0c616c16900822130ee36452d88e36070bf293668f54ded34b9a1798842cb97
+  metadata.gz: 1ddae7932813d7434f6ea1013668ca03d899eae9dc6a0aacece9139f1172f98a
+  data.tar.gz: dcf0088e2b10c5861f5833c6962c3f253e043f82e7d304fdd35b3a923241c5ee
 SHA512:
-  metadata.gz: dc5a5d28f744a77d10e29e96fe28e641a02463c610431ae2fbdfe0c662a9399cd08ac942669d6c85e55069e67a6c45d98fc94c84d9a7e7b58bf4ab107d14d82b
-  data.tar.gz: 2b91cdab4cd1ee9919ad1b635314a625e9335153a34e7d792a645e91df2fe66e1348ed7d39659ebf5c02859621a768fd31cce1674ae24a2911c60c47c6fc9dab
+  metadata.gz: fd84fc1cebaf9e93eff102853f27198cc3bfb4bd5cdad95c63a26a73a05e9331caf54c430883e14f41e8e58688d5e889d9ad0c9758da59341b98f60ec59a4330
+  data.tar.gz: 99021203e9835c9204c248f6bffd333f48cf99dccc3ad5b6a223bb2db61217ff364110948b46da7999e9c3c1b0b8f452040270daf12e18f1d79f4b48b3a84808

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 4.22.2.5
+
+- Update all samples to match the [GLIMMER_STYLE_GUIDE.md](/docs/reference/GLIMMER_STYLE_GUIDE.md)
+- Update scaffolding code to match the [GLIMMER_STYLE_GUIDE.md](/docs/reference/GLIMMER_STYLE_GUIDE.md)
+
+## 4.22.2.4
+
+- Address the warning regarding using Ruby singletons on Java objects (shows up when running `glimmer samples`)
+- Fix order of calling `require 'app_name/view/app_view'` in scaffolded app (must be last)
+
+## 4.22.2.3
+
+- Support `#content { }` on `layout_data`
+- Fix issue with data-binding `layout_data {exclude}` property using Shine `<=>` syntax
+
+## 4.22.2.2
+
+- Snake elaborate sample
+- Fixed `timer_exec(time_in_millis) {}` expresion
+
 ## 4.22.2.1
 
 - Upgrade to glimmer 2.6.0

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.22.2.1
+# [<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.22.2.5
 ## 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)
@@ -17,19 +17,25 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.2.1 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. 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.22.2.5 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. 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.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword.
 
 Please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) better by providing feedback and [contributing](#contributing) whenever possible. Any feature suggestions that are accepted could be implemented within weeks if not days.
 
-Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interested in:
-- [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
-- [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
-- [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)
-- [glimmer-dsl-gtk](https://github.com/AndyObtiva/glimmer-dsl-gtk): Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library)
-- [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
-- [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS
+**[Glimmer](https://github.com/AndyObtiva/glimmer) DSL Comparison Table:**
+DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
+----|-----------|---------|------------------|------|------|--------
+[Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)](https://github.com/AndyObtiva/glimmer-dsl-swt) | Mac / Windows / Linux | Yes | Yes (Canvas Shape DSL) | Very Mature / Scaffolding / Native Executable Packaging / Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint | Java / JRuby
+[Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)](https://github.com/AndyObtiva/glimmer-dsl-opal) | All Web Browsers | No | Yes (Canvas Shape DSL) | Simpler than All JavaScript Technologies / Auto-Webify Desktop Apps | Setup Process / Only Rails 5 Support for Now | Rails
+[Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-libui) | Mac / Windows / Linux | Yes | Yes (Area API) | Fast Startup Time / Light Memory Footprint | LibUI is an Incomplete Mid-Alpha Only | None Other Than MRI Ruby
+[Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-tk) | Mac / Windows / Linux | Some Native-Themed Widgets (Not Truly Native) | Yes (Canvas) | Fast Startup Time / Light Memory Footprint | Widgets Do Not Look Truly Native, Espcially on Linux | ActiveTcl / MRI Ruby
+[Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-gtk) | Mac / Windows / Linux | Only on Linux | Yes (Cairo) | Complete Access to GNOME Features on Linux (Forte) | Not Native on Mac and Windows | None Other Than MRI Ruby on Linux / Brew Packages on Mac / MSYS & MING Toolchains on Windows / MRI Ruby
+[Glimmer DSL for FX (FOX Toolkit Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-fx) | Mac (requires XQuartz) / Windows / Linux | No | Yes (Canvas) | No Prerequisites on Windows (Forte Since Binaries Are Included Out of The Box) | Widgets Do Not Look Native / Mac Usage Obtrusively Starts XQuartz | None Other Than MRI Ruby on Windows / XQuarts on Mac / MRI Ruby
+[Glimmer DSL for JFX (JRuby JavaFX Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-jfx) | Mac / Windows / Linux | No | Yes (javafx.scene.shape and javafx.scene.canvas) | Rich in Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint / Widgets Do Not Look Native | Java / JRuby / JavaFX SDK
+[Glimmer DSL for Swing (JRuby Swing Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-swing) | Mac / Windows / Linux | No | Yes (Java2D) | Very Mature | Slow JRuby Startup Time / Heavy Memory Footprint / Widgets Do Not Look Native | Java / JRuby
+[Glimmer DSL for XML (& HTML)](https://github.com/AndyObtiva/glimmer-dsl-xml) | All Web Browsers | No | Yes (SVG) | Programmable / Lighter-weight Than Actual XML | XML Elements Are Sometimes Not Well-Named (Many Types of Input) | None
+[Glimmer DSL for CSS](https://github.com/AndyObtiva/glimmer-dsl-css) | All Web Browsers | No | Yes | Programmable | CSS Is Over-Engineered / Too Many Features To Learn | None
 
 ## Examples
 
@@ -325,7 +331,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.22.2.1
+jgem install glimmer-dsl-swt -v 4.22.2.5
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -353,7 +359,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.22.2.1'
+gem 'glimmer-dsl-swt', '~> 4.22.2.5'
 ```
 
 And, then run:
@@ -376,7 +382,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.5
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -546,6 +552,14 @@ If you have a Glimmer app you would like referenced here, please mention in a Pu
 
 [Befunge 98 GUI](https://github.com/AndyObtiva/befunge98/tree/gui)
 
+### Glimmer Metronome
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> Glimmer Metronome](https://github.com/AndyObtiva/glimmer_metronome)
+
+### Glimmer Wordle
+
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=40 /> Glimmer Wordle - Word Game](https://github.com/AndyObtiva/glimmer_wordle)
+
 ## Packaging & Distribution
 
 Glimmer simplifies the process of native-executable packaging and distribution on Mac and Windows via a single command:

data/VERSION

@@ -1 +1 @@
-4.22.2.1
+4.22.2.5

data/docs/reference/GLIMMER_COMMAND.md

@@ -10,6 +10,8 @@ glimmer
 
 On Mac and Linux, it additionally brings up a TUI (Text-based User Interface) for interactive navigation and execution of Glimmer tasks (courtesy of [rake-tui](https://github.com/AndyObtiva/rake-tui)).
 
+(note that in ARM64 machines, the TUI does not seem to work at the moment, so simply use glimmer commands directly without the TUI until this is fixed)
+
 On Windows, it simply lists the available Glimmer tasks at the end (courtsey of [rake](https://github.com/ruby/rake)).
 
 If you are new to Glimmer, you may read the Basic Usage section and skip the rest until you have gone through [Girb (Glimmer irb) Command](#girb-glimmer-irb-command), [Glimmer GUI DSL Syntax](#glimmer-gui-dsl-syntax), and [Samples](#samples).
@@ -107,7 +109,7 @@ glimmer samples/hello/hello_world.rb samples/hello/hello_tab.rb
 
 Launches samples/hello/hello_world.rb and samples/hello_tab.rb at the same time, each in a separate JRuby thread.
 
-Note: under Zsh (Z Shell), glimmer can only be used in its advanced TUI mode (e.g. `glimmer` and then selecting a task) not the primitive rake task mode (e.g. `glimmer scaffold[app]`)
+Note: under Zsh (Z Shell), glimmer can only be used in its advanced \ mode (e.g. `glimmer` and then selecting a task) not the primitive rake task mode (e.g. `glimmer scaffold[app]`)
 
 ### Glimmer Samples
 

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1495,6 +1495,13 @@ Glimmer composites always come with `grid_layout` by default, but you can still
 
 Glimmer shell always comes with `fill_layout` having `:horizontal` type.
 
+If you ever want to force a re-layout on a `composite` or `shell`, you can call the following:
+
+```ruby
+composite_or_shell.layout(true, true)
+composite_or_shell.pack(true)
+```
+
 This is a great guide for learning more about SWT layouts:
 
 https://www.eclipse.org/articles/Article-Understanding-Layouts/Understanding-Layouts.htm
@@ -1579,6 +1586,144 @@ composite {
 
 If you data-bind any layout data properties, when they change, the shell containing their widget re-packs its children (calls `#pack` method automatically) to ensure proper relayout of all widgets.
 
+Also, if you ever want a widget to be excluded from layout entirely (in addition to having `visible false` on the widget), you can set `layout_data { exclude true }` or data-bind `exclude` property of `layout_data` to have a widget included/excluded automatically based on a condition.
+
+Here is a re-implementation of the [Login sample](/docs/reference/GLIMMER_SAMPLES.md#login) that hides/shows login/logout buttons upon login/logout (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
+
+```ruby
+require 'glimmer-dsl-swt'
+
+class LoginPresenter
+
+  attr_accessor :user_name
+  attr_accessor :password
+  attr_accessor :status
+
+  def initialize
+    @user_name = ""
+    @password = ""
+    @status = "Logged Out"
+  end
+
+  def status=(status)
+    @status = status
+  end
+  
+  def valid?
+    !@user_name.to_s.strip.empty? && !@password.to_s.strip.empty?
+  end
+
+  def logged_in?
+    self.status == "Logged In"
+  end
+
+  def logged_out?
+    !self.logged_in?
+  end
+
+  def login!
+    return unless valid?
+    self.status = "Logged In"
+  end
+
+  def logout!
+    self.user_name = ""
+    self.password = ""
+    self.status = "Logged Out"
+  end
+
+end
+
+class Login
+  include Glimmer::UI::CustomShell
+
+  before_body do
+    @presenter = LoginPresenter.new
+  end
+
+  body {
+    shell {
+      text "Login"
+      
+      composite {
+        grid_layout(2, false) #two columns with differing widths
+
+        label { text "Username:" } # goes in column 1
+        @user_name_text = text {   # goes in column 2
+          layout_data :fill, :center, true, false
+          text <=> [@presenter, :user_name]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
+          on_key_pressed { |event|
+            @password_text.set_focus if event.keyCode == swt(:cr)
+          }
+        }
+
+        label { text "Password:" }
+        @password_text = text(:password, :border) {
+          layout_data :fill, :center, true, false
+          text <=> [@presenter, :password]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
+          on_key_pressed { |event|
+            @presenter.login! if event.keyCode == swt(:cr)
+          }
+        }
+
+        label { text "Status:" }
+        label {
+          layout_data :fill, :center, true, false
+          text <= [@presenter, :status]
+        }
+
+        button {
+          layout_data {
+            exclude <= [@presenter, :logged_in?, computed_by: :status]
+          }
+          
+          text "Login"
+          visible <= [@presenter, :logged_out?, computed_by: :status]
+          
+          on_widget_selected { @presenter.login! }
+          on_key_pressed { |event|
+            if event.keyCode == swt(:cr)
+              @presenter.login!
+            end
+          }
+        }
+
+        button {
+          layout_data {
+            exclude <= [@presenter, :logged_out?, computed_by: :status]
+          }
+          
+          text "Logout"
+          visible <= [@presenter, :logged_in?, computed_by: :status]
+          
+          on_widget_selected { @presenter.logout! }
+          on_key_pressed { |event|
+            if event.keyCode == swt(:cr)
+              @presenter.logout!
+              @user_name_text.set_focus
+            end
+          }
+        }
+      }
+    }
+  }
+end
+
+Login.launch
+```
+
+Login (with `exclude` data-binding) - Logged Out
+
+![Login Exclude Logged Out](/images/glimmer-login-exclude-logged-out.png)
+
+Login (with `exclude` data-binding) - Logged In
+
+![Login Exclude Logged In](/images/glimmer-login-exclude-logged-in.png)
+
 **NOTE**: Layout data must never be reused between widgets. Always specify or clone again for every widget.
 
 This is a great guide for learning more about SWT layouts:

data/docs/reference/GLIMMER_SAMPLES.md

@@ -79,12 +79,12 @@
     - [Metronome](#metronome)
     - [Weather](#weather)
     - [Quarto](#quarto)
+    - [Snake](#snake)
   - [External Samples](#external-samples)
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
     - [Timer](#timer)
     - [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire)
-    - [Glimmer Metronome](#glimmer-metronome)
 - [License](#license)
 
 ## Samples
@@ -1335,6 +1335,8 @@ This sample demonstrates a Metronome that accepts a beat count and bpm rate, tic
 
 It takes advantage of the Canvas Shape DSL, data-binding, and the Java Sound library. It employs a hybrid approach of relying on standard widget layouts (grid layout) and canvas shape x,y placement.
 
+An external more full-fledged version exists too as [Glimmer Metronome](https://github.com/AndyObtiva/glimmer_metronome).
+
 Code:
 
 [samples/elaborate/metronome.rb](/samples/elaborate/metronome.rb)
@@ -1375,6 +1377,20 @@ Quarto
 
 ![Quarto](/images/glimmer-quarto.png)
 
+#### Snake
+
+This is the classic Snake game, which demonstrates MVP (Model-View-Presenter) and data-binding written [test-first](/spec/samples/elaborate/snake/model/game_spec.rb).
+
+Code:
+
+[samples/elaborate/snake.rb](/samples/elaborate/snake.rb)
+
+Snake
+
+![Snake](/images/glimmer-snake.png)
+
+![Snake Video](/images/glimmer-snake.gif)
+
 ### External Samples
 
 #### Glimmer Calculator
@@ -1414,14 +1430,6 @@ This is a souped up version of the Klondike Solitaire elaborate sample, which is
 
 ![Glimmer Klondike Solitaire](https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/images/glimmer-klondike-solitaire.png)
 
-#### Glimmer Metronome
-
-This is an external enhanced version of [Metronome](#metronome) that can be packaged as an independent native executable.
-
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> Glimmer Metronome](https://github.com/AndyObtiva/glimmer_metronome)
-
-![Metronome](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome.png)
-
 ## License
 
 [MIT](LICENSE.txt)

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

@@ -36,8 +36,7 @@ module Glimmer
   
         def can_interpret?(parent, keyword, *args, &block)
           keyword == exec_operation and
-            block_given? and
-            args.empty?
+            block_given?
         end
   
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/launcher.rb

@@ -72,10 +72,13 @@ module Glimmer
         OPERATING_SYSTEMS_SUPPORTED.detect {|os| OS.send("#{os}?")}
       end
       
-      def special_cpu_architecture_suffix
+      def is_arm64?
         host_cpu = OS.host_cpu.downcase
-        special = host_cpu.include?('aarch64') || host_cpu.include?('arm')
-        special ? "_aarch64" : ''
+        host_cpu.include?('aarch64') || host_cpu.include?('arm')
+      end
+      
+      def special_cpu_architecture_suffix
+        is_arm64? ? "_aarch64" : ''
       end
 
       def swt_jar_file
@@ -187,7 +190,7 @@ module Glimmer
     end
     
     def display_tasks
-      if OS.windows?
+      if OS.windows? || Launcher.is_arm64?
         require 'rake'
         Rake::TaskManager.record_task_metadata = true
         require_relative 'rake_task'

data/lib/glimmer/rake_task/scaffold.rb

@@ -443,13 +443,14 @@ module Glimmer
               require 'glimmer-dsl-swt'
               # add more gems if needed
             end
-            require '#{file_name(app_name)}/view/app_view'
-    
+            
             class #{class_name(app_name)}
               APP_ROOT = File.expand_path('../..', __FILE__)
               VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
               LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
             end
+    
+            require '#{file_name(app_name)}/view/app_view'
           MULTI_LINE_STRING
         end
     
@@ -596,12 +597,13 @@ module Glimmer
         Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
         Display.app_version = VERSION
         @display = display {
-          on_about {
+          on_about do
             display_about_dialog
-          }
-          on_preferences {
+          end
+          
+          on_preferences do
             #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
-          }
+          end
         }
       end
             MULTI_LINE_STRING
@@ -657,17 +659,21 @@ module Glimmer
           menu_bar {
             menu {
               text '&File'
+              
               menu_item {
                 text '&About...'
-                on_widget_selected {
+                
+                on_widget_selected do
                   display_about_dialog
-                }
+                end
               }
+              
               menu_item {
                 text '&Preferences...'
-                on_widget_selected {
+                
+                on_widget_selected do
                   #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
-                }
+                end
               }
             }
           }
@@ -696,31 +702,37 @@ module Glimmer
             custom_shell_file_content += <<-MULTI_LINE_STRING
       def display_preferences_dialog
         dialog(swt_widget) {
-          text 'Preferences'
           grid_layout {
             margin_height 5
             margin_width 5
           }
+          
+          text 'Preferences'
+          
           group {
             row_layout {
               type :vertical
               spacing 10
             }
+            
             text 'Greeting'
             font style: :bold
+            
             [
               'Hello, World!',
               'Howdy, Partner!'
             ].each do |greeting_text|
               button(:radio) {
-                text greeting_text
-                selection <= [self, :greeting, on_read: ->(g) { g == greeting_text }]
                 layout_data {
                   width 160
                 }
-                on_widget_selected { |event|
+                
+                text greeting_text
+                selection <= [self, :greeting, on_read: ->(g) { g == greeting_text }]
+                
+                on_widget_selected do |event|
                   self.greeting = event.widget.getText
-                }
+                end
               }
             end
           }
@@ -822,6 +834,7 @@ end
             background background_color
             cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*0.65 - size_width*0.66, 0 - size_height*0.33, size_width/2 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
           }
+          
           path {
             background background_color
             cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*1.35 - size_width*0.66, 0 - size_height*0.33, size_width*1.5 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33

data/lib/glimmer/swt/image_proxy.rb

@@ -97,6 +97,7 @@ module Glimmer
         end
         proxy = self
         # TODO consider adding a get_data/set_data method to conform with other SWT widgets
+        @swt_image.class.__persistent__ = true
         @swt_image.singleton_class.define_method(:dispose) do
           proxy.clear_shapes
           super()

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -106,6 +106,10 @@ module Glimmer
       def attribute_getter(attribute_name)
         "#{attribute_name.to_s.camelcase(:lower)}"
       end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::LayoutDataExpression.new, 'layout_data', &block)
+      end
     end
   end
 end

data/samples/elaborate/calculator.rb

@@ -21,14 +21,14 @@ class Calculator
     Display.setAppName('Glimmer Calculator')
     
     display {
-      on_swt_keydown { |key_event|
+      on_swt_keydown do |key_event|
         char = key_event.character.chr rescue nil
         @presenter.press(char)
-      }
+      end
       
-      on_about {
+      on_about do
         display_about_dialog
-      }
+      end
     }
   end
 
@@ -59,16 +59,16 @@ class Calculator
       operation_button('÷')
       operation_button('×')
       operation_button('−')
-      (7..9).each { |number|
+      (7..9).each do |number|
         number_button(number)
-      }
+      end
       operation_button('+', font: BUTTON_FONT_BIG, vertical_span: 2)
-      (4..6).each { |number|
+      (4..6).each do |number|
         number_button(number)
-      }
-      (1..3).each { |number|
+      end
+      (1..3).each do |number|
         number_button(number)
-      }
+      end
       command_button('=', font: BUTTON_FONT_BIG, vertical_span: 2)
       number_button(0, horizontal_span: 2)
       operation_button('.')
@@ -98,9 +98,9 @@ class Calculator
         vertical_span options[:vertical_span]
       }
       
-      on_widget_selected {
+      on_widget_selected do
         @presenter.press(command)
-      }
+      end
     }
   end