glimmer-dsl-swt 4.18.4.2 → 4.18.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4acc7755917941e9c8fd7d94f7712d29701ca4eefd1b31b20a9a46d41ec557
-  data.tar.gz: 3f59ee7617453a88165fa57594bcff2dea9831c70a821c11326ace68d66b8936
+  metadata.gz: 961d9ddec901003644771059d3e3914ec041fe72e6d551ea1aa89c0f755725ee
+  data.tar.gz: 5dc835b1580c1f5125531f80efb9620cf39b8ccb905dc991bf771c38bcac1816
 SHA512:
-  metadata.gz: 22e115579a74734199b02ce5e43cb15fd789424f063e0d805ff3e1058ec63067e01ea63df4b794e530a0268803bdd898211db3f31a99fe27c63f9ed21c1cb857
-  data.tar.gz: 85a7683f0e431252bf4e5490895fa029bfc961a17be3a6fa8e1d15ab4a6927acd8ddf834a46ada2dbaa1ce0aaaf68979c477edebae48e77de9c601a5dfd0d658
+  metadata.gz: b21c2e5bc842dd1ef9d937b37fa72567d76b8c3ee4ae823952d982a2e80d078b50f383738b70f40655c241d1c697a5ce10ae74c9b43dce7685ca6d9d4683ebe9
+  data.tar.gz: 1862c2516f8237a426cbddb6a331d74bc5112950491abb9d78a5086df8e9343408146d17c05e0c10613f68828d1a9081ec54ba118f8d4b8ab80d25b567d4c1b5

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 4.18.4.3
+
+- Fix flashing issue when using ShellProxy#pack_same_size on Windows
+- Double buffer Hello, Canvas Animation! Sample to remove flickering
+- Tetris - Added `:double_buffered` SWT style for Tetris Playfield and Block to avoid rendering flicker on Windows
+- Tetris - Substituted command key with control on Windows/Linux to make Tetris menu shortcuts work (e.g. CTRL+P pauses)
+- Tetris - Workaround for Windows issue with  tetromino down invisibility upon holding down arrow key (now holding down does only one down)
+
 ### 4.18.4.2
 
 - Remove Tetris Clear button from High Score dialog (since it is available via menu and is rarely used)

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.4.2
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.18.4.3
 ## 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)
