glimmer-dsl-swt 4.20.13.12 → 4.20.13.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec3c88dee81e6625c208ce0fe97f02984b27faa107bb5b1c0667612ada04cae
-  data.tar.gz: 4221c07f12ba4d2de558223a60546218a530c02cdb34e0d6c1a03b19b7a4ba6c
+  metadata.gz: dcbde18522dded899e463ea9f5e1d94325707b9403392717e624b7475e6e6725
+  data.tar.gz: 53c6de1396110f443afca9378642c66b8813e7fd329ba3f860951ccc4ec11793
 SHA512:
-  metadata.gz: 1c555e4e44ae1ca8933a35d2316bc8711d4888483b0f6ff3a90d372e7f25f3b66b9ac114239f5970e8f72f69ad2aa1358dc0833d96a8689c5d14b0fa6aba79ef
-  data.tar.gz: 363b079ba036a24e47a6919bc72d1dbaa4396586ae814ccb77cde3917b6ca917c5e5fe295dc17ff9339cfa9dfb526ee60e936af4e4d66f081901727017712f4e
+  metadata.gz: 186a4ebb62c01d54c91470623ea689e52b984e5fb01137bc78cc3113a2599fbfe20113b40e1afaa1adf1648af08e6df2f3bada47bb8afd2ab73730a1eb218a2b
+  data.tar.gz: e837367673f9b8964d97e34e5a1aa4162618b312aadf341808e3a50653dadaf1f387b4d7845caf584519c24a1d7c6b3cc9aa59c7f0f4be574875f3ac579be98e

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+### 4.20.13.16
+
+- Fix issue with setting app name (via `Display.app_name=`) when app is not packaged (always gets set to Glimmer)
+- Fix Hello, Custom Shell! sample
+
+### 4.20.13.15
+
+- Battleship elaborate sample
+
+### 4.20.13.14
+
+- Connect 4 elaborate sample
+
+### 4.20.13.13
+
+- Parking elaborate sample
+- Support shape contain?/include? when a transform (e.g. rotation) is applied
+
 ### 4.20.13.12
 
 - Fixed issue with dragged shapes having `drag_source true` not going back to original position when not dropped in a target if they were part of a composite shape

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.20.13.12
+# [<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.20.13.16
 ## 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)
@@ -15,7 +15,7 @@
 [<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.20.13.12 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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 (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.16 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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).
 
@@ -199,11 +199,6 @@ Glimmer app:
 
 [![Math Bowling App Screenshot](https://raw.githubusercontent.com/AndyObtiva/MathBowling/master/Math-Bowling-Screenshot.png)](https://github.com/AndyObtiva/MathBowling)
 
-**Note:** I offer Glimmer DSL for SWT as a free and open-source [Ruby Gem](https://rubygems.org/gems/glimmer-dsl-swt) that represents my interests in Ruby Programming, Desktop GUI application development with SWT, Object Oriented Design, Design Patterns, and Software Architecture.
-Additionally, I am sharing my professional experience and expertise in Eclipse SWT given that I am an [EclipseCon](http://andymaleh.blogspot.com/2007/03/eclipsecon-2007-day-3.html)/[EclipseWorld](http://andymaleh.blogspot.com/2008/11/eclipseworld-2008-highlights.html) presenter and have built professional applications in SWT/JFace/RCP for Obtiva and the Pampered Chef in the past. This is also done in the hopes that it would indirectly bring me work in a field I am extremely passionate about.
-That said, please keep in mind that I myself am learning topics in Software Engineering too everyday, including newer editions of SWT and JRuby, which seem to pop up every quarter.
-If you see anything that needs to be improved, please do not hesitate to contact me on [Gitter](https://gitter.im/AndyObtiva/glimmer) or submit [Issues](https://github.com/AndyObtiva/glimmer-dsl-swt/issues)/[Pull-Requests](https://github.com/AndyObtiva/glimmer-dsl-swt/pulls).
-
 ## Table of contents
 
 - [Glimmer (JRuby Desktop Development GUI Framework)](#jruby-desktop-development-gui-framework)
@@ -326,7 +321,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.12
+jgem install glimmer-dsl-swt -v 4.20.13.16
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,7 +349,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.20.13.12'
+gem 'glimmer-dsl-swt', '~> 4.20.13.16'
 ```
 
 And, then run:
@@ -375,7 +370,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.12
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.16
       
 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.20.13.12
+4.20.13.16

data/docs/reference/GLIMMER_SAMPLES.md

@@ -60,11 +60,14 @@
     - [User Profile](#user-profile)
     - [Login](#login)
     - [Tic Tac Toe](#tic-tac-toe)
+    - [Connect 4](#connect-4)
     - [Contact Manager](#contact-manager)
     - [Game of Life](#game-of-life)
     - [Glimmer Tetris](#glimmer-tetris)
     - [Klondike Solitaire](#klondike-solitaire)
+    - [Battleship](#battleship)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
+    - [Parking](#parking)
     - [Stock Ticker](#stock-ticker)
     - [Metronome](#metronome)
     - [Weather](#weather)
@@ -72,6 +75,7 @@
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
     - [Timer](#timer)
+    - [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire)
 - [License](#license)
 
 ## Samples
@@ -1044,6 +1048,34 @@ Code:
 ![Tic Tac Toe In Progress](/images/glimmer-tic-tac-toe-in-progress.png)
 ![Tic Tac Toe Game Over](/images/glimmer-tic-tac-toe-game-over.png)
 
+#### Connect 4
+
+This sample demonstrates a widget/shape hybrid MVC application, including GUI layout and data-binding.
+
+Code:
+
+[samples/elaborate/connect4.rb](/samples/elaborate/connect4.rb)
+
+Connect 4
+
+![Connect 4](/images/glimmer-connect4.png)
+
+Connect 4 - About To Drop
+
+![Connect 4 About To Drop](/images/glimmer-connect4-about-to-drop.png)
+
+Connect 4 - Dropped Coin
+
+![Connect 4 Dropped Coin](/images/glimmer-connect4-dropped-coin.png)
+
+Connect 4 - Player 1 Wins (keeps the coin about to drop visual cue)
+
+![Connect 4 Player 1 Wins](/images/glimmer-connect4-player1-wins.png)
+
+Connect 4 - Game Over Message Box
+
+![Connect 4 Game Over Message Box](/images/glimmer-connect4-game-over-dialog.png)
+
 #### Contact Manager
 
 This sample demonstrates table data-binding, sorting, filtering, GUI layout, MVP pattern, and test-driven development (has [specs](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/spec/samples/elaborate/contact_manager/contact_manager_presenter_spec.rb)).
@@ -1074,7 +1106,7 @@ Contact Manager - Edit Done
 
 #### Game of Life
 
-This sample demonstrates how to build an interactive canvas-based visualization of Conway's Game of Life (test-first), taking advantage of data-binding and multi-threading.
+This sample demonstrates how to build an interactive canvas-based visualization of Conway's Game of Life ([test-first](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/spec/samples/elaborate/game_of_life/model/grid_spec.rb)), taking advantage of data-binding and multi-threading.
 
 Code:
 
@@ -1112,7 +1144,7 @@ Code:
 
 #### Klondike Solitaire
 
-This sample demonstrates how to build an interactive card game with MVC architecture, canvas, custom-shapes, data-binding, observers, and drag & drop.
+This sample demonstrates how to build an interactive card game with MVC architecture, canvas, custom-shapes, data-binding, observers, and canvas shape drag & drop.
 
 Code:
 
@@ -1122,6 +1154,26 @@ Code:
 
 ![Klondike Solitaire Played](/images/glimmer-klondike-solitaire-played.png)
 
+Check out a souped up large-card-size packaged version of the game in the [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire) external sample.
+
+#### Battleship
+
+This sample demonstrates how to build an interactive board game with A.I., MVC architecture, hybrid canvas widget/shape approach, custom-widgets, data-binding, observers, and widget drag & drop.
+
+Code:
+
+[samples/elaborate/battleship.rb](/samples/elaborate/battleship.rb)
+
+![Battleship](/images/glimmer-battleship.png)
+
+![Battleship Placement](/images/glimmer-battleship-placement.png)
+
+![Battleship Ready for Battle](/images/glimmer-battleship-ready-for-battle.png)
+
+![Battleship Won](/images/glimmer-battleship-won.png)
+
+![Battleship Game Over](/images/glimmer-battleship-game-over.png)
+
 #### Mandelbrot Fractal
 
 This sample demonstrates how to render canvas graphics with multi-threaded processing taking advantage of all CPU cores and doing background processing of images.
@@ -1148,6 +1200,28 @@ Code:
 
 ![Mandelbrot Fractal Help Menu](/images/glimmer-mandelbrot-menu-help.png)
 
+#### Parking
+
+This sample demonstrates how to use method-based custom shapes and how to take advantage of transforms (e.g. rotation).
+
+It enables booking a parking spot at the entrance of a building's parking, which in a real scenario would have prompted for payment too.
+
+Code:
+
+[samples/elaborate/parking.rb](/samples/elaborate/parking.rb)
+
+Parking
+
+![Parking](/images/glimmer-parking.png)
+
+Parking Floor 4
+
+![Parking Floor 4](/images/glimmer-parking-floor4.png)
+
+Parking Booked
+
+![Parking Booked](/images/glimmer-parking-booked.png)
+
 #### Stock Ticker
 
 This sample demonstrates a Stock Ticker that generates random stock price data for 4 different stocks and provides 4 different tab views of the graphed data using the [Canvas Path DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-path-dsl). It leverages a thread that runs in the background and ticks the stocks to generate random new stock prices before amending the graphed paths with them.
@@ -1223,6 +1297,14 @@ Gladiator is a good demonstration of:
 
 [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-timer/master/glimmer-timer-screenshot.png" />](https://github.com/AndyObtiva/glimmer-cs-timer)
 
+#### Glimmer Klondike Solitaire
+
+This is a souped up version of the Klondike Solitaire elaborate sample, which is built as an external application to enable packaging as a native executable installer. Enjoy!
+
+[<img alt="Glimmer Klondike Solitaire Icon" src="https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/package/linux/Glimmer%20Klondike%20Solitaire.png" height=40 /> Glimmer Klondike Solitaire](https://github.com/AndyObtiva/glimmer_klondike_solitaire)
+
+![Glimmer Klondike Solitaire](https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/images/glimmer-klondike-solitaire.png)
+
 ## License
 
 [MIT](LICENSE.txt)

data/lib/glimmer-dsl-swt.rb

@@ -38,6 +38,7 @@ require 'super_module'
 require 'date'
 require 'facets/string/capitalized'
 require 'facets/hash/symbolize_keys'
+require 'matrix'
 
 # Internal requires
 require 'ext/glimmer/config'

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

@@ -62,6 +62,7 @@ module Glimmer
           # Optimize further by having a collection of disposable_shapes independent of shapes, which is much smaller and only has shapes that require disposal (shapes with patterns or image)
           shapes.dup.each {|s| s.dispose(dispose_images: dispose_images, dispose_patterns: dispose_patterns) } if requires_shape_disposal?
         end
+        alias dispose_shapes clear_shapes
         
         def paint_pixel_by_pixel(width = nil, height = nil, &each_pixel_color)
           if @image_double_buffered

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

@@ -216,6 +216,7 @@ module Glimmer
         # Subclasses (like polygon) may override to indicate if a point x,y coordinates falls inside the shape
         # some shapes may choose to provide a fuzz factor to make usage of this method for mouse clicking more user friendly
         def contain?(x, y)
+          x, y = inverse_transform_point(x, y)
           # assume a rectangular filled shape by default (works for several shapes like image, text, and focus)
           x.between?(self.absolute_x, self.absolute_x + calculated_width.to_f) && y.between?(self.absolute_y, self.absolute_y + calculated_height.to_f)
         end
@@ -232,6 +233,24 @@ module Glimmer
           included = include?(x, y)
           included ||= expanded_shapes.reject {|shape| shape == except_child}.detect { |shape| shape.include?(x, y) }
         end
+        
+        # if there is a transform, invert it and apply on x, y point coordinates
+        def inverse_transform_point(x, y)
+          current_transform = (transform || parent_shape_containers.map(&:transform).first)&.first
+          if current_transform
+            transform_array = [1,2,3,4,5,6].to_java(:float)
+            current_transform.getElements(transform_array)
+            inverse_transform = TransformProxy.new(DisplayProxy.instance.swt_display, *transform_array.to_a)
+            inverse_transform_array = [1,2,3,4,5,6].to_java(:float)
+            inverse_transform.getElements(inverse_transform_array)
+            matrix = Matrix[[inverse_transform_array[0], inverse_transform_array[1]], [inverse_transform_array[2], inverse_transform_array[3]]]
+            result = matrix * Matrix.column_vector([x, y])
+            x, y = result.to_a.flatten
+            x += inverse_transform_array[5]
+            y += inverse_transform_array[4]
+          end
+          [x, y]
+        end
 
         # Indicates if a shape's x, y, width, height differ from its bounds calculation (e.g. arc / polygon)
         def irregular?

data/lib/glimmer/swt/custom/shape/arc.rb

@@ -53,6 +53,7 @@ module Glimmer
             
           # checks if shape contains the point denoted by x and y
           def contain?(x, y)
+            x, y = inverse_transform_point(x, y)
             geometry.contains(x, y)
           end
           
@@ -60,6 +61,7 @@ module Glimmer
             if filled?
               contain?(x, y)
             else
+              x, y = inverse_transform_point(x, y)
               # give it some fuzz to allow a larger region around the drawn oval to accept including a point (helps with mouse clickability on a shape)
               outer_shape_geometry = java.awt.geom.Arc2D::Double.new(self.absolute_x, self.absolute_y, calculated_width + 3, calculated_height + 3, start_angle, arc_angle, java.awt.geom.Arc2D::PIE)
               inner_shape_geometry = java.awt.geom.Arc2D::Double.new(self.absolute_x, self.absolute_y, calculated_width - 3, calculated_height - 3, start_angle, arc_angle, java.awt.geom.Arc2D::PIE)

data/lib/glimmer/swt/custom/shape/cubic.rb

@@ -55,6 +55,7 @@ module Glimmer
         
           # checks if drawn or filled rectangle includes the point denoted by x and y (if drawn, it only returns true if point lies on the edge)
           def include?(x, y, filled: nil)
+            x, y = inverse_transform_point(x, y)
             filled = filled? if filled.nil?
             makeshift_gc = org.eclipse.swt.graphics.GC.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
             swt_path = org.eclipse.swt.graphics.Path.new(Glimmer::SWT::DisplayProxy.instance.swt_display)

data/lib/glimmer/swt/custom/shape/line.rb

@@ -123,6 +123,7 @@ module Glimmer
           end
           
           def include?(x, y)
+            x, y = inverse_transform_point(x, y)
             # TODO must account for line width
             Line.include?(absolute_x1, absolute_y1, absolute_x2, absolute_y2, x, y)
           end

data/lib/glimmer/swt/custom/shape/oval.rb

@@ -39,6 +39,7 @@ module Glimmer
           
           # checks if shape contains the point denoted by x and y
           def contain?(x, y)
+            x, y = inverse_transform_point(x, y)
             shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.absolute_x, self.absolute_y, calculated_width, calculated_height)
             shape_geometry.contains(x, y)
           end
@@ -48,6 +49,7 @@ module Glimmer
             if filled?
               contain?(x, y)
             else
+              x, y = inverse_transform_point(x, y)
               # give it some fuzz to allow a larger region around the drawn oval to accept including a point (helps with mouse clickability on a shape)
               outer_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.absolute_x - 3, self.absolute_y - 3, calculated_width + 6, calculated_height + 6)
               inner_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.absolute_x + 3, self.absolute_y + 3, calculated_width - 6, calculated_height - 6)

data/lib/glimmer/swt/custom/shape/path.rb

@@ -61,17 +61,13 @@ module Glimmer
             end
           end
           
-          def contain?(x, y)
-            makeshift_gc = org.eclipse.swt.graphics.GC.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
-            @swt_path.contains(x.to_f, y.to_f, makeshift_gc, false)
-          end
-          
           def contain?(x, y)
             include?(x, y, filled: true)
           end
         
           # checks if drawn or filled rectangle includes the point denoted by x and y (if drawn, it only returns true if point lies on the edge)
           def include?(x, y, filled: nil)
+            x, y = inverse_transform_point(x, y)
             filled = filled? if filled.nil?
             makeshift_gc = org.eclipse.swt.graphics.GC.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
             @swt_path.contains(x.to_f, y.to_f, makeshift_gc, !filled)

data/lib/glimmer/swt/custom/shape/point.rb

@@ -49,6 +49,7 @@ module Glimmer
           end
           
           def include?(x, y)
+            x, y = inverse_transform_point(x, y)
             # give it some fuzz (helps makes mouse clicking easier)
             x.to_i.between?(self.absolute_x.to_i - 2, self.absolute_x.to_i + 2) && y.to_i.between?(self.absolute_y.to_i - 2, self.absolute_y.to_i + 2)
           end

data/lib/glimmer/swt/custom/shape/polygon.rb

@@ -152,6 +152,7 @@ module Glimmer
           end
           
           def contain?(x, y)
+            x, y = inverse_transform_point(x, y)
             geometry.contains(x, y)
           end
 
@@ -159,6 +160,7 @@ module Glimmer
             if filled?
               contain?(x, y)
             else
+              x, y = inverse_transform_point(x, y)
               comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
               comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
             end

data/lib/glimmer/swt/custom/shape/polyline.rb

@@ -130,6 +130,7 @@ module Glimmer
           end
           
           def include?(x, y)
+            x, y = inverse_transform_point(x, y)
             comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
             comparison_lines.pop # ignore last pair since you don't want to compare last point with first point
             comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}

data/lib/glimmer/swt/custom/shape/rectangle.rb

@@ -85,6 +85,7 @@ module Glimmer
             if filled?
               contain?(x, y)
             else
+              x, y = inverse_transform_point(x, y)
               comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
               comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
             end

data/lib/glimmer/swt/display_proxy.rb

@@ -200,12 +200,14 @@ module Glimmer
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
           if OBSERVED_MENU_ITEMS.include?(event_name) && OS.mac?
-            system_menu = swt_display.getSystemMenu
-            menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-            listener = ConcreteListener.new(&block)
-            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
-            Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
-            display_mac_event_registration
+            auto_exec do
+              system_menu = swt_display.getSystemMenu
+              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+              listener = ConcreteListener.new(&block)
+              display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
+              Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+              display_mac_event_registration
+            end
           end
         end
       end

data/lib/glimmer/ui/custom_shell.rb

@@ -30,8 +30,8 @@ module Glimmer
       
       class << self
         def launch(*args, &content)
+          launched_custom_shell = send(keyword, *args, &content)
           auto_exec do
-            launched_custom_shell = send(keyword, *args, &content)
             launched_custom_shell.swt_widget.set_data('launched', true)
             launched_custom_shell.open
           end

data/lib/glimmer/ui/custom_widget.rb

@@ -176,16 +176,16 @@ module Glimmer
         options ||= {}
         @options = self.class.options.merge(options)
         @content = Util::ProcTracker.new(content) if content
-        execute_hook('before_body')
+        auto_exec { execute_hook('before_body') }
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
-        @body_root = instance_exec(&body_block)
+        @body_root = auto_exec { instance_exec(&body_block) }
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         @swt_widget = @body_root.swt_widget
         auto_exec do
           @swt_widget.set_data('custom_widget', self)
         end
-        execute_hook('after_body')
+        auto_exec { execute_hook('after_body') }
         auto_exec do
           @dispose_listener_registration = @body_root.on_widget_disposed do
             observer_registrations.compact.each(&:deregister)