glimmer-dsl-swt 4.21.0.0 → 4.21.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cdb03595910fbb0a4e8a6e40262aea904904063f08e8cf6144bb5569408fc60
-  data.tar.gz: efe9220cb985da71aa1c27efc914cdd9d71d21a0466adad994d0e751c3063219
+  metadata.gz: 06baa33f2bcb64eee399561cbc5b92ea160d677462b690d36746816385d5c81a
+  data.tar.gz: de77d266007ed06d74ff5f28374167561f6989620d3293ab0597bc006b7e1af3
 SHA512:
-  metadata.gz: 516f678f951f896a4421f1dbb46bb6b7c5e2c53713892627e6c3d51f097f74f50328d82582a04c33db786cdf6c71a7de0afc89299f34262b8e5af99b18e2429c
-  data.tar.gz: 11ce0f19287bc04ff2f1824896400d8ed90061a738960d8495131245ebefdd9e1dfd04868f4a8ef4a9ada9a7c16654a5f035a6d92a88bbf8296c23f832bbb892
+  metadata.gz: 4a16bdc52e1fa03b29f602b163e170d00acddd9858a438dbedff4d60895521f3b9597b5bca920a2bc8b657854772ee79c367b95e2433545c954975ab3fb81f17
+  data.tar.gz: 3a414799220cf1257a5c8c5af278e924a547a54ba17c6c201dfde25dcdf3f91f522ee42326e35ce3b34e00a1b039d2e9604aa400dda1457f1ddcea65d3cd922b

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change Log
 
+### 4.21.2.0
+
+- Support Linux packaging into deb/rpm native executables (not just gems) through standard `glimmer package` call (e.g. `glimmer package[deb]` or `glimmer package[rpm]`)
+- Update `Glimmer::SWT::ImageProxy` implementation of image loading from JAR to use `JRuby.runtime.jruby_class_loader.get_resource_as_stream(file_path).to_io.to_input_stream`
+- Remove scaffolding/packaging building/using of a generated Java `Resource` class
+- Force installing `gem 'psych', '3.3.2'` in scaffolded app as a temporary workaround to `psych` issues with the latest jruby (jruby-9.3.1.0)
+
+### 4.21.1.1
+
+- Fix samples for Windows, espcially Hello, Cool Bar!, Hello, Tool Bar!, and Weather
+- Fix down button for Tetris on Windows/Linux
+- Fix pause menu item for Tetris
+
+### 4.21.1.0
+
+- Upgrade to jruby 9.3.1.0
+- Upgrade to glimmer 2.4.0 (with better observing of array of arrays nested changes)
+- Minor sample fixes for Linux: Tetris (down button now works), Hello, Scale! (now fits horizontally), and Hello, Slider! (now fits horizontally)
+- Adjusted minimum size of Meta-Sample to allow more shrinking (`minimum_size 640, 384`)
+- Do not clean observers when disposing of a widget while closing the last shell  (e.g. when closing an app, it is not needed to clean observers, so it is better to exit faster)
+
+### 4.21.0.1
+
+- Updated default width for `shell` to `190` (was `130` before)
+
 ### 4.21.0.0
 
 - Upgrade to SWT 4.21

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.21.0.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.21.2.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)
@@ -10,12 +10,12 @@
 
 **(The Original Glimmer Library Handling the World’s Ruby GUI Needs Since 2007. Beware of Imitators!)**
 
-[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster JVM version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#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 afterwards. Not only does Glimmer provide a large set of GUI [widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#widgets), but it also supports drawing Canvas Graphics like [Shapes](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl) and [Animations](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](docs/reference/GLIMMER_COMMAND.md#scaffolding) options for [Apps](#in-production), [Gems](docs/reference/GLIMMER_COMMAND.md#custom-shell-gem), and [Custom Widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gems](docs/reference/GLIMMER_COMMAND.md#packaging) on [Linux](https://www.linux.org/). [Glimmer](https://github.com/AndyObtiva/glimmer) was the [first Ruby gem](https://rubygems.org/gems/glimmer) to bring [SWT](https://www.eclipse.org/swt/) (Standard Widget Toolkit) to [Ruby](https://www.ruby-lang.org/en/), thanks to creator [Andy Maleh](https://andymaleh.blogspot.com/), EclipseCon/EclipseWorld/RubyConf speaker.
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster JVM version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#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 afterwards. Not only does Glimmer provide a large set of GUI [widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#widgets), but it also supports drawing Canvas Graphics like [Shapes](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl) and [Animations](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](docs/reference/GLIMMER_COMMAND.md#scaffolding) options for [Apps](#in-production), [Gems](docs/reference/GLIMMER_COMMAND.md#custom-shell-gem), and [Custom Widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and DEB/RPM files on [Linux](https://www.linux.org/). [Glimmer](https://github.com/AndyObtiva/glimmer) was the [first Ruby gem](https://rubygems.org/gems/glimmer) to bring [SWT](https://www.eclipse.org/swt/) (Standard Widget Toolkit) to [Ruby](https://www.ruby-lang.org/en/), thanks to creator [Andy Maleh](https://andymaleh.blogspot.com/), EclipseCon/EclipseWorld/RubyConf speaker.
 
 [<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.21.0.0 includes [SWT 4.21](https://download.eclipse.org/eclipse/downloads/drops4/R-4.21-202109060500/), which was released on September 6, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (please report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.21.2.0 includes [SWT 4.21](https://download.eclipse.org/eclipse/downloads/drops4/R-4.21-202109060500/), which was released on September 6, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (please report any issues you may encounter).
 
 **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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -290,7 +290,7 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- JDK 16 (16.0.2) (find at https://www.oracle.com/java/technologies/downloads/#java16 / On Windows, ensure PATH includes Java bin directory for jpackage to work during packaging Glimmer applications)
+- JDK 16 (16.0.2) (find at https://www.oracle.com/java/technologies/javase/jdk16-archive-downloads.html / Ensure PATH includes Java bin directory for `jpackage` command to work when packaging Glimmer applications)
 - [RVM](http://rvm.io) on Mac & Linux (not available on Windows)
 - JRuby 9.3.0.0 (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.0.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download) [you might have to dual-install JDK8 temporarily as it might be required by jruby installer and then switch JAVA_HOME to JDK16 once done installing and restart command prompt/git bash])
 - SWT 4.21 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem). Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested with Glimmer DSL for SWT yet, so it is considered experimental until declared otherwise.
@@ -322,7 +322,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.21.0.0
+jgem install glimmer-dsl-swt -v 4.21.2.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -350,7 +350,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.21.0.0'
+gem 'glimmer-dsl-swt', '~> 4.21.2.0'
 ```
 
 And, then run:
@@ -371,7 +371,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.21.0.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.21.2.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -535,6 +535,10 @@ If you have a Glimmer app you would like referenced here, please mention in a Pu
 
 [<img alt="Connector Logo" src="https://raw.githubusercontent.com/AndyObtiva/dcr/f31cd45a8503051e899ed8e831fd03654d38e418/package/linux/Draw%20Color%20Repeat.png" height=40 /> Draw Color Repeat](https://github.com/AndyObtiva/dcr): A young boy programming language for Drawing and Coloring with Repetition
 
+### Befunge 98 Programming Language
+
+[Befunge 98 GUI](https://github.com/AndyObtiva/befunge98/tree/gui)
+
 ## Packaging & Distribution
 
 Glimmer simplifies the process of native-executable packaging and distribution on Mac and Windows via a single command:
@@ -672,7 +676,8 @@ You may apply for contributing to any of these Glimmer DSL gems whether you pref
 ## Contributors
 
 * [Andy Maleh](https://github.com/AndyObtiva) (Founder)
-* [Dennis Theisen](https://github.com/Soleone) (Contributor, originally in [Glimmer](https://github.com/AndyObtiva/glimmer/graphs/contributors) before splitting glimmer-dsl-swt)
+* [Dennis Theisen](https://github.com/Soleone) (Contributor, originally in [Glimmer](https://github.com/AndyObtiva/glimmer/graphs/contributors) before splitting [glimmer-dsl-swt](https://rubygems.org/gems/glimmer))
+* [Wayne Vucenic](https://github.com/rubycoder)
 
 [Click here to view contributor commits.](https://github.com/AndyObtiva/glimmer-dsl-swt/graphs/contributors)
 

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.3.0.0
+jruby-9.3.1.0

data/VERSION

@@ -1 +1 @@
-4.21.0.0
+4.21.2.0

data/docs/reference/GLIMMER_COMMAND.md

@@ -213,7 +213,7 @@ In order to run the app after making changes, you must run the `glimmer run`. It
 glimmer run
 ```
 
-Alternatively, to mantually run the app, you may type:
+Alternatively, to manually run the app, you may type:
 
 ```
 glimmer run[bin/greeter]

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1270,6 +1270,17 @@ It is a graphics `Image` object (not a widget), but is used used in setting the
 
 Glimmer recently included **EXPERIMENTAL** gif animation support for the `background_image` property on `composite' since SWT does not support animation by default. On Windows, it only works inside composites nested under standard shells, not ones that have the SWT styles :on_top or :no_trim
 
+When an app is packaged (i.e. JAR inside a DMG or MSI native executable), jruby generates file paths that start with "uri:classloader". The `image` keyword automatically knows how to interpret such paths when passed as an argument.
+
+Should you need to read a file from a JAR file manually, you may use this code (assuming a `file_path` formed using standard Ruby `File.expand_path` call, which jruby automatically overrides when running from a JAR to generate a `uri:classloader` path) :
+```ruby
+require 'jruby'
+file_path = file_path.sub(/^uri\:classloader\:/, '').sub(/^\/+/, '')
+jcl = JRuby.runtime.jruby_class_loader
+resource = jcl.get_resource_as_stream(file_path)
+file_input_stream = resource.to_io.to_input_stream
+```
+
 Learn more about images in general at this SWT Image guide: https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html
 
 #### Image Options
@@ -2383,8 +2394,6 @@ Example from [samples/hello/hello_combo.rb](samples/hello_combo.rb) sample (you
 
 #### Shine
 
-**(BETA FEATURE)**
-
 The new Shine syntax for View/Model Attribute Mapping allows data-binding visually with simple arrow operators in Ruby.
 
 Use `<=> [model, attribute, options]` for bidirectional (two-way) data-binding instead of `bind(model, attribute, options)`.
@@ -3872,7 +3881,7 @@ class Example
         text 'Application Menu Items'
         font height: 30
       }
-    }    
+    }
   }
 end
 

data/docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md

@@ -1,16 +1,12 @@
 ## Glimmer Packaging and Distribution
 
-Note: this section mostly applies to Mac and Windows. On Linux, you can just run `glimmer package:gem` and after installing the gem, you get an executable matching the name of the app/custom-shell-gem you are building (e.g. `calculator` command becomes available after installing the [glimmer-cs-calculator](https://github.com/AndyObtiva/glimmer-cs-calculator) gem). On Windows, ensure system PATH includes Java bin directory `"C:\Program Files\Java\jdk-16.0.2\bin"` at the top for `jpackage` command to work during packaging Glimmer applications.
-
-Note 2: Glimmer packaging has a strong dependency on JDK16 since it includes the packaging tool `jpackage`.
-
-Glimmer simplifies the process of native-executable packaging and distribution on Mac and Windows via a single `glimmer package` command:
+Glimmer simplifies the process of native-executable packaging and distribution on Mac, Windows, and Linux via a single `glimmer package` command:
 
 ```
 glimmer package
 ```
 
-It works out of the box for any application scaffolded by [Glimmer Scaffolding](#scaffolding), generating default packaging type on the current platform if not specified (i.e. `app-image`) and displaying a message indicating what pre-requisite setup tools are needed if not installed already (e.g. [Wix Toolset](https://wixtoolset.org/) to generate MSI files on Windows). If you install Wix, make sure it is on the system PATH by adding for example "C:\Program Files (x86)\WiX Toolset v3.11\bin" to the Windows Environment Variables.
+It works out of the box for any application scaffolded by [Glimmer Scaffolding](#scaffolding), generating default packaging type on the current platform if not specified (i.e. `app-image`) and displaying a message indicating what pre-requisite setup tools are needed if not installed already (e.g. [Wix Toolset](https://wixtoolset.org/) to generate MSI files on Windows. If you install Wix, make sure it is on the system PATH by adding for example "C:\Program Files (x86)\WiX Toolset v3.11\bin" to the Windows Environment Variables.).
 
 You may choose to generate a specific type of packaging instead by addionally passing in the `[type]` option. For example, this generates an MSI setup file on Windows:
 
@@ -18,7 +14,7 @@ You may choose to generate a specific type of packaging instead by addionally pa
 glimmer package[msi]
 ```
 
-This generates a DMG file on the Mac:
+This command generates a DMG file on the Mac:
 
 ```
 glimmer package[dmg]
@@ -30,11 +26,23 @@ Make sure to surround with double-quotes when running from ZShell (zsh):
 glimmer "package[dmg]"
 ```
 
+This command generates a DEB file on a Linux that supports deb packages (e.g. Linux Mint Cinnamon):
+
+```
+glimmer package[deb]
+```
+
 - Available Mac packaging types are `dmg`, `pkg`, and `app-image` (image means a pure Mac `app` without a setup program). Keep in mind that the packages you produce are compatible with the same MacOS you are on or older.
 - Available Windows packaging types are `msi`, `exe`, and `app-image` (image means a Windows application directory without a setup program). Learn more about Windows packaging are [over here](#windows-application-packaging).
-- Available Linux packaging types are `deb`, `rpm`, and `app-image` (Note: Linux native packaging has not been tested successfully, which is why `glimmer package:gem` is recommended on Linux instead. If you get it working, please contribute to this doc file with a Pull Request).
+- Available Linux packaging types are `deb`, `rpm`, and `app-image` (note the prerequisites: for Red Hat Linux, the `rpm-build` package is required (for rpm) and for Ubuntu Linux, the `fakeroot` package is required (for deb). Also, use common sense to know which package type to generate on what Linux [e.g. use `deb` on `Linux Mint Cinnamon` or use `rpm` on `Fedora Linux`]).
+
+Note 1: On Windows, ensure system environment PATH includes Java bin directory `"C:\Program Files\Java\jdk-16.0.2\bin"` at the top for `jpackage` command to work during packaging Glimmer applications (the default Oracle setup path for Java after installing the JDK is usually not sufficient).
+
+Note 2: Glimmer packaging has a strong dependency on JDK16 since it includes the packaging tool `jpackage`. On the Mac, it seems there is a new gotcha in the latest JDK 16 DMG/PKG installable that is resulting in `jpackage` to be missing from `PATH`. To include, you might need to add `export PATH="/Library/Java/JavaVirtualMachines/jdk-16.0.2.jdk/Contents/Home/bin:$PATH"` to `~/.zprofile` or `~/.bashrc`
 
-Note: if you are using Glimmer manually, to make the `glimmer package` command available, you must add the following line to your application `Rakefile` (automatically done for you if you scaffold an app or gem with `glimmer scaffold[AppName]` or `glimmer scaffold:gem:customshell[GemName]`):
+Note 3: On Linux, note the prerequisites: for Red Hat Linux, the `rpm-build` package is required (for rpm) and for Ubuntu Linux, the `fakeroot` package is required (for deb). Also, use common sense to know which package type to generate on what Linux (e.g. use `deb` on `Linux Mint Cinnamon` or use `rpm` on `Fedora Linux`)
+
+Note 4: if you are using Glimmer packaging with a manually generated app (without scaffolding), in order to make the `glimmer package` command available, you must add the following line to your application `Rakefile` (automatically done for you if you scaffold an app or gem with `glimmer scaffold[AppName]` or `glimmer scaffold:gem:customshell[GemName]`):
 
 ```ruby
 require 'glimmer/rake_task'
@@ -45,7 +53,7 @@ The Glimmer packaging process done in the `glimmer package` command consists of
 1. Lock JAR versions (`glimmer package:lock_jars`): This locks versions of JAR dependencies leveraged by the `jar-dependencies` JRuby gem, downloading them into the `./vendor` directory so they would get inside the top-level Glimmer app/gem JAR file.
 1. Generate [Warbler](https://github.com/jruby/warbler) config (`glimmer package:config`): Generates initial Warbler config file (under `./config/warble.rb`) to use for generating JAR file.
 1. Generate JAR file using [Warbler](https://github.com/jruby/warbler) (`glimmer package:jar`): Enables bundling a Glimmer app into a JAR file under the `./dist` directory
-1. Generate native executable using [jpackage](https://docs.oracle.com/en/java/javase/14/jpackage/packaging-tool-user-guide.pdf) (`glimmer package:native`): Enables packaging a JAR file as a DMG/PKG/APP file on Mac, MSI/EXE/APP on Windows, and DEB/RPM/APP on Linux (Glimmer does not officially support Linux with the `glimmer package` command yet, but it generates the JAR file successfully, and you could use `jpackage` manually afterwards if needed).
+1. Generate native executable using [jpackage](https://docs.oracle.com/en/java/javase/16/jpackage/packaging-tool-user-guide.pdf) (`glimmer package:native`): Enables packaging a JAR file as a DMG/PKG/APP file on Mac, MSI/EXE/APP on Windows, and DEB/RPM/APP on Linux (Glimmer does not officially support Linux with the `glimmer package` command yet, but it generates the JAR file successfully, and you could use `jpackage` manually afterwards if needed).
 
 Those steps automatically ensure generating a JAR file under the `./dist` directory using [Warbler](https://github.com/jruby/warbler), which is then used to automatically generate a DMG/MSI file (and other executables) under the `./packages/bundles` directory using `jpackage`.
 The JAR file name will match your application local directory name (e.g. `MathBowling.jar` for `~/code/MathBowling`)
@@ -88,7 +96,7 @@ require_relative '../app/my_application.rb'
 
 In order to explicitly configure jpackage, Mac package attributes, or sign your Mac app to distribute on the App Store, you can follow more advanced instructions for `jpackage` here:
 - Run `jpackage --help` for more info
-- https://docs.oracle.com/en/java/javase/14/jpackage/packaging-tool-user-guide.pdf
+- https://docs.oracle.com/en/java/javase/16/jpackage/packaging-tool-user-guide.pdf
 - https://developer.apple.com/library/archive/releasenotes/General/SubmittingToMacAppStore/index.html#//apple_ref/doc/uid/TP40010572-CH16-SW8
 
 The Glimmer rake task allows passing extra options to jpackage via:
@@ -117,17 +125,17 @@ Pass `-v` to jpackage in `Glimmer::RakeTask::Package.jpackage_extra_args` or by
 
 ### Windows Application Packaging
 
-Windows s two options for setup packaging:
+Windows offers two options for packaging:
 - `msi` (recommended): simpler packaging option. Requires [WiX Toolset](https://wixtoolset.org/) and [.NET Framework](https://dotnet.microsoft.com/download/dotnet-framework). Simply run `glimmer package[msi]` (or `glimmer package:native[msi]` if it's not your first time) and it will give you more details on the pre-requisites you need to install (e.g. [WiX Toolset](https://wixtoolset.org/) and [.NET Framework 3.5 SP1](https://dotnet.microsoft.com/download/dotnet-framework/net35-sp1)).
 - `exe`: more advanced packaging option. Requires [Inno Setup](https://jrsoftware.org/isinfo.php). Simply run `glimmer package[exe]` (or `glimmer package:native[exe]` if it's not your first time) and it will tell you what you need to install.
 
-If you just want to test out packaging into a native Windows app that is not packaged for Windows setup, just pass `image` to generate a native Windows app only.
+If you just want to test out packaging into a native Windows app that is not packaged for Windows setup, just pass `app-image` (default) to generate a native Windows app only.
 
 ### Mac Application Distribution
 
 Recent macOS versions (starting with Catalina) have very stringent security requirements requiring all applications to be signed before running (unless the user goes to System Preferences -> Privacy -> General tab and clicks "Open Anyway" after failing to open application the first time they run it). So, to release a desktop application on the Mac, it is recommended to enroll in the [Apple Developer Program](https://developer.apple.com/programs/) to distribute on the [Mac App Store](https://developer.apple.com/distribute/) or otherwise request [app notarization from Apple](https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution) to distribute independently.
 
-Afterwards, you may add signing arguments to `jpackage` via `Glimmer::RakeTask::Package.jpackage_extra_args` or `JPACKAGE_EXTRA_ARGS` according to this webpage: https://docs.oracle.com/en/java/javase/14/jpackage/packaging-tool-user-guide.pdf
+Afterwards, you may add signing arguments to `jpackage` via `Glimmer::RakeTask::Package.jpackage_extra_args` or `JPACKAGE_EXTRA_ARGS` according to this webpage: https://docs.oracle.com/en/java/javase/16/jpackage/packaging-tool-user-guide.pdf
 
 ```
   --mac-package-signing-prefix <prefix string>
@@ -180,6 +188,12 @@ org.apache.maven.InternalErrorException: Internal error: org.jruby.exceptions.Ra
 Caused by: org.jruby.exceptions.RaiseException: (LoadError) library `java' could not be loaded: java.lang.reflect.InaccessibleObjectException: Unable to make protected native java.lang.Object java.lang.Object.clone() throws java.lang.CloneNotSupportedException accessible: module java.base does not "opens java.lang" to unnamed module @138caeca
 [ERROR]
 [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
+```
+
+3. jpackage missing from PATH on the Mac
+
+On the Mac, the latest JDK 16 installable DMG/PKG is resulting in `jpackage` to be missing from `PATH`. To include, you might need to add `export PATH="/Library/Java/JavaVirtualMachines/jdk-16.0.2.jdk/Contents/Home/bin:$PATH"` to `~/.zprofile` or `~/.bashrc`
+```
 [ERROR] Re-run Maven using the -X switch to enable full debug logging.
 [ERROR]
 [ERROR] For more information about the errors and possible solutions, please read the following articles:
@@ -188,7 +202,7 @@ Caused by: org.jruby.exceptions.RaiseException: (LoadError) library `java' could
 
 Please ignore. It should be harmless. If you get blocked by it for any reason, please open an Issue about it.
 
-3. Java on Windows System PATH
+4. Java on Windows System PATH
 
 If you get any errors running Java on Windows, keep in mind that you need to have the Java binaries "C:\Program Files\Java\jdk-16.0.2\bin" on the Windows System PATH environment variable.
 
@@ -198,3 +212,21 @@ The problem is Oracle seems to be adding an indirect Java path junction in later
 Simply replace it with the simple path mentioned above (`"C:\Program Files\Java\jdk-16.0.2\bin"` matching your correct version number)
 
 Lastly, reinstall JRuby to ensure it is using Java from the right path.
+
+5. File paths in app running from packaged JAR file
+
+Glimmer packaged apps always reside within a JAR file before being wrapped by a native executable.
+
+JRuby automatically converts any paths produced by File.expand_path inside packaged JAR file into uri:classloader prefixed paths. They work just fine when performing File.read, but if you need to access as a Java input stream, you need to use special code:
+
+```ruby
+require 'jruby'
+file_path = File.expand_path(some_path, __dir__)
+file_path = file_path.sub(/^uri\:classloader\:/, '').sub(/^\/+/, '')
+jcl = JRuby.runtime.jruby_class_loader
+resource = jcl.get_resource_as_stream(file_path)
+file_input_stream = resource.to_io.to_input_stream
+``` 
+
+The `image` keyword in Glimmer automatically does that work when passing an image path produced from inside a JAR file.
+

data/lib/glimmer/data_binding/widget_binding.rb

@@ -40,7 +40,7 @@ module Glimmer
         SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @sync_exec, override_async_exec: @async_exec) do
           if @widget.respond_to?(:on_widget_disposed)
             @widget.on_widget_disposed do |dispose_event|
-              unregister_all_observables
+              deregister_all_observables unless @widget.shell_proxy.last_shell_closing?
             end
           end
         end
@@ -49,7 +49,7 @@ module Glimmer
       def call(value)
         SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @sync_exec, override_async_exec: @async_exec) do
           if @widget.respond_to?(:disposed?) && @widget.disposed?
-            unregister_all_observables
+            deregister_all_observables
             return
           end
           # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
@@ -61,7 +61,7 @@ module Glimmer
       
       def evaluate_property
         if @widget.respond_to?(:disposed?) && @widget.disposed?
-          unregister_all_observables
+          deregister_all_observables
           return
         end
         @widget.get_attribute(@property)

data/lib/glimmer/rake_task/package.rb

@@ -112,7 +112,7 @@ module Glimmer
             FileUtils.mkdir_p('packages/bundles')
             command = "jpackage"
             command += " --type #{native_type}"
-            command += " --dest 'packages/bundles' --input 'dist' --main-class JarMain --main-jar '#{project_name}.jar' --java-options '-Dproject_name=#{project_name}' --name '#{human_name}' --vendor '#{human_name}' --icon '#{icon}' "
+            command += " --dest 'packages/bundles' --input 'dist' --main-class JarMain --main-jar '#{project_name}.jar' --name '#{human_name}' --vendor '#{human_name}' --icon '#{icon}' "
             command += " --win-per-user-install --win-dir-chooser --win-menu --win-menu-group '#{human_name}' " if OS.windows? && native_type != 'app-image'
             command += " --linux-menu-group '#{human_name}' " if OS.linux? && native_type != 'app-image'
             command += " --java-options '-XstartOnFirstThread' --mac-package-name '#{human_name}' --mac-package-identifier 'org.#{project_name}.application.#{project_name}' " if OS.mac?

data/lib/glimmer/rake_task/scaffold.rb

@@ -116,10 +116,12 @@ module Glimmer
         GEMFILE_APP_MIDFIX = <<~MULTI_LINE_STRING
         
           gem 'glimmer-dsl-swt', '~> #{VERSION}'
+          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16 was causing issues
         MULTI_LINE_STRING
         GEMFILE_GEM_MIDFIX = <<~MULTI_LINE_STRING
         
           gem 'glimmer-dsl-swt', '~> #{VERSION.split('.')[0...2].join('.')}'
+          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16 was causing issues
         MULTI_LINE_STRING
         GEMFILE_SUFFIX = <<~MULTI_LINE_STRING
         
@@ -182,11 +184,6 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
-          write "Resource.java", resource_java_file(app_name)
-          cd '..'
-          system "javac #{file_name(app_name)}/Resource.java"
-          cd gem_name
-        
           mkdir_p "app/#{file_name(app_name)}"
           write "app/#{file_name(app_name)}/launch.rb", app_launch_file(app_name)
           mkdir_p 'bin'
@@ -298,11 +295,6 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
-          write "Resource.java", resource_java_file(custom_shell_name)
-          cd '..'
-          system "javac #{file_name(custom_shell_name)}/Resource.java"
-          cd gem_name
-          
           if OS.windows?
             system "glimmer package" # TODO handle windows properly with batch file
             system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
@@ -496,16 +488,6 @@ module Glimmer
           MULTI_LINE_STRING
         end
         
-        def resource_java_file(app_name)
-          <<~MULTI_LINE_STRING
-            package #{file_name(app_name)};
-            
-            /** The soul purpose of this class is to retrieve icons for uri:classloader paths used from JAR */
-            class Resource {
-            }
-          MULTI_LINE_STRING
-        end
-    
         def app_bin_command_file(app_name_or_gem_name, custom_shell_name=nil, namespace=nil)
           if custom_shell_name.nil?
             runner = "File.expand_path('../../app/#{file_name(app_name_or_gem_name)}/launch.rb', __FILE__)"
@@ -545,7 +527,7 @@ module Glimmer
           lines.insert(require_rake_line_index, "require 'glimmer/launcher'")
           gem_files_line_index = lines.index(lines.detect {|l| l.include?('# dependencies defined in Gemfile') })
           if custom_shell_name
-            lines.insert(gem_files_line_index, "  gem.files = Dir['Resource.class', 'VERSION', 'LICENSE.txt', 'app/**/*', 'bin/**/*', 'config/**/*', 'db/**/*', 'docs/**/*', 'fonts/**/*', 'icons/**/*', 'images/**/*', 'lib/**/*', 'script/**/*', 'sounds/**/*', 'vendor/**/*', 'videos/**/*']")
+            lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'app/**/*', 'bin/**/*', 'config/**/*', 'db/**/*', 'docs/**/*', 'fonts/**/*', 'icons/**/*', 'images/**/*', 'lib/**/*', 'script/**/*', 'sounds/**/*', 'vendor/**/*', 'videos/**/*']")
             # the second executable is needed for warbler as it matches the gem name, which is the default expected file (alternatively in the future, we could do away with it and configure warbler to use the other file)
             lines.insert(gem_files_line_index+1, "  gem.require_paths = ['vendor', 'lib', 'app']")
             lines.insert(gem_files_line_index+2, "  gem.executables = ['#{file_name(custom_shell_name)}']") if custom_shell_name
@@ -561,7 +543,7 @@ module Glimmer
               Glimmer::RakeTask::Package.jpackage_extra_args =
                 " --name '#{human_name(custom_shell_name)}'" +
                 " --description '#{human_name(custom_shell_name)}'"
-                # You can add more options from https://docs.oracle.com/en/java/javase/14/jpackage/packaging-tool-user-guide.pdf
+                # You can add more options from https://docs.oracle.com/en/java/javase/16/jpackage/packaging-tool-user-guide.pdf
             MULTI_LINE_STRING
           end
           file_content

data/lib/glimmer/rake_task.rb

@@ -111,11 +111,7 @@ namespace :glimmer do
     Rake::Task['glimmer:package:lock_jars'].execute
     Rake::Task['glimmer:package:config'].execute
     Rake::Task['glimmer:package:jar'].execute
-    if OS.linux?
-      Rake::Task['glimmer:package:gem'].execute
-    else
-      Rake::Task['glimmer:package:native'].execute(args)
-    end
+    Rake::Task['glimmer:package:native'].execute(args)
   end
 
   desc 'Scaffold Glimmer application directory structure to build a new app'

data/lib/glimmer/swt/image_proxy.rb

@@ -122,9 +122,11 @@ module Glimmer
       def input_stream
         if @file_path.start_with?('uri:classloader')
           @jar_file_path = @file_path
-          file_path = @jar_file_path.sub(/^uri\:classloader\:/, '').sub('//', '') # the latter sub is needed for Mac
-          project_name = java.lang.System.getProperty('project_name')
-          file_input_stream = java_import("#{project_name}.Resource").last.java_class.resource_as_stream(file_path)
+          file_path = @jar_file_path.sub(/^uri\:classloader\:/, '').sub(/^\/+/, '')
+          require 'jruby'
+          jcl = JRuby.runtime.jruby_class_loader
+          resource = jcl.get_resource_as_stream(file_path)
+          file_input_stream = resource.to_io.to_input_stream
         else
           file_input_stream = java.io.FileInputStream.new(@file_path)
         end

data/lib/glimmer/swt/shell_proxy.rb

@@ -32,10 +32,11 @@ module Glimmer
       include_package 'org.eclipse.swt.widgets'
       include_package 'org.eclipse.swt.layout'
 
-      WIDTH_MIN = 130
+      WIDTH_MIN = 190
       HEIGHT_MIN = 0
 
-      attr_reader :opened_before
+      attr_reader :opened_before, :last_shell_closing
+      alias last_shell_closing? last_shell_closing
       alias opened_before? opened_before
 
       # Instantiates ShellProxy with same arguments expected by SWT Shell
@@ -85,9 +86,10 @@ module Glimmer
               end
             end
           end
-          on_widget_disposed {
+          on_widget_disposed do
+            @last_shell_closing = true if @display.shells.count == 1 && @display.shells.first == @swt_widget
             clear_shapes
-          }
+          end
           @display ||= @swt_widget.getDisplay
         end
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -198,6 +198,10 @@ module Glimmer
         @finished_add_content = true
       end
       
+      def shell_proxy
+        @swt_widget.shell.get_data('proxy')
+      end
+      
       def extract_args(underscored_widget_name, args)
         @arg_extractor_mapping ||= {
           'menu_item' => lambda do |args|

data/samples/elaborate/battleship/view/grid.rb

@@ -45,21 +45,21 @@ class Battleship
             }
             
             text player.to_s.capitalize
-            font height: 20, style: :bold
+            font height: OS.windows? ? 18 : 20, style: :bold
           }
           
           label # filler
           Model::Grid::WIDTH.times do |column_index|
             label {
               text (column_index + 1).to_s
-              font height: 16
+              font height: OS.windows? ? 14 : 16
             }
           end
           
           Model::Grid::HEIGHT.times do |row_index|
             label {
               text Model::Grid::ROW_ALPHABETS[row_index]
-              font height: 16
+              font height: OS.windows? ? 14 : 16
             }
             Model::Grid::WIDTH.times do |column_index|
               cell(game: game, player: player, row_index: row_index, column_index: column_index) {

data/samples/elaborate/battleship/view/ship.rb

@@ -38,7 +38,7 @@ class Battleship
       
           label {
             text ship_name.to_s.titlecase
-            font height: 16
+            font height: OS.windows? ? 14 : 16
           }
         
           composite {

data/samples/elaborate/meta_sample.rb

@@ -23,8 +23,6 @@ require 'glimmer-dsl-swt'
 require 'fileutils'
 
 class Sample
-  include Glimmer::DataBinding::ObservableModel
-  
   class << self
     def glimmer_directory
       File.expand_path('../../..', __FILE__)
@@ -42,6 +40,10 @@ class Sample
       end
     end
   end
+  
+  include Glimmer::DataBinding::ObservableModel
+  
+  UNEDITABLE = ['meta_sample.rb'] + (OS.windows? ? ['calculator.rb', 'weather.rb'] : [])  # Windows StyledText does not support unicode characters found in certain samples
 
   attr_accessor :sample_directory, :file, :selected
   
@@ -74,9 +76,13 @@ class Sample
   end
   
   def editable
+    !UNEDITABLE.include?(File.basename(file))
+  end
+  alias editable? editable
+  
+  def launchable
     File.basename(file) != 'meta_sample.rb'
   end
-  alias launchable editable
     
   def file_relative_path
     file.sub(self.class.glimmer_directory, '')
@@ -97,6 +103,7 @@ class Sample
   def launch(modified_code)
     launch_file = user_file
     begin
+      raise 'Unsupported through editor!' unless editable?
       FileUtils.cp_r(file, user_file_parent_directory)
       FileUtils.cp_r(directory, user_file_parent_directory) if File.exist?(directory)
       File.write(user_file, modified_code)
@@ -202,12 +209,12 @@ class MetaSampleApplication
   
   body {
     shell(:fill_screen) {
-      minimum_size 1280, 768
+      minimum_size 640, 384
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       image File.expand_path('../../icons/scaffold_app.png', __dir__)
       
       sash_form {
-        weights 4, 14
+        weights 1, 2
       
         composite {
           grid_layout(1, false) {

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

@@ -45,8 +45,8 @@ class Tetris
             menu_item(:check) {
               text '&Pause'
               accelerator COMMAND_KEY, :p
-              enabled <= [game, :game_over, on_read: ->(value) { value && !game.show_high_scores }]
-              enabled <= [game, :show_high_scores, on_read: ->(value) { value && !game.game_over }]
+              enabled <= [game, :game_over, on_read: ->(value) { !value && !game.show_high_scores }]
+              enabled <= [game, :show_high_scores, on_read: ->(value) { !value && !game.game_over }]
               selection <=> [game, :paused]
             }
             menu_item {

data/samples/elaborate/tetris.rb

@@ -57,7 +57,17 @@ class Tetris
       on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
-          game.down! if OS.mac?
+          if OS.mac?
+            game.down!
+          else
+            # rate limit downs in Windows/Linux as they go too fast when key is held
+            @queued_downs ||= 0
+            @queued_downs += 1
+            async_exec do
+              game.down! if @queued_downs < 3
+              @queued_downs -= 1
+            end
+          end
         when swt(:arrow_up)
           case game.up_arrow_action
           when :instant_down
@@ -80,16 +90,6 @@ class Tetris
         end
       }
 
-      # invoke game.down! on keyup with Windows/Linux since they seem to group-render similar events, preventing intermediate renders (causing invisiblity while holding keys)
-      if !OS.mac?
-        on_swt_keyup { |key_event|
-          case key_event.keyCode
-          when swt(:arrow_down), 's'.bytes.first
-            game.down!
-          end
-        }
-      end
-      
       # if running in app mode, set the Mac app about dialog (ignored in platforms)
       on_about {
         show_about_dialog
@@ -170,9 +170,7 @@ class Tetris
           sleep @game.delay
           break if @game.game_over? || body_root.disposed?
           # ensure entire game tetromino down movement happens as one GUI update event with sync_exec (to avoid flicker/stutter)
-          sync_exec {
-            @game.down! unless @game.paused?
-          }
+          sync_exec { @game.down! unless @game.paused? }
         end
       end
     end

data/samples/elaborate/tic_tac_toe.rb

@@ -41,18 +41,21 @@ class TicTacToe
     shell {
       text "Tic-Tac-Toe"
       minimum_size 176, 200
+
       composite {
         grid_layout 3, true
+
         (1..3).each { |row|
           (1..3).each { |column|
             button {
               layout_data :fill, :fill, true, true
               text        <= [@tic_tac_toe_board[row, column], :sign]
               enabled     <= [@tic_tac_toe_board[row, column], :empty]
-              font        style: :bold, height: 20
-              on_widget_selected {
+              font        style: :bold, height: (OS.windows? ? 18 : 20)
+
+              on_widget_selected do
                 @tic_tac_toe_board.mark(row, column)
-              }
+              end
             }
           }
         }

data/samples/elaborate/timer.rb

@@ -67,7 +67,6 @@ class Timer
       
       # Replace example content below with custom shell content
       minimum_size (OS.windows? ? 214 : 200), 114
-      image File.join(APP_ROOT, 'package', 'windows', "Timer.ico") if OS.windows?
       text "Glimmer Timer"
 
       timer_menu_bar

data/samples/elaborate/weather.rb

@@ -102,6 +102,7 @@ class Weather
       layout_data(:fill, :center, true, false)
       text <= [self, field_name, on_read: ->(t) { "#{kelvin_to_temp_unit(t, temp_unit).to_f.round}°" }]
       font height: DEFAULT_FONT_HEIGHT
+      background DEFAULT_BACKGROUND
       foreground DEFAULT_FOREGROUND
     }
   end
@@ -112,6 +113,7 @@ class Weather
       layout_data(:fill, :center, true, false)
       text <= [self, 'humidity', on_read: ->(h) { "#{h.to_f.round}%" }]
       font height: DEFAULT_FONT_HEIGHT
+      background DEFAULT_BACKGROUND
       foreground DEFAULT_FOREGROUND
     }
   end
@@ -121,6 +123,7 @@ class Weather
       layout_data :fill, :center, false, false
       text field_name.titlecase
       font height: DEFAULT_FONT_HEIGHT
+      background DEFAULT_BACKGROUND
       foreground DEFAULT_FOREGROUND
     }
   end

data/samples/hello/hello_canvas.rb

@@ -65,7 +65,7 @@ class HelloCanvas
               y :default, 1 # add 1 pixel to default y (shape centered within parent vertically)
               background :yellow
               foreground :dark_magenta
-              font name: 'Courier', height: 30
+              font name: 'Courier', height: (OS.windows? ? 26 : 30)
             }
           }
           rectangle(155, 30) { # width and height are assumed to be the default (calculated from children)

data/samples/hello/hello_canvas_transform.rb

@@ -6,7 +6,7 @@ glimmer_logo = File.expand_path('../../icons/scaffold_app.png', __dir__)
 
 shell {
   text 'Hello, Canvas Transform!'
-  minimum_size 330, 352
+  minimum_size (OS.windows? ? 347 : 330), (OS.windows? ? 372 : 352)
   
   canvas {
     background :white

data/samples/hello/hello_cool_bar.rb

@@ -40,27 +40,28 @@ class HelloCoolBar
         margin_width 0
         margin_height 0
       }
-      
+
       text 'Hello, Cool Bar!'
+      minimum_size 280, 50
       
       cool_bar { # optionally takes a :flat style and/or :vertical style if you need vertical layout
         tool_bar {
           tool_item {
-            image cut_image # alternatively you can pass an image file path
+            image File.expand_path('./images/cut.png', __dir__), height: 16
             
             on_widget_selected do
               self.operation = 'Cut'
             end
           }
           tool_item {
-            image copy_image # alternatively you can pass an image file path
+            image File.expand_path('./images/copy.png', __dir__), height: 16
             
             on_widget_selected do
               self.operation = 'Copy'
             end
           }
           tool_item {
-            image paste_image # alternatively you can pass an image file path
+            image File.expand_path('./images/paste.png', __dir__), height: 16
             
             on_widget_selected do
               self.operation = 'Paste'
@@ -86,62 +87,6 @@ class HelloCoolBar
       }
     }
   }
-  
-  def cut_image
-    # building image on the fly with Canvas Shape DSL
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        line(20, 2, 9, 15) {
-          line_width 2
-        }
-        line(5, 2, 16, 15) {
-          line_width 2
-        }
-        oval(2, 15, 8, 8) {
-          line_width 2
-        }
-        oval(16, 15, 8, 8) {
-          line_width 2
-        }
-      }
-    }
-  end
-  
-  def copy_image
-    # building image on the fly with Canvas Shape DSL
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        rectangle([:default, 2], [:default, -2], 14, 14, 5, 5) {
-          line_width 2
-        }
-        rectangle([:default, -2], [:default, 2], 14, 14, 5, 5) {
-          line_width 2
-        }
-      }
-    }
-  end
-  
-  def paste_image
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        rectangle(:default, [:default, 1], 15, 20, 5, 5) {
-          line_width 2
-        }
-        line(7, 8, 18, 8) {
-          line_width 2
-        }
-        line(7, 13, 18, 13) {
-          line_width 2
-        }
-        line(7, 18, 18, 18) {
-          line_width 2
-        }
-      }
-    }
-  end
 end
 
 HelloCoolBar.launch

data/samples/hello/hello_scale.rb

@@ -32,10 +32,7 @@ class HelloScale
   
   body {
     shell {
-      row_layout(:vertical) {
-        fill true
-        center true
-      }
+      fill_layout :vertical
       
       text 'Hello, Scale!'
       

data/samples/hello/hello_slider.rb

@@ -32,10 +32,7 @@ class HelloSlider
   
   body {
     shell {
-      row_layout(:vertical) {
-        fill true
-        center true
-      }
+      fill_layout :vertical
       
       text 'Hello, Slider!'
       

data/samples/hello/hello_tool_bar.rb

@@ -42,33 +42,31 @@ class HelloToolBar
       }
       
       text 'Hello, Tool Bar!'
+      minimum_size 280, 50
       
       tool_bar { # optionally takes a :flat style, :wrap style if you need wrapping upon shrinking window, and :vertical style if you need vertical layout
         tool_item {
-          image cut_image # alternatively you can pass an image file path
+          image File.expand_path('./images/cut.png', __dir__), height: 16
           
           on_widget_selected do
             self.operation = 'Cut'
           end
         }
         tool_item {
-          image copy_image # alternatively you can pass an image file path
+          image File.expand_path('./images/copy.png', __dir__), height: 16
           
           on_widget_selected do
             self.operation = 'Copy'
           end
         }
         tool_item {
-          image paste_image # alternatively you can pass an image file path
+          image File.expand_path('./images/paste.png', __dir__), height: 16
           
           on_widget_selected do
             self.operation = 'Paste'
           end
         }
         tool_item(:separator)
-        tool_item {
-          text 'Font Size'
-        }
         # a combo can be nested in a tool_bar (it auto-generates a tool_item for itself behind the scenes)
         combo {
           selection <=> [self, :font_size]
@@ -84,59 +82,15 @@ class HelloToolBar
   }
   
   def cut_image
-    # building image on the fly with Canvas Shape DSL
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        line(20, 2, 9, 15) {
-          line_width 2
-        }
-        line(5, 2, 16, 15) {
-          line_width 2
-        }
-        oval(2, 15, 8, 8) {
-          line_width 2
-        }
-        oval(16, 15, 8, 8) {
-          line_width 2
-        }
-      }
-    }
+    File.expand_path('./images/cut.png', __dir__)
   end
   
   def copy_image
-    # building image on the fly with Canvas Shape DSL
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        rectangle([:default, 2], [:default, -2], 14, 14, 5, 5) {
-          line_width 2
-        }
-        rectangle([:default, -2], [:default, 2], 14, 14, 5, 5) {
-          line_width 2
-        }
-      }
-    }
+    File.expand_path('./images/copy.png', __dir__)
   end
   
   def paste_image
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        rectangle(:default, [:default, 1], 15, 20, 5, 5) {
-          line_width 2
-        }
-        line(7, 8, 18, 8) {
-          line_width 2
-        }
-        line(7, 13, 18, 13) {
-          line_width 2
-        }
-        line(7, 18, 18, 18) {
-          line_width 2
-        }
-      }
-    }
+    File.expand_path('./images/paste.png', __dir__)
   end
 end
 

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.21.0.0
+  version: 4.21.2.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.4.0
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -376,10 +376,9 @@ description: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a
   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, MSI/EXE files on Windows, and Gem Packaged Shell Scripts
-  on Linux. Glimmer was the first Ruby gem to bring SWT (Standard Widget Toolkit)
-  to Ruby, thanks to creator Andy Maleh, EclipseCon/EclipseWorld/RubyConf speaker
-  and expert.
+  DMG/PKG/APP files on the Mac, MSI/EXE files on Windows, and DEB/RPM files on Linux.
+  Glimmer was the first Ruby gem to bring SWT (Standard Widget Toolkit) to Ruby, thanks
+  to creator Andy Maleh, EclipseCon/EclipseWorld/RubyConf speaker.
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -682,6 +681,8 @@ files:
 - samples/hello/hello_tray_item.rb
 - samples/hello/hello_tree.rb
 - samples/hello/hello_world.rb
+- samples/hello/images/copy.png
+- samples/hello/images/cut.png
 - samples/hello/images/denmark.png
 - samples/hello/images/finland.png
 - samples/hello/images/france.png
@@ -690,6 +691,7 @@ files:
 - samples/hello/images/mexico.png
 - samples/hello/images/netherlands.png
 - samples/hello/images/norway.png
+- samples/hello/images/paste.png
 - samples/hello/images/usa.png
 - sounds/metronome-down.wav
 - sounds/metronome-up.wav
@@ -726,7 +728,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.14
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)