@@ -456,9 +456,10 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- JDK 8u241 (1.8.0_241) (find at https://www.oracle.com/java/technologies/javase/javase8u211-later-archive-downloads.html)
+- JDK 8u241 (1.8.0_241) (find at https://www.oracle.com/java/technologies/javase/javase8u211-later-archive-downloads.html / On Windows, ensure PATH includes Java bin directory  like C:\Program Files\Java\jdk1.8.0_241\bin for javapackager to work during packaging Glimmer applications)
 - JRuby 9.2.14.0 (supporting Ruby 2.5.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux or find at [https://www.jruby.org/download](https://www.jruby.org/download) for Windows)
 - SWT 4.18 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem)
+- Git (comes with Mac and Linux. Install on Windows: https://git-scm.com/download/win )
 
 To obtain JRuby through [RVM](http://rvm.io), you may run:
 
@@ -478,7 +479,7 @@ If you intend to build a Glimmer app from scratch with [scaffolding](#scaffoldin
 
 Otherwise, Option 2 ([Bundler](#option-2-bundler)) can be followed in rare cases where you want to build an app without [scaffolding](#scaffolding).
 
-Note: if you encounter any [issues](https://github.com/AndyObtiva/glimmer-dsl-swt/issues), please [report](https://github.com/AndyObtiva/glimmer-dsl-swt/issues) and then install a previous version instead from the list of [Glimmer Releases](https://rubygems.org/gems/glimmer-dsl-swt/versions).
+**Note:** if you encounter any [issues](https://github.com/AndyObtiva/glimmer-dsl-swt/issues), please [report](https://github.com/AndyObtiva/glimmer-dsl-swt/issues) and then install a previous version instead from the list of [Glimmer Releases](https://rubygems.org/gems/glimmer-dsl-swt/versions) (keep looking back till you find one that works). Do not be disheartened as nearly everything is only a few days of work away. That said, keep in mind that this project is free and open source, meaning provided as is, so do not expect anything, but if you help with reporting and contributing, you could speed things up or even become part of the project.
 
 ### Option 1: Direct Install
 (Use for [Scaffolding](#scaffolding))
@@ -490,7 +491,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.4.2
+jgem install glimmer-dsl-swt -v 4.18.4.3
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -508,7 +509,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.18.4.2'
+gem 'glimmer-dsl-swt', '~> 4.18.4.3'
 ```
 
 And, then run:
@@ -566,7 +567,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.4.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.4.3
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -588,8 +589,8 @@ Tasks are run via rake. Some tasks take arguments in square brackets.
 
 Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
 
-Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and letters to filter)
-‣ glimmer list:gems:customshell[query]                       # List Glimmer custom shell gems available at rubygems.org (query is optional) [alt: list:gems:cs]
+Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and letters to filter)
+‣ glimmer list:gems:customshell[query]                       # List Glimmer custom shell gems available at rubygems.org (query is optional) [alt: list:gems:cs]
   glimmer list:gems:customwidget[query]                      # List Glimmer custom widget gems available at rubygems.org (query is optional) [alt: list:gems:cw]
   glimmer list:gems:dsl[query]                               # List Glimmer DSL gems available at rubygems.org (query is optional)
   glimmer package[type]                                      # Package app for distribution (generating config, jar, and native files) (type is optional)
@@ -1045,7 +1046,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.4.2  AndyMaleh    Glimmer DSL for SWT
+  Swt    glimmer-dsl-swt    4.18.4.3  AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
   Xml    glimmer-dsl-xml    1.1.0     AndyMaleh    Glimmer DSL for XML
 ```
@@ -2402,22 +2403,24 @@ https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/
 
 ### Canvas Shape DSL
 
+**(ALPHA FEATURE)**
+
 Glimmer supports drawing graphics directly on a `canvas` widget via SWT (or any widget for that matter though `canvas` is recommended for drawing).
 
 This is accomplished via the Shape DSL a sub-DSL of the Glimmer GUI DSL, which makes it possible to draw graphics declaratively with very understandable and maintainable syntax.
 
 Shape keywords and their args (including defaults) are listed below (they basically match method names and arguments on [org.eclipse.swt.graphics.GC](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html) minus the `draw` or `fill` prefix in downcase):
-- `arc​(x, y, width, height, startAngle, arcAngle, fill: false)` arc is part of a circle within an oval area, denoted by start angle (degrees) and end angle (degrees)
-- `focus​(x, y, width, height)` this is just like rectangle but its foreground color is always that of the OS widget focus color (useful when capturing user interaction via a shape)
+- `arc​(x, y, width, height, startAngle, arcAngle, fill: false)` arc is part of a circle within an oval area, denoted by start angle (degrees) and end angle (degrees)
+- `focus​(x, y, width, height)` this is just like rectangle but its foreground color is always that of the OS widget focus color (useful when capturing user interaction via a shape)
 - `image(image, x, y)` [image](#image)
 - `line(x1, y1, x2, y2)` line
 - `oval(x, y, width, height, fill: false)` oval if width does not match heigh and circle if width matches height. Can be optionally filled.
-- `point​(x, y)` point
+- `point​(x, y)` point
 - `polygon(pointArray, fill: false)` polygon consisting of points, which close automatically to form a shape that can be optionally filled (when points only form a line, it does not show up as filled)
 - `polyline(pointArray)` polyline is just like a polygon, but it does not close up to form a shape, remaining open (unless the points close themselves by having the last point or an intermediate point match the first)
 - `rectangle(x, y, width, height, fill: false)` standard rectangle, which can be optionally filled
 - `rectangle(x, y, width, height, arcWidth = 60, arcHeight = 60, fill: false, round: true)` round rectangle, which can be optionally filled, and takes optional extra round angle arguments
-- `rectangle​(x, y, width, height, vertical = true, fill: true, gradient: true)` gradient rectangle, which is always filled, and takes an optional extra argument to specify true for vertical gradient (default) and false for horizontal gradient
+- `rectangle​(x, y, width, height, vertical = true, fill: true, gradient: true)` gradient rectangle, which is always filled, and takes an optional extra argument to specify true for vertical gradient (default) and false for horizontal gradient
 - `text(string, x, y, flags = nil)` text with optional flags (flag format is `swt(comma_separated_flags)` where flags can be :draw_delimiter (i.e. new lines), :draw_tab, :draw_mnemonic, and :draw_transparent as explained in [GC API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html))
 
 Shape keywords that can be filled with color can take an keyword argument `fill: true`. Defaults to false when not specified unless background is set with no foreground (or foreground is set with no background), in which case a smart default is applied.
@@ -2431,7 +2434,7 @@ Here is a list of supported attributes nestable within a block under shapes:
 - `antialias` enables antialiasing (SWT style value of `:default`, `:off`, `:on` whereby `:default` applies OS default, which varies per OS)
 - `background` sets fill color for fillable shapes (standard color symbol (e.g. `:red`), `rgb(red_integer, green_integer, blue_integer)` color, or Color/ColorProxy object directly)
 - `background_pattern` sets fill gradient/image pattern for fillable shape background (takes the same arguments as the SWT [Pattern](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/Pattern.html) class [e.g. `background_pattern 2.3, 4.2, 5.4, 7.2, :red, :blue`] / note: this feature isn't extensively tested yet)
-- `clipping` clips area of painting (​numeric values for `(x, y, width, height)`)
+- `clipping` clips area of painting (​numeric values for `(x, y, width, height)`)
 - `fill_rule` sets filling rule (SWT style value of `:fill_even_odd` or `:fill_winding`)
 - `font` sets font (Hash of `:name`, `:height`, and `:style` just like standard widget font property, or Font/FontProxy object directly)
 - `foreground` sets draw color for drawable shapes (standard color symbol (e.g. `:red`), `rgb(red_integer, green_integer, blue_integer)` color, or Color/ColorProxy object directly)
@@ -2633,6 +2636,8 @@ shell {
 
 ### Canvas Transform DSL
 
+**(ALPHA FEATURE)**
+
 The transform DSL builds [org.eclipse.swt.graphics.Transform](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/Transform.html) objects with a nice declarative syntax.
 
 `transform` keyword builds a `Transform` object. It optionally takes the transformation matrix elements: (m11, m12, m21, m22, dx, dy)
@@ -2715,6 +2720,8 @@ Learn more at the [Hello, Canvas Transform! Sample](#hello-canvas-transform).
 
 ### Canvas Animation DSL
 
+**(EARLY ALPHA FEATURE)**
+
 (note: this is a very new feature of Glimmer. It may change a bit while getting battle tested. As always, you could default to basic SWT usage if needed.)
 
 Glimmer additionally provides built-in support for animations via a declarative Animation DSL, another sub-DSL of the Glimmer GUI DSL.
@@ -3283,7 +3290,7 @@ https://help.eclipse.org/2019-12/index.jsp?topic=%2Forg.eclipse.platform.doc.isv
 
 It has `addSelectionListener`. Additionally, under its `Control` super class, it has `addControlListener`, `addDragDetectListener`, `addFocusListener`, `addGestureListener`, `addHelpListener`, `addKeyListener`, `addMenuDetectListener`, `addMouseListener`, `addMouseMoveListener`, `addMouseTrackListener`, `addMouseWheelListener`, `addPaintListener`, `addTouchListener`, and `addTraverseListener`
 
-Suppose, we select `addSelectionListener`, which is responsible for what happens when a user selects a button (clicks it). Then, open its argument `SelectionListener` SWT API, and you find the event (instance) methods: `widgetDefaultSelected` and `widgetSelected​`. Let's select the second one, which is what gets invoked when a button is clicked.
+Suppose, we select `addSelectionListener`, which is responsible for what happens when a user selects a button (clicks it). Then, open its argument `SelectionListener` SWT API, and you find the event (instance) methods: `widgetDefaultSelected` and `widgetSelected​`. Let's select the second one, which is what gets invoked when a button is clicked.
 
 Now, Glimmer simplifies the process of hooking into that listener (observer) by neither requiring you to call the `addSelectionListener` method nor requiring you to implement/extend the `SelectionListener` API.
 
@@ -3704,6 +3711,7 @@ To use, simply use `code_text` in place of the `text` or `styled_text` widget. I
 
 **lines**
 (default: false)
+**(ALPHA OPTION)**
 
 Shows line numbers when set to true.
 
@@ -5199,6 +5207,8 @@ Contact Manager - Edit Done
 
 This sample demonstrates how to build an interactive animated game with MVC architecture, custom-shell/custom-widgets, multi-threading, asynchronous programming, data-binding, canvas shape graphic decorations, canvas shape icon image generation, and keyboard events/shortcuts.
 
+Note that it works optimally on the Mac. It is very new, so it has not been optimized for Windows and Linux yet given their minor differences from the Mac.
+
 Code:
 
 [samples/elaborate/tetris.rb](samples/elaborate/tetris.rb)
@@ -5272,7 +5282,7 @@ If you have a Glimmer app you would like referenced here, please mention in a Pu
 
 ## Packaging & 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)
+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 like "C:\Program Files\Java\jdk1.8.0_241\bin" for javapackager command to work during packaging Glimmer applications.
 
 Note 2: Glimmer packaging has a strong dependency on JDK8 at the moment. JDK9 & JDK10 might work, but JDK11 and onward definitely won't since they dropped javapackager, which later came back as jpackage in JDK14, but it's not ready for prime time yet. Just stick to JDK8 for now, strongly supported by Oracle for the next 6 years at least.
 
@@ -5282,7 +5292,7 @@ Glimmer simplifies the process of native-executable packaging and distribution o
 glimmer package
 ```
 
-It works out of the box for any application scaffolded by [Glimmer Scaffolding](#scaffolding), generating all available packaging types on the current platform (e.g. `DMG`, `PKG`, `APP` on the Mac) 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)
+It works out of the box for any application scaffolded by [Glimmer Scaffolding](#scaffolding), generating all available packaging types on the current platform (e.g. `DMG`, `PKG`, `APP` on the Mac) 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:
 
@@ -5430,7 +5440,7 @@ Glimmer::RakeTask::Package.javapackager_extra_args = '-Bmac.signing-key-develope
 
 Now, when you run `glimmer package`, it builds a self-signed DMG file. When you make available online, and users download, upon launching application, they are presented with your certificate, which they have to sign if they trust you in order to use the application.
 
-### Gotchas
+### Packaging Gotchas
 
 1. Specifying License File
 
@@ -5463,6 +5473,16 @@ You can get around that in zsh by running glimmer package commands with `bash -c
 bash -c 'glimmer package'
 ```
 
+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 on the Windows System PATH environment variable:
+c:\program files\java\jre1.8.0_241
+
+The problem is Oracle seems to be adding an indirect Java path junction in later versions of their installer:
+C:\Program Files (x86)\Common Files\Oracle\Java\javapath
+
+Simply replace with the simple one above (setting the correct version number) and then reinstall JRuby to have it use Java from the right path.
+
 ## App Updates
 
 Glimmer already supports automatic (and manual) app updates via the Mac App Store for Mac apps. Simply run the `glimmer package` command with the Mac App Store keys configured as per [Mac Application Distribution](mac-application-distribution) instructions and you get automatic (and manual) app update support courtesy of the Mac App Store.

data/VERSION

@@ -1 +1 @@
-4.18.4.2
+4.18.4.3

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.4.2 ruby lib
+# stub: glimmer-dsl-swt 4.18.4.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.4.2"
+  s.version = "4.18.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-02-04"
+  s.date = "2021-02-07"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]

data/lib/glimmer/swt/shell_proxy.rb

@@ -164,7 +164,7 @@ module Glimmer
           minimum_size = @swt_widget.getMinimumSize
           @swt_widget.setMinimumSize(bounds.width, bounds.height)
           listener = on_control_resized { @swt_widget.setBounds(bounds) }
-          @swt_widget.pack
+          @swt_widget.layout(true, true)
           @swt_widget.removeControlListener(listener.swt_listener)
           @swt_widget.setMinimumSize(minimum_size)
         elsif OS.linux?

data/samples/elaborate/tetris.rb

@@ -51,11 +51,12 @@ class Tetris
     end
     
     Display.app_name = 'Glimmer Tetris'
+
     display {
-      @keyboard_listener = on_swt_keydown { |key_event|
+      @keyboard_down_listener = on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
-          game.down!
+          game.down! if OS.mac?
         when swt(:arrow_up)
           case game.up_arrow_action
           when :instant_down
@@ -69,7 +70,7 @@ class Tetris
           game.left!
         when swt(:arrow_right), 'd'.bytes.first
           game.right!
-        when swt(:shift), swt(:alt), swt(:ctrl)
+        when swt(:shift), swt(:alt)
           if key_event.keyLocation == swt(:right) # right shift key
             game.rotate!(:right)
           elsif key_event.keyLocation == swt(:left) # left shift key
@@ -77,6 +78,16 @@ class Tetris
           end
         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?
+        @keyboard_up_listener = 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)
       @about_observer = on_about {
@@ -167,7 +178,7 @@ class Tetris
       }
     }
   end
-  
+
   def start_moving_tetrominos_down
     Thread.new do
       @mutex.synchronize do
@@ -199,7 +210,8 @@ class Tetris
   def deregister_observers
     @show_high_scores_observer&.deregister
     @game_over_observer&.deregister
-    @keyboard_listener&.deregister
+    @keyboard_down_listener&.deregister
+    @keyboard_up_listener&.deregister
     @about_observer&.deregister
     @quit_observer&.deregister
   end

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

@@ -27,7 +27,7 @@ class Tetris
       options :game_playfield, :block_size, :row, :column
   
       body {
-        canvas {
+        canvas(:double_buffered) {
           background bind(game_playfield[row][column], :color)
           polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4) {
             background bind(game_playfield[row][column], :color) { |color_value|

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

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        composite {
+        composite(:double_buffered) {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

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

@@ -23,6 +23,8 @@ class Tetris
   module View
     class TetrisMenuBar
       include Glimmer::UI::CustomWidget
+
+      COMMAND_KEY = OS.mac? ? :command : :ctrl
   
       options :game
       
@@ -34,7 +36,7 @@ class Tetris
             menu_item {
               text '&Start'
               enabled bind(game, :game_over)
-              accelerator :command, :s
+              accelerator COMMAND_KEY, :s
               
               on_widget_selected {
                 game.start!
@@ -42,14 +44,14 @@ class Tetris
             }
             menu_item(:check) {
               text '&Pause'
-              accelerator :command, :p
+              accelerator COMMAND_KEY, :p
               enabled bind(game, :game_over, on_read: :!) {|value| value && !game.show_high_scores}
               enabled bind(game, :show_high_scores, on_read: :!) {|value| value && !game.game_over}
               selection bind(game, :paused)
             }
             menu_item {
               text '&Restart'
-              accelerator :command, :r
+              accelerator COMMAND_KEY, :r
               
               on_widget_selected {
                 game.restart!
@@ -58,7 +60,7 @@ class Tetris
             menu_item(:separator)
             menu_item {
               text '&Exit'
-              accelerator :command, :x
+              accelerator COMMAND_KEY, :x
               
               on_widget_selected {
                 parent_proxy.close
@@ -73,12 +75,12 @@ class Tetris
               text '&High Scores'
               menu_item(:check) {
                 text '&Show'
-                accelerator :command, :shift, :h
+                accelerator COMMAND_KEY, :shift, :h
                 selection bind(game, :show_high_scores)
               }
               menu_item {
                 text '&Clear'
-                accelerator :command, :shift, :c
+                accelerator COMMAND_KEY, :shift, :c
                 
                 on_widget_selected {
                   game.clear_high_scores!
@@ -91,24 +93,24 @@ class Tetris
             text '&Options'
             menu_item(:check) {
               text '&Beeping'
-              accelerator :command, :b
+              accelerator COMMAND_KEY, :b
               selection bind(game, :beeping)
             }
             menu {
               text 'Up Arrow'
               menu_item(:radio) {
                 text '&Instant Down'
-                accelerator :command, :shift, :i
+                accelerator COMMAND_KEY, :shift, :i
                 selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
               }
               menu_item(:radio) {
                 text 'Rotate &Right'
-                accelerator :command, :shift, :r
+                accelerator COMMAND_KEY, :shift, :r
                 selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
               }
               menu_item(:radio) {
                 text 'Rotate &Left'
-                accelerator :command, :shift, :l
+                accelerator COMMAND_KEY, :shift, :l
                 selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
               }
             }
@@ -119,7 +121,7 @@ class Tetris
             
             menu_item {
               text '&About'
-              accelerator :command, :shift, :a
+              accelerator COMMAND_KEY, :shift, :a
               
               on_widget_selected {
                 parent_custom_shell&.show_about_dialog

data/samples/hello/hello_canvas_animation.rb

@@ -25,7 +25,7 @@ shell {
   text 'Hello, Canvas Animation!'
   minimum_size 800, 420
 
-  canvas {
+  canvas(:double_buffered) {
     animation {
       every 0.01 # in seconds (one hundredth)
             

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.4.2
+  version: 4.18.4.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement