glimmer-dsl-swt 4.24.1.1 → 4.24.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2e6b29d0e22472197125558b15c5907bb8cd0f14435a5394e50e988d246e60
-  data.tar.gz: fb077b4b726a322ba57a3bc18e5feb8356d25eac9f8919cd3fccabd8cb3220a6
+  metadata.gz: e022ad5b5e0334818e996c918fbf384bee80a9e5a628503da14f857842ab7da0
+  data.tar.gz: 86d06e30bbe172f7de677ecbfa9338b5874a9a92ab3d73f67f05dca975fb1500
 SHA512:
-  metadata.gz: be47b7d1ed562c8a086f6d4f58df9f669597fe0726f7befc15632ee21ba326514978a6622b6daeb3c35da6fdaaf104a55c316ee1b8fd22841697999eddedb193
-  data.tar.gz: bd6f034024917f91b7b15b54010c37c17b9b10a85d82ae9b41ad7f5605935217ca381a98f15f4f96f874684a3fb1f6b62e6bb19fb7a354af4c98d30a746daa47
+  metadata.gz: bdc32f76c5467e573db93f650bd8b4eef2dd074c952926f6c92bfaa6798f240be09ae21262e3e062f916f1a86cf1cedd8e7c2f3de4d107a55bcbc950a638b9ae
+  data.tar.gz: '097eb1e61863157609a431e16345ffc73b0d06b7db44311e56ef1ba53d5d1619782f8ee0bc6e34d441d3cbbcb909237801d68b42446d6ca7d1d8ec731f856b80'

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## 4.24.2.0
+
+- Update `code_text` to support Dark Mode with `glimmer_dark` theme, which is applied by default when app is run with OS in dark mode
+- Fix issue with `code_text` showing gibberish on Linux when Courier & Consolas fonts are not available. It will attempt to use the first Monospace font it finds now or otherwise stick to the default font.
+- Update Hello, Code Text! and Glimmer Meta-Sample to support Dark Mode
+- Refactor Hello, Custom Widget! with on_widget_disposed thread cleanup code
+- Refactor Hello, Custom Shell! to support keyboard display of emails by hitting ENTER/SPACE after selecting a table row
+
+## 4.24.1.3
+
+- Fix Windows freezing issue with warbler during packaging with the `glimmer package` command (caused by bundler included in JRuby on JDK18, fixed by installing latest bundler)
+
+## 4.24.1.2
+
+- Fix issue where you cannot call `tab_item_proxy.text` or `tab_item_proxy.text = 'new text'` because its `swt_widget` is the contained `composite`
+- Refactor Parking sample to clarify rotation details
+
 ## 4.24.1.1
 
 - Fix `jar-dependencies` gem version to v0.4.1 in scaffolded applications to avoid issue encountered in newly released v0.4.2

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.24.1.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.24.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,6 +10,8 @@
 
 [GLIMMER VIDEO TUTORIAL CHANNEL](https://www.youtube.com/channel/UC5hzDE23HZXsZLAxYk2UJEw)
 
+![Glimmer DSL for SWT Demo of Hello, World!](/images/glimmer-dsl-swt-demo-hello-world.gif)
+
 [Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) is a native GUI (Graphical User Interface) cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster [JVM](https://www.java.com/en/download/help/whatis_java.html) 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) (Domain Specific Language) 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 />
@@ -19,7 +21,7 @@ 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.24.1.1 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.24.2.0 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -304,9 +306,9 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- JDK 18 is recommended / Minimum is JDK 16 on x64 platforms and Linux AARCH64, and JDK 17 on Mac ARM64 (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
+- JDK 18 is required / JDK 16 is the minimum except on Mac ARM64 where JDK 17 is the minimum (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
 - [RVM](http://rvm.io) on Mac & Linux (not needed on Windows)
-- JRuby 9.3.6.0 (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.6.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
+- JRuby 9.3.6.0 is required (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.6.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
 - SWT 4.24 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem). Note that SWT supports ARM64/AARCH64 on Mac and Linux since version 4.20
 - Git (comes with Mac and Linux. Install on Windows: https://git-scm.com/download/win )
 
@@ -336,7 +338,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.1.1
+jgem install glimmer-dsl-swt -v 4.24.2.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -364,7 +366,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.24.1.1'
+gem 'glimmer-dsl-swt', '~> 4.24.2.0'
 ```
 
 And, then run:
@@ -387,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.1.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.2.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.24.1.1
+4.24.2.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -162,7 +162,7 @@ Glimmer DSL syntax consists mainly of:
 
 Glimmer supports a new and radical Ruby DSL concept called DSL Auto-Expansion. To explain, let's first mention the two types of Glimmer GUI DSL keywords: static and dynamic.
 
-Static keywords are pre-identified keywords in the Glimmer DSL, such as `shell`, `display`, `message_box`, `async_exec`, `sync_exec`, and `bind`.
+Static keywords are pre-identified keywords in the Glimmer DSL, such as `shell` (alias: `window`), `display`, `message_box`, `async_exec`, `sync_exec`, and `bind`.
 
 Dynamic keywords are dynamically figured out from currently imported (aka required/loaded) SWT widgets and custom widgets. Examples are: `label`, `combo`, and `list` for SWT widgets and `c_date_time`, `video`, and `gantt_chart` for custom widgets.
 
@@ -191,7 +191,7 @@ This screenshot taken from the link above should give a glimpse of how SWT widge
 In Glimmer DSL, widgets are declared with lowercase underscored names mirroring their SWT names minus the package name.
 
 For example, here are some Glimmer widgets and their SWT counterparts:
-- `shell` instantiates `org.eclipse.swt.widgets.Shell`
+- `shell` (alias: `window`) instantiates `org.eclipse.swt.widgets.Shell`, which represents a window
 - `text` instantiates `org.eclipse.swt.widgets.Text`
 - `button` instantiates `org.eclipse.swt.widgets.Button`
 - `label` instantiates `org.eclipse.swt.widgets.Label`
@@ -220,7 +220,7 @@ shell {
 }.open
 ```
 
-Note that `shell` instantiates the outer shell **widget**, in other words, the window that houses all of the desktop graphical user interface.
+Note that `shell` (alias: `window`) instantiates the outer shell **widget**, in other words, the window that houses all of the desktop graphical user interface.
 
 `shell` is then followed by a ***block*** that contains
 
@@ -248,7 +248,7 @@ shell {|shell_proxy|
 }
 ```
 
-Remember that The `shell` widget is always the outermost widget containing all others in a Glimmer desktop windowed application.
+Remember that The `shell` (alias: `window`) widget is always the outermost widget containing all others in a Glimmer desktop windowed application.
 
 After it is declared, a `shell` must be opened with the `#open` method, which can be called on the block directly as in the example above, or by capturing `shell` in a `@shell` variable (shown in example below), and calling `#open` on it independently (recommended in actual apps)
 
@@ -1114,7 +1114,7 @@ shell {
 
 This relies on Glimmer's [Multi-DSL Support](#multi-dsl-support) for building the HTML text using [Glimmer XML DSL](https://github.com/AndyObtiva/glimmer-dsl-xml).
 
-Learn more at: 
+Learn more at:
 - [SWT Browser API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html)
 - [SWT Browser FAQ](https://www.eclipse.org/swt/faq.php#whatisbrowser).
 
@@ -4809,6 +4809,12 @@ You may see another example at the [Hello, Radio Group!](/docs/reference/GLIMMER
 
 `code_text` is a Glimmer built-in custom widget that displays syntax highlighted Ruby code in a customized SWT [StyledText](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/custom/StyledText.html) widget.
 
+It attempts to use a monospace font if available, seeking fonts in the following order:
+1. Consolas
+2. Courier
+3. Any font that contains the word "Mono"
+4. Default system font (if no other font is found)
+
 It is used in the [Glimmer Meta-Sample (The Sample of Samples)](#samples):
 
 ![Glimmer Meta-Sample](/images/glimmer-meta-sample.png)
@@ -4842,6 +4848,7 @@ Keep in mind that if the text grows and required a wider line numbers area, it g
 
 Changes syntax color highlighting theme. Can be one of the following:
 - glimmer
+- glimmer_dark (always applied when OS is in dark mode)
 - github
 - pastie
 

data/lib/ext/rouge/themes/glimmer_dark.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2007-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module Rouge
+  module Themes
+    # A port of the pastie style from Pygments.
+    # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
+    class GlimmerDark < Github
+      name 'glimmer_dark'
+      style Comment::Single, fg:      [149, 140, 130], italic: true # Also, Comments
+      style Keyword::Pseudo, fg:      [188, 255, 255]
+      style Keyword::Declaration, fg:      [188, 255, 255]
+      style Keyword, fg:     [153, 38, 16], bold: true
+      style Literal::String::Single, fg:      [149, 140, 130] # Also, Comments
+      style Literal::String::Double, fg:     [255, 163, 58]
+      style Literal::String::Escape, fg:      [6, 217, 141]
+      style Literal::Number::Integer, fg:     [153, 38, 16], bold: true
+      style Literal::String::Interpol, fg:    [153, 38, 16], bold: true
+      style Literal::String::Symbol, fg:      [255, 127, 255]
+      style Literal::String, fg:      [163, 215, 252]
+      style Name::Builtin, fg:     [40, 197, 182]
+      style Name::Class, fg:       [252, 208, 157]
+      style Name::Namespace, fg: [252, 208, 157]
+      style Name::Constant, fg:    [255, 163, 58]
+      style Name::Function, fg:    [153, 38, 16], bold: true
+      style Name::Variable::Instance, fg:    [28, 157, 246]
+      style Name::Tag, fg:    [247, 250, 136]
+      style Name::Attribute, fg:    [255, 127, 127]
+      style Name, fg:        [144, 189, 62] #inverse of purple
+      style Operator, fg:    [6, 217, 141]
+      style Punctuation, fg: [102, 217, 239]
+      style Text, fg:        [180, 180, 180]
+    end
+  end
+end

data/lib/glimmer/rake_task/scaffold.rb

@@ -147,6 +147,7 @@ module Glimmer
           gem_name = file_name(app_name)
           gem_summary = human_name(app_name)
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
@@ -250,6 +251,7 @@ module Glimmer
             namespace = 'glimmer'
           end
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
@@ -317,6 +319,7 @@ module Glimmer
           end
           
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
@@ -355,6 +358,7 @@ module Glimmer
           end
           
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?

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

@@ -124,8 +124,12 @@ module Glimmer
         before_body do
           require 'rouge'
           require 'ext/rouge/themes/glimmer'
+          require 'ext/rouge/themes/glimmer_dark'
+          @dark_mode = Java::OrgEclipseSwtWidgets::Display.system_dark_theme?
+          self.theme = 'glimmer_dark' if @dark_mode
+          @dark_theme = theme.include?('dark')
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
-          @font_name = display.get_font_list(nil, true).map(&:name).include?('Consolas') ? 'Consolas' : 'Courier'
+          select_best_font
           if lines == true
             @lines_width = 4
           elsif lines.is_a?(Hash)
@@ -151,9 +155,9 @@ module Glimmer
                           after_read: lambda { @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel unless styled_text_proxy_top_pixel.nil? }
                         ]
                 top_pixel <= [self, :styled_text_proxy_top_pixel]
-                font name: @font_name, height: OS.mac? ? 15 : 12
+                font @font_options
                 background color(:widget_background)
-                foreground :dark_blue
+                foreground @dark_mode ? rgb(255, 255, 127) : :dark_blue
                 top_margin 5
                 right_margin 5
                 bottom_margin 5
@@ -186,7 +190,8 @@ module Glimmer
             
             text <=> [self, :styled_text_proxy_text] if lines
             top_pixel <=> [self, :styled_text_proxy_top_pixel] if lines
-            font name: @font_name, height: OS.mac? ? 15 : 12
+            font @font_options
+            background :black if @dark_mode
             foreground rgb(75, 75, 75)
             left_margin 5
             top_margin 5
@@ -239,8 +244,8 @@ module Glimmer
                   start_index = token_hash[:token_index]
                   size = token_hash[:token_text].size
                   style_data = Rouge::Theme.find(theme).new.style_for(token_hash[:token_type])
-                  foreground_color = hex_color_to_swt_color(style_data[:fg], [:black])
-                  background_color = hex_color_to_swt_color(style_data[:bg], [:white])
+                  foreground_color = hex_color_to_swt_color(style_data[:fg], [@dark_mode ? :white : :black])
+                  background_color = hex_color_to_swt_color(style_data[:bg], [@dark_mode ? :black : :white])
                   font_styles = []
                   font_styles << :bold if style_data[:bold]
                   font_styles << :italic if style_data[:italic]
@@ -310,6 +315,21 @@ module Glimmer
           @lines_width = lines_text_size if lines_text_size > @lines_width
           line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
         end
+        
+        def select_best_font
+          select_best_font_name
+          @font_options = {height: OS.mac? ? 15 : 12}
+          @font_options.merge!(name: @font_name) if @font_name
+          @font_options
+        end
+        
+        def select_best_font_name
+          all_font_names = display.get_font_list(nil, true).map(&:name)
+          @font_name ||= 'Consolas' if all_font_names.include?('Consolas')
+          @font_name ||= 'Courier' if all_font_names.include?('Courier')
+          @font_name ||= all_font_names.find {|font_name| font_name.downcase.include?('mono')}
+          @font_name
+        end
       end
     end
   end

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -78,6 +78,23 @@ module Glimmer
         end
       end
       
+      ATTRIBUTES.each do |attribute|
+        define_method(attribute) do
+          auto_exec do
+            widget_proxy.send(attribute)
+          end
+        end
+        
+        define_method("#{attribute}=") do |value|
+          value.tap do
+            auto_exec do
+              widget_proxy.send("#{attribute}=", value)
+              shell_proxy.pack_same_size
+            end
+          end
+        end
+      end
+      
       def dispose
         auto_exec do
           swt_tab_item.setControl(nil)

data/samples/elaborate/meta_sample/tutorials.yml

@@ -25,3 +25,6 @@ Game Of Life: pDE79YRjOjs
 Hello, Canvas Data Binding!: PQ_Y8e5VeDo
 Hello, Canvas Path!: ThmNcXTldY8
 Hello, Canvas Transform!: ePIAF5EMsE0
+Parking: kw-6icVgDR4
+Hello, Custom Widget!: aJHLo5yLDZc
+Hello, Custom Shell!: c8Eb8GWM_XQ

data/samples/elaborate/meta_sample.rb

@@ -340,7 +340,7 @@ class MetaSampleApplication
             }
           }
           line_numbers {
-            background :white
+            background Display.system_dark_theme? ? :black : :white
           }
           text <=> [SampleDirectory, 'selected_sample.code']
           editable <= [SampleDirectory, 'selected_sample.editable']

data/samples/elaborate/parking.rb

@@ -26,10 +26,10 @@ require_relative 'parking/model/parking_presenter'
 class Parking
   include Glimmer::UI::CustomShell
     
+  CANVAS_LENGTH = 600
   FLOOR_COUNT = 4
   
   before_body do
-    @parking_spots = Model::ParkingSpot::LETTERS.clone
     @parking_presenter = Model::ParkingPresenter.new(FLOOR_COUNT)
   end
 
@@ -56,7 +56,6 @@ class Parking
         selection <=> [@parking_presenter, :selected_floor]
         
         on_widget_selected do
-          @parking_spots = Model::ParkingSpot::LETTERS.clone
           @canvas.dispose_shapes
           @canvas.content {
             parking_floor
@@ -65,8 +64,8 @@ class Parking
       }
       @canvas = canvas {
         layout_data {
-          width 600
-          height 600
+          width CANVAS_LENGTH
+          height CANVAS_LENGTH
         }
         
         background :dark_gray
@@ -77,42 +76,33 @@ class Parking
   }
   
   def parking_floor
-    parking_quad(67.5, 0, 125)
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(90)
-    }
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(180)
-    }
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(270)
-    }
+    parking_quad(67.5, 0, 125, 0)
+    parking_quad(67.5, 0, 125, 90)
+    parking_quad(67.5, 0, 125, 180)
+    parking_quad(67.5, 0, 125, 270)
   end
         
-  def parking_quad(location_x, location_y, length, &block)
+  def parking_quad(location_x, location_y, length, angle)
     distance = (1.0/3)*length
-    parking_spot(location_x, location_y, length, &block)
-    parking_spot(location_x + distance, location_y, length, &block)
-    parking_spot(location_x + 2*distance, location_y, length, &block)
-    parking_spot(location_x + 3*distance, location_y, length, &block)
+    parking_spot(location_x, location_y, length, angle)
+    parking_spot(location_x + distance, location_y, length, angle)
+    parking_spot(location_x + 2*distance, location_y, length, angle)
+    parking_spot(location_x + 3*distance, location_y, length, angle)
   end
       
-  def parking_spot(location_x, location_y, length, &block)
-    parking_spot_letter = @parking_spots.shift
+  def parking_spot(location_x, location_y, length, angle)
+    parking_spot_letter = next_parking_spot_letter
     height = length
     width = (2.0/3)*length
-    shape(location_x, location_y) { |the_shape|
+    
+    shape(location_x, location_y) {
       line_width (1.0/15)*length
       foreground :white
   
-      block&.call(the_shape)
-    
       rectangle(location_x, location_y, width, height) {
-        background <= [
-          @parking_presenter.floors[@parking_presenter.selected_floor - 1].parking_spots[parking_spot_letter],
-          :booked,
-          on_read: ->(b) {b ? :red : :dark_gray}
-        ]
+        background <= [parking_spot_for(parking_spot_letter), :booked,
+                        on_read: ->(value) {value ? :red : :dark_gray}
+                      ]
         
         text {
           x :default
@@ -123,7 +113,8 @@ class Parking
         
         on_mouse_up do
           begin
-            @parking_presenter.floors[@parking_presenter.selected_floor - 1].book!(parking_spot_letter)
+            selected_parking_floor.book!(parking_spot_letter)
+            
             message_box {
               text 'Parking Booked!'
               message "Floor #{@parking_presenter.selected_floor} Parking Spot #{parking_spot_letter} Is Booked!"
@@ -138,8 +129,29 @@ class Parking
       line(location_x, location_y, location_x + width, location_y)
       line(location_x + width, location_y, location_x + width, location_y + height)
       
+      # Rotate around the canvas center point
+      transform {
+        translation CANVAS_LENGTH/2.0, CANVAS_LENGTH/2.0
+        rotation angle
+        translation -CANVAS_LENGTH/2.0, -CANVAS_LENGTH/2.0
+      }
     }
   end
+  
+  def parking_spot_for(parking_spot_letter)
+    selected_parking_floor.parking_spots[parking_spot_letter]
+  end
+  
+  def selected_parking_floor
+    @parking_presenter.floors[@parking_presenter.selected_floor - 1]
+  end
+  
+  private
+  
+  def next_parking_spot_letter
+    @parking_spot_letters = Model::ParkingSpot::LETTERS.clone if @parking_spot_letters.nil? || @parking_spot_letters.empty?
+    @parking_spot_letters.shift
+  end
 end
   
 Parking.launch

data/samples/hello/hello_code_text.rb

@@ -86,7 +86,8 @@ class HelloCodeText
           
           text 'Ruby (glimmer theme)'
           
-          code_text(language: 'ruby', theme: 'glimmer', lines: true) {
+          # Note: code_text theme is currently ignored in dark mode
+          code_text(language: 'ruby', theme: 'glimmer_dark', lines: true) { # theme is currently ignored in dark mode
             text <=> [self, :ruby_code]
           }
         }
@@ -96,17 +97,18 @@ class HelloCodeText
           
           text 'JavaScript (pastie theme)'
           
-          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
+          # Note: code_text theme is currently ignored in dark mode
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'glimmer_dark', lines: {width: 2}) {
             root {
               grid_layout(2, false) {
                 margin_width 2
               }
               
-              background :white
+              background Display.system_dark_theme? ? :black : :white
             }
             
             line_numbers {
-              background :white
+              background Display.system_dark_theme? ? :black : :white
             }
             
             text <=> [self, :js_code]
@@ -118,7 +120,8 @@ class HelloCodeText
           
           text 'HTML (github theme)'
           
-          code_text(language: 'html', theme: 'github') { # default is lines: false
+          # Note: code_text theme is currently ignored in dark mode
+          code_text(language: 'html', theme: 'glimmer_dark') { # default is lines: false
             text <=> [self, :html_code]
           }
         }

data/samples/hello/hello_custom_shell.rb

@@ -26,7 +26,8 @@ require 'date'
 # Used to view an email message
 class EmailShell
   # including Glimmer::UI::CustomShell enables declaring as an `email_shell` custom widget Glimmer GUI DSL keyword
-  include Glimmer::UI::CustomShell
+  # Glimmer::UI::CustomShell is a specialized Glimmer::UI::CustomWidget that has `shell` as its `body_root`
+  include Glimmer::UI::CustomShell # aliases: Glimmer::UI::CustomWindow & Glimmer::UI::Application
   
   # multiple options without default values
   options :parent_shell, :date, :subject, :from, :message
@@ -88,26 +89,56 @@ class EmailShell
 end
 
 class HelloCustomShell
-  include Glimmer
+  include Glimmer::UI::Application # aliases: Glimmer::UI::CustomShell & Glimmer::UI::CustomWindow
   
   Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
-  EmailSystem = Struct.new(:emails, keyword_init: true)
+  EmailSystem = Struct.new(:emails, :selected_email, keyword_init: true)
   
-  def initialize
+  before_body do
     @email_system = EmailSystem.new(
       emails: [
-        Email.new(date: DateTime.new(2029, 10, 22, 11, 3, 0).strftime('%F %I:%M %p'), subject: '3rd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
-        Email.new(date: DateTime.new(2029, 10, 21, 8, 1, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v100.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 100.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
-        Email.new(date: DateTime.new(2029, 10, 19, 16, 58, 0).strftime('%F %I:%M %p'), subject: 'Christmas Party', from: '"Lisa Ferreira" <lisa.ferreira@example.com>', message: "Merry Christmas,\n\nAll office Christmas Party arrangements have been set\n\nMake sure to bring a Secret Santa gift\n\nBest regards,\n\nLisa Ferreira"),
-        Email.new(date: DateTime.new(2029, 10, 16, 9, 43, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v99.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 99.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
-        Email.new(date: DateTime.new(2029, 10, 15, 11, 2, 0).strftime('%F %I:%M %p'), subject: '2nd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
-        Email.new(date: DateTime.new(2029, 10, 2, 10, 34, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v98.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 98.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
+        Email.new(
+          date: DateTime.new(2029, 10, 22, 11, 3, 0).strftime('%F %I:%M %p'),
+          subject: '3rd Week Report',
+          from: '"Dianne Tux" <dianne.tux@example.com>',
+          message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"
+        ),
+        Email.new(
+          date: DateTime.new(2029, 10, 21, 8, 1, 0).strftime('%F %I:%M %p'),
+          subject: 'Glimmer Upgrade v100.0',
+          from: '"Robert McGabbins" <robert.mcgabbins@example.com>',
+          message: "Team,\n\nWe are upgrading to Glimmer version 100.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"
+        ),
+        Email.new(
+          date: DateTime.new(2029, 10, 19, 16, 58, 0).strftime('%F %I:%M %p'),
+          subject: 'Christmas Party',
+          from: '"Lisa Ferreira" <lisa.ferreira@example.com>',
+          message: "Merry Christmas,\n\nAll office Christmas Party arrangements have been set\n\nMake sure to bring a Secret Santa gift\n\nBest regards,\n\nLisa Ferreira"
+        ),
+        Email.new(
+          date: DateTime.new(2029, 10, 16, 9, 43, 0).strftime('%F %I:%M %p'),
+          subject: 'Glimmer Upgrade v99.0',
+          from: '"Robert McGabbins" <robert.mcgabbins@example.com>',
+          message: "Team,\n\nWe are upgrading to Glimmer version 99.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"
+        ),
+        Email.new(
+          date: DateTime.new(2029, 10, 15, 11, 2, 0).strftime('%F %I:%M %p'),
+          subject: '2nd Week Report',
+          from: '"Dianne Tux" <dianne.tux@example.com>',
+          message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"
+        ),
+        Email.new(
+          date: DateTime.new(2029, 10, 2, 10, 34, 0).strftime('%F %I:%M %p'),
+          subject: 'Glimmer Upgrade v98.0',
+          from: '"Robert McGabbins" <robert.mcgabbins@example.com>',
+          message: "Team,\n\nWe are upgrading to Glimmer version 98.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"
+        ),
       ]
     )
   end
   
-  def launch
-    shell { |shell_proxy|
+  body {
+    shell {
       grid_layout
       
       text 'Hello, Custom Shell!'
@@ -139,22 +170,33 @@ class HelloCustomShell
         }
         
         items <=> [@email_system, :emails, column_properties: [:date, :subject, :from]]
+        selection <=> [@email_system, :selected_email]
         
         on_mouse_up do |event|
-          email = event.table_item.get_data
-          
-          # open a custom email shell
-          email_shell(
-            parent_shell: shell_proxy,
-            date: email.date,
-            subject: email.subject,
-            from: email.from,
-            message: email.message
-          ).open
+          open_email(@email_system.selected_email)
+        end
+        
+        on_key_pressed do |event|
+          if [swt(:cr), swt(:space)].include?(event.keyCode)
+            open_email(@email_system.selected_email)
+          end
         end
       }
-    }.open
+    }
+  }
+  
+  def open_email(email)
+    return if email.nil?
+    
+    # open a custom email shell
+    email_shell(
+      parent_shell: body_root,
+      date: email.date,
+      subject: email.subject,
+      from: email.from,
+      message: email.message
+    ).open
   end
 end
 
-HelloCustomShell.new.launch
+HelloCustomShell.launch

data/samples/hello/hello_custom_widget.rb

@@ -55,13 +55,13 @@ class GreetingLabel
   after_body do
     return if colors.nil?
     
-    Thread.new {
-      colors.cycle { |color|
+    @thread = Thread.new do
+      colors.cycle do |color|
         self.label_color = color
         @color_changed_handlers&.each {|handler| handler.call(color)}
         sleep(1)
-      }
-    }
+      end
+    end
   end
   
   body {
@@ -70,6 +70,10 @@ class GreetingLabel
       text "#{greeting}, #{name}!"
       font @font
       foreground <=> [self, :label_color]
+      
+      on_widget_disposed do
+        @thread&.kill # safe since it does not involve data
+      end
     }
   }
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.1.1
+  version: 4.24.2.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -399,6 +399,7 @@ files:
 - lib/ext/glimmer.rb
 - lib/ext/glimmer/config.rb
 - lib/ext/rouge/themes/glimmer.rb
+- lib/ext/rouge/themes/glimmer_dark.rb
 - lib/glimmer-dsl-swt.rb
 - lib/glimmer/Rakefile
 - lib/glimmer/data_binding/list_selection_binding.rb