glimmer-dsl-swt 4.20.0.4 → 4.20.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c2288c83bde07fd0e5db24556bd986b52c868db3db8dffd1f4cb4a82bd8085
-  data.tar.gz: 33f8584fd2ce2efac14d188a5d4753f6a807851529d663b1dbab1b57a4838db8
+  metadata.gz: b539c452b30e337ec632c8e4e034a2ef0585000eb7fdad70afe77ec5851f2d49
+  data.tar.gz: a562eca963b5d39cbb8c7b56219dae2bc23ad93e2f8b76cb1853c38077e07c93
 SHA512:
-  metadata.gz: cbb93aa7d256686e409becd45a4e4a8bc4ca2597923a8b66118f3711aa8922a1b5d2b6ad62d615b6affdcf430533b1539118313c5eea95c81f94766c21a90486
-  data.tar.gz: 1c79ebfc57bf52c2d586ce65badaf0643ce37c534261943597d308bbd702e1fa01840f9d75164c80e9597c8e73f26d438ec95528321a8ba8f16b0d2048412814
+  metadata.gz: cea713cd788b554522e83e7e72da27e942f962fb3996a415ed2d06b803f6a95345265a7e81d9fcd3dc7e6567b4951fdee1dbeedb908ecb146cdcfb70f17c6f7f
+  data.tar.gz: 4a15d50266466f54713a440f563d203137c5ea9a2f290d2f6f2e44f752a70ddcc772d901152aeb6fc31957b7d7d9cf6ef04df82f45db4a3964c14ed467a32c94

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+### 4.20.0.5
+
+- Hello, Text! sample
+- Timer elaborate sample (copied and simplified from external sample)
+- Calculator elaborate sample (copied and simplified from external sample)
+- Fixed issue relating to cleaning up display listeners
+
 ### 4.20.0.4
 
 - Weather elaborate sample

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.0.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.0.5
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -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.0.4 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.0.5 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).
 
 **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 an early alpha, so default back to `bind` whenever needed).
 
@@ -341,7 +341,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.0.4
+jgem install glimmer-dsl-swt -v 4.20.0.5
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -369,7 +369,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.0.4'
+gem 'glimmer-dsl-swt', '~> 4.20.0.5'
 ```
 
 And, then run:
@@ -390,7 +390,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.0.4
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.0.5
       
 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.0.4
+4.20.0.5

data/docs/reference/GLIMMER_SAMPLES.md

@@ -2,6 +2,7 @@
   - [Hello Samples](#hello-samples)
     - [Hello, World!](#hello-world)
     - [Hello, Button!](#hello-button)
+    - [Hello, Text!](#hello-text)
     - [Hello, Composite!](#hello-composite)
     - [Hello, Layout!](#hello-layout)
     - [Hello, Shell!](#hello-shell)
@@ -116,6 +117,18 @@ Hello, Button! Incremented 7 times!
 
 ![Hello Button Incremented](/images/glimmer-hello-button-incremented.png)
 
+#### Hello, Text!
+
+This sample demonstrates the use of the `text` widget in Glimmer, including data-binding (e.g. via the `<=>` operator) and event handling.
+
+Code:
+
+[samples/hello/hello_text.rb](/samples/hello/hello_text.rb)
+
+Hello, Text!
+
+![Hello Text](/images/glimmer-hello-text.png)
+
 #### Hello, Composite!
 
 This sample demonstrates the `composite` widget, which is simply used as a container for visual layout and organization.

data/docs/reference/GLIMMER_STYLE_GUIDE.md

@@ -7,8 +7,9 @@
 - Widget properties are declared with underscored lowercase versions of the SWT properties
 - Widget property declarations always have arguments and never take a block
 - Widget property arguments are never wrapped inside parentheses
-- Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form
+- Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form. Their multi-line blocks rely on the `do; end` style.
 - Widget listeners are always followed by a block using curly braces (Only when declared in DSL. When invoked on widget object directly outside of GUI declarations, standard Ruby conventions apply)
 - Data-binding is done via `bind` keyword, which always takes arguments wrapped in parentheses
-- Custom widget body, before_body, and after_body blocks open their blocks and close them with curly braces.
-- Custom widgets receive additional arguments to SWT style called options. These are passed as the last argument inside the parentheses, a hash of option names pointing to values.
+- Custom widget `body`, `before_body`, and `after_body` blocks open their blocks and close them with curly braces.
+- Custom widgets receive additional keyword arguments called options, which come after the SWT styles.
+- Pure logic multi-line blocks that do not constitute GUI DSL view elements (such as `Thread.new`, `loop`, `each` and `observe` blocks) rely on the `do; end` style to clearly separate logic code from view code.

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

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2021 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
@@ -7,10 +7,10 @@
 # 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

data/lib/glimmer/swt/display_proxy.rb

@@ -42,7 +42,7 @@ module Glimmer
       
       OBSERVED_MENU_ITEMS = ['about', 'preferences', 'quit']
       
-      class FilterListener
+      class ConcreteListener
         include org.eclipse.swt.widgets.Listener
         
         def initialize(&listener_block)
@@ -194,15 +194,17 @@ module Glimmer
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
-          add_swt_event_filter(constant_name, &block)
+          swt_event_reg = add_swt_event_filter(constant_name, &block)
+          Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(swt_event_reg)
+          swt_event_reg
         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}"]}
-            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], &block)
-            # TODO enable this code and test on the Mac to ensure automatic cleanup of mac event registrations in custom widgets
-#             Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+            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
@@ -210,15 +212,16 @@ module Glimmer
 
       def add_swt_event_filter(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_display.addFilter(event_type, FilterListener.new(&block))
+        swt_listener = ConcreteListener.new(&block)
+        @swt_display.addFilter(event_type, swt_listener)
         #WidgetListenerProxy.new(@swt_display.getListeners(event_type).last)
         WidgetListenerProxy.new(
           swt_display: @swt_display,
           event_type: event_type,
           filter: true,
-          swt_listener: block,
+          swt_listener: swt_listener,
           widget_add_listener_method: 'addFilter',
-          swt_listener_class:  FilterListener,
+          swt_listener_class:  ConcreteListener,
           swt_listener_method: 'handleEvent'
         )
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -838,7 +838,7 @@ module Glimmer
           widget_listener_proxy = nil
           safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
           @swt_widget.addListener(event_type, &safe_block)
-          widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
+          WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
         end
       end
 

data/lib/glimmer/ui/custom_shell.rb

@@ -31,9 +31,9 @@ module Glimmer
       class << self
         def launch(*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
+            launched_custom_shell = send(keyword, *args, &content)
+            launched_custom_shell.swt_widget.set_data('launched', true)
+            launched_custom_shell.open
           end
         end
       end

data/lib/glimmer/ui/custom_widget.rb

@@ -186,8 +186,11 @@ module Glimmer
           @swt_widget.set_data('custom_widget', self)
         end
         execute_hook('after_body')
-        @dispose_listener_registration = @body_root.on_widget_disposed do
-          observer_registrations.each(&:deregister)
+        auto_exec do
+          @dispose_listener_registration = @body_root.on_widget_disposed do
+            observer_registrations.compact.each(&:deregister)
+            observer_registrations.clear
+          end
         end
       end
       

data/samples/elaborate/calculator.rb

@@ -0,0 +1,116 @@
+require 'glimmer-dsl-swt'
+require 'bigdecimal'
+
+require_relative 'calculator/model/presenter'
+
+# This sample demonstrates use of MVP (Model-View-Presenter) Architectural Pattern
+# to data-bind View widgets to object-oriented Models taking advantage of design patterns
+# like Command Design Pattern.
+class Calculator
+  include Glimmer::UI::CustomShell
+  
+  BUTTON_FONT = {height: 14}
+  BUTTON_FONT_OPERATION = {height: 18}
+  BUTTON_FONT_BIG = {height: 28}
+
+  attr_reader :presenter
+
+  before_body {
+    @presenter = Model::Presenter.new
+    
+    Display.setAppName('Glimmer Calculator')
+    
+    display {
+      on_swt_keydown { |key_event|
+        char = key_event.character.chr rescue nil
+        @presenter.press(char)
+      }
+      
+      on_about {
+        display_about_dialog
+      }
+    }
+  }
+
+  body {
+    shell {
+      grid_layout 4, true
+      
+      minimum_size (OS.mac? ? 320 : (OS.windows? ? 390 : 520)), 240
+      text "Glimmer Calculator"
+      
+      on_shell_closed do
+        @presenter.purge_command_history
+      end
+      
+      # Setting styled_text to multi in order for alignment options to activate
+      styled_text(:multi, :wrap, :border) {
+        text bind(@presenter, :result)
+        alignment swt(:right)
+        right_margin 5
+        font height: 40
+        layout_data(:fill, :fill, true, true) {
+          horizontal_span 4
+        }
+        editable false
+        caret nil
+      }
+      command_button('AC')
+      operation_button('÷')
+      operation_button('×')
+      operation_button('−')
+      (7..9).each { |number|
+        number_button(number)
+      }
+      operation_button('+', font: BUTTON_FONT_BIG, vertical_span: 2)
+      (4..6).each { |number|
+        number_button(number)
+      }
+      (1..3).each { |number|
+        number_button(number)
+      }
+      command_button('=', font: BUTTON_FONT_BIG, vertical_span: 2)
+      number_button(0, horizontal_span: 2)
+      operation_button('.')
+    }
+  }
+  
+  def number_button(number, options = {})
+    command_button(number, options)
+  end
+  
+  def operation_button(operation, options = {})
+    command_button(operation, options.merge(font: BUTTON_FONT_OPERATION))
+  end
+  
+  def command_button(command, options = {})
+    command = command.to_s
+    options[:font] ||= BUTTON_FONT
+    options[:horizontal_span] ||= 1
+    options[:vertical_span] ||= 1
+    
+    button { |proxy|
+      text command
+      font options[:font]
+      
+      layout_data(:fill, :fill, true, true) {
+        horizontal_span options[:horizontal_span]
+        vertical_span options[:vertical_span]
+      }
+      
+      on_widget_selected {
+        @presenter.press(command)
+      }
+    }
+  end
+
+  def display_about_dialog
+    message_box(body_root) {
+      text 'About'
+      message "Glimmer - Calculator\n\nCopyright (c) 2007-2021 Andy Maleh"
+    }.open
+  end
+
+end
+
+Calculator.launch

data/samples/elaborate/calculator/model/command.rb

@@ -0,0 +1,105 @@
+class Calculator
+  module Model
+    class Command
+      class << self
+        attr_accessor :number1, :number2, :operation
+           
+        # Keyword string representing calculator command (e.g. '+' for Add command)
+        # Subclasses must call to define a single keyword
+        def keyword(keyword_text)
+          Command.keyword_to_command_class_mapping[keyword_text] = self
+        end
+        
+        # Keyword string array representing calculator command (e.g. ('0'..'9').to_a)
+        # Subclasses must call to define multiple keywords
+        def keywords(*keyword_text_array)
+          keyword_text_array.flatten.each do |keyword_text|
+            keyword(keyword_text)
+          end
+        end
+        
+        def keyword_to_command_class_mapping
+          @keyword_to_command_class_mapping ||= {}
+        end
+      
+        def command_history
+          @command_history ||= []
+        end
+        
+        def purge_command_history
+          Command.command_history.clear
+          self.number1 = nil
+          self.number2 = nil
+          self.operation = nil
+        end
+      
+        def for(button)
+          command_class = keyword_to_command_class_mapping[button]
+          command_class&.new(button)&.tap do |command|
+            command.execute
+            command_history << command
+          end
+        end
+      end
+      
+      attr_reader :button
+      attr_accessor :result
+      
+      def initialize(button)
+        @button = button
+      end
+      
+      def number1
+        Command.number1
+      end
+      
+      def number1=(value)
+        Command.number1 = value.to_f
+      end
+      
+      def number2
+        Command.number2
+      end
+      
+      def number2=(value)
+        Command.number2 = value.to_f
+      end
+      
+      def operation
+        Command.operation
+      end
+      
+      def operation=(op)
+        Command.operation = op
+      end
+      
+      def last_result
+        last_command&.result
+      end
+      
+      def last_command
+        command_history.last
+      end
+      
+      def command_history
+        Command.command_history
+      end
+      
+      def execute
+        raise 'Not implemented! Please override in a subclass.'
+      end
+    end
+  end
+end
+
+# Dir[File.join(File.dirname(__FILE__), 'command', '**', '*.rb')].each {|f| require(f)} # disabled for Opal compatibility
+
+require_relative 'command/all_clear'
+require_relative 'command/equals'
+require_relative 'command/number'
+require_relative 'command/operation'
+require_relative 'command/point'
+require_relative 'command/operation/add'
+require_relative 'command/operation/divide'
+require_relative 'command/operation/multiply'
+require_relative 'command/operation/subtract'

data/samples/elaborate/calculator/model/command/all_clear.rb

@@ -0,0 +1,17 @@
+class Calculator
+  module Model
+    class Command
+      class AllClear < Command
+        keywords 'AC', 'c', 'C', 8.chr, 27.chr, 127.chr
+  
+        def execute
+          self.result = '0'
+          self.number1 = nil
+          self.number2 = nil
+          self.operation = nil
+          command_history.clear
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/equals.rb

@@ -0,0 +1,18 @@
+class Calculator
+  module Model
+    class Command
+      class Equals < Command
+        keywords '=', "\r"
+
+        def execute
+          if number1 && number2 && operation
+            self.result = operation.calculate.to_s
+            self.number1 = self.result
+          else
+            self.result = last_result || '0'
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/number.rb

@@ -0,0 +1,20 @@
+class Calculator
+  module Model
+    class Command
+      class Number < Command
+        keywords ('0'..'9').to_a
+              
+        def execute
+          self.result = last_result.nil? || (!last_command.is_a?(Number) && !last_command.is_a?(Point)) ? button : last_result + button
+          if operation.nil? || last_command.is_a?(Equals)
+            self.number1 = self.result
+            self.number2 = nil
+            self.operation = nil
+          else
+            self.number2 = self.result
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation.rb

@@ -0,0 +1,27 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        def execute
+          if number1 && number2 && operation && !last_command.is_a?(Equals)
+            self.result = operation.calculate.to_s
+            self.number1 = self.result
+          else
+            self.result = last_result || '0'
+            self.operation = self
+          end
+        end
+        
+        def calculate
+          calculation_result = BigDecimal.new(number1.to_s).send(operation_method, BigDecimal.new(number2.to_s)).to_f
+          calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+        end
+        
+        # Subclasses must implement to indicate operation method on number (e.g. :+ for addition)
+        def operation_method
+          raise 'Not implemented!'
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/add.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Add < Operation
+          keyword '+'
+          
+          def operation_method
+            :+
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/divide.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Divide < Operation
+          keywords '÷', '/'
+          
+          def operation_method
+            :/
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/multiply.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Multiply < Operation
+          keywords '×', '*'
+
+          def operation_method
+            :*
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/subtract.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Subtract < Operation
+          keywords '−', '-'
+          
+          def operation_method
+            :-
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/point.rb

@@ -0,0 +1,20 @@
+class Calculator
+  module Model
+    class Command
+      class Point < Command
+        keyword '.'
+
+        def execute
+          self.result = last_result.nil? || !last_command.is_a?(Number) ? '0.' : "#{last_result}."
+          if operation.nil? || last_command.is_a?(Equals)
+            self.number1 = self.result
+            self.number2 = nil
+            self.operation = nil
+          else
+            self.number2 = self.result
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/presenter.rb

@@ -0,0 +1,30 @@
+require_relative 'command'
+
+class Calculator
+  module Model
+    class Presenter
+      FORMATTER = {
+        nil   => '0',
+        'NaN' => 'Not a number'
+      }
+    
+      attr_accessor :result
+      
+      def initialize
+        self.result = '0'
+      end
+      
+      def press(button)
+        command = Command.for(button)
+        if command
+          new_result = command.result
+          self.result = FORMATTER[new_result] || new_result
+        end
+      end
+      
+      def purge_command_history
+        Command.purge_command_history
+      end
+    end
+  end
+end

data/samples/elaborate/tetris.rb

@@ -54,7 +54,7 @@ class Tetris
     Display.app_name = 'Glimmer Tetris'
 
     display {
-      @keyboard_down_listener = on_swt_keydown { |key_event|
+      on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
           game.down! if OS.mac?
@@ -82,7 +82,7 @@ class Tetris
 
       # 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|
+        on_swt_keyup { |key_event|
           case key_event.keyCode
           when swt(:arrow_down), 's'.bytes.first
             game.down!
@@ -91,11 +91,11 @@ class Tetris
       end
       
       # if running in app mode, set the Mac app about dialog (ignored in platforms)
-      @about_observer = on_about {
+      on_about {
         show_about_dialog
       }
       
-      @quit_observer = on_quit {
+      on_quit {
         exit(0)
       }
     }

data/samples/elaborate/timer.rb

@@ -0,0 +1,233 @@
+require 'glimmer-dsl-swt'
+require 'os'
+
+class Timer
+  include Glimmer::UI::CustomShell
+  
+  import 'javax.sound.sampled'
+
+  FILE_SOUND_ALARM = File.expand_path(File.join('timer', 'alarm1.wav'), __dir__)
+  COMMAND_KEY = OS.mac? ? :command : :ctrl
+      
+  ## Add options like the following to configure CustomShell by outside consumers
+  #
+  # options :title, :background_color
+  # option :width, default: 320
+  # option :height, default: 240
+
+  attr_accessor :countdown, :min, :sec
+
+  ## Use before_body block to pre-initialize variables to use in body
+  #
+  #
+  before_body {
+    Display.setAppName('Glimmer Timer')
+    
+    @display = display {
+      on_about {
+        display_about_dialog
+      }
+      on_preferences {
+        display_about_dialog
+      }
+    }
+
+    @min = 0
+    @sec = 0
+  }
+
+  ## Use after_body block to setup observers for widgets in body
+  #
+  after_body {
+    Thread.new {
+      loop {
+        sleep(1)
+        if @countdown
+          sync_exec {
+            @countdown_time = Time.new(1, 1, 1, 0, min, sec)
+            @countdown_time -= 1
+            self.min = @countdown_time.min
+            self.sec = @countdown_time.sec
+            if @countdown_time.min <= 0 && @countdown_time.sec <= 0
+              stop_countdown
+              play_countdown_done_sound
+            end
+          }
+        end
+      }
+    }
+  }
+
+  ## Add widget content inside custom shell body
+  ## Top-most widget must be a shell or another custom shell
+  #
+  body {
+    shell {
+      grid_layout # 1 column
+      
+      # Replace example content below with custom shell content
+      minimum_size (OS.windows? ? 214 : 200), 114
+      image File.join(APP_ROOT, 'package', 'windows', "Timer.ico") if OS.windows?
+      text "Glimmer Timer"
+
+      timer_menu_bar
+      
+      countdown_group
+    }
+  }
+  
+  def timer_menu_bar
+    menu_bar {
+      menu {
+        text '&Action'
+        
+        menu_item {
+          text '&Start'
+          accelerator COMMAND_KEY, 's'
+          enabled bind(self, :countdown, on_read: :!)
+          
+          on_widget_selected {
+            start_countdown
+          }
+        }
+        menu_item {
+          text 'St&op'
+          enabled bind(self, :countdown)
+          accelerator COMMAND_KEY, 'o'
+          
+          on_widget_selected {
+            stop_countdown
+          }
+        }
+        unless OS.mac?
+          menu_item(:separator)
+          menu_item {
+            text 'E&xit'
+            accelerator :alt, :f4
+            
+            on_widget_selected {
+              exit(0)
+            }
+          }
+        end
+      }
+      menu {
+        text '&Help'
+                    
+        menu_item {
+          text '&About'
+          accelerator COMMAND_KEY, :shift, 'a'
+          
+          on_widget_selected {
+            display_about_dialog
+          }
+        }
+      }
+    }
+  end
+  
+  def countdown_group
+    group {
+      # has grid layout with 1 column by default
+      text 'Countdown'
+      font height: 20
+
+      countdown_group_field_composite
+      
+      countdown_group_button_composite
+    }
+  end
+  
+  def countdown_group_field_composite
+    composite {
+      row_layout {
+        margin_width 0
+        margin_height 0
+      }
+      @min_spinner = spinner {
+        text_limit 2
+        digits 0
+        maximum 59
+        selection bind(self, :min)
+        enabled bind(self, :countdown, on_read: :!)
+        on_widget_default_selected {
+          start_countdown
+        }
+      }
+      label {
+        text ':'
+        font(height: 18) if OS.mac?
+      }
+      @sec_spinner = spinner {
+        text_limit 2
+        digits 0
+        maximum 59
+        selection bind(self, :sec)
+        enabled bind(self, :countdown, on_read: :!)
+        on_widget_default_selected {
+          start_countdown
+        }
+      }
+    }
+  end
+  
+  def countdown_group_button_composite
+    composite {
+      row_layout {
+        margin_width 0
+        margin_height 0
+      }
+      @start_button = button {
+        text '&Start'
+        enabled bind(self, :countdown, on_read: :!)
+        on_widget_selected {
+          start_countdown
+        }
+        on_key_pressed { |event|
+          start_countdown if event.keyCode == swt(:cr)
+        }
+      }
+      @stop_button = button {
+        text 'St&op'
+        enabled bind(self, :countdown)
+        on_widget_selected {
+          stop_countdown
+        }
+        on_key_pressed { |event|
+          stop_countdown if event.keyCode == swt(:cr)
+        }
+      }
+    }
+  end
+
+  def display_about_dialog
+    message_box(body_root) {
+      text 'About'
+      message "Glimmer Timer\n\nCopyright (c) 2007-2021 Andy Maleh"
+    }.open
+  end
+  
+  def start_countdown
+    self.countdown = true
+    @stop_button.swt_widget.set_focus
+  end
+
+  def stop_countdown
+    self.countdown = false
+    @min_spinner.swt_widget.set_focus
+  end
+
+  def play_countdown_done_sound
+    begin
+      file_or_stream = java.io.File.new(FILE_SOUND_ALARM)
+      audio_stream = AudioSystem.get_audio_input_stream(file_or_stream)
+      clip = AudioSystem.clip
+      clip.open(audio_stream)
+      clip.start
+    rescue => e
+      Glimmer::Config.logger.error e.full_message
+    end
+  end
+end
+
+Timer.launch

data/samples/elaborate/user_profile.rb

@@ -23,7 +23,9 @@ require 'glimmer-dsl-swt'
 
 include Glimmer
 
-shell {
+# A version of this was featured in a dzone article as an intro to Glimmer syntax:
+# https://dzone.com/articles/an-introduction-glimmer
+shell { |shell_proxy|
   text "User Profile"
 
   composite {
@@ -72,7 +74,7 @@ shell {
     button {
       text "close"
       layout_data :left, :center, true, true
-      on_widget_selected { exit(0) }
+      on_widget_selected { shell_proxy.close }
     }
   }
 }.open

data/samples/elaborate/weather.rb

@@ -19,10 +19,10 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'glimmer-dsl-swt'
 require 'net/http'
 require 'json'
 require 'facets/string/titlecase'
-require 'glimmer-dsl-swt'
 
 class Weather
   include Glimmer::UI::CustomShell

data/samples/hello/hello_cool_bar.rb

@@ -31,7 +31,7 @@ class HelloCoolBar
   end
   
   before_body {
-    self.font_size = '10'
+    self.font_size = '30'
   }
 
   body {
@@ -80,9 +80,9 @@ class HelloCoolBar
       
   
       label {
-        font height: 30
-        text bind(self, :operation)
-        text bind(self, :font_size)
+        font <= [self, :font_size, on_read: ->(size) { {height: size.to_i} }]
+        text <= [self, :operation]
+        text <= [self, :font_size]
       }
     }
   }

data/samples/hello/hello_text.rb

@@ -0,0 +1,120 @@
+require 'glimmer-dsl-swt'
+
+class HelloText
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :default, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
+  
+  before_body {
+    self.default = 'default is :border style'
+    self.center = 'centered'
+    self.left = 'left-aligned'
+    self.right = 'right-aligned'
+    self.password = 'password'
+    self.telephone = '555-555-5555'
+    self.read_only = 'Telephone area code is 555'
+    self.wrap = 'wraps if text content is too long like this example'
+    self.multi = "multi-line enables hitting enter,\nbut does not wrap by default"
+  }
+  
+  body {
+    shell {
+      grid_layout 2, false
+      
+      text 'Hello, Text!'
+      minimum_size 350, 100
+      
+      label {
+        text 'text'
+      }
+      text { # includes :border style by default
+        layout_data :fill, :center, true, false
+        text <=> [self, :default]
+      }
+      
+      label {
+        text 'text(:center, :border)'
+      }
+      text(:center, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :center]
+      }
+      
+      label {
+        text 'text(:left, :border)'
+      }
+      text(:left, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :left]
+      }
+      
+      label {
+        text 'text(:right, :border)'
+      }
+      text(:right, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :right]
+      }
+      
+      label {
+        text 'text(:password, :border)'
+      }
+      text(:password, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :password]
+      }
+      
+      label {
+        text 'text(:read_only, :border)'
+      }
+      text(:read_only, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :read_only]
+      }
+      
+      label {
+        text 'text with event handlers'
+      }
+      text {
+        layout_data :fill, :center, true, false
+        text <=> [self, :telephone]
+        
+        # this event kicks in just after the user typed and before modifying the text attribute value
+        on_verify_text do |verify_event|
+          new_text = verify_event.widget.text.clone
+          new_text[verify_event.start...verify_event.end] = verify_event.text
+          verify_event.doit = telephone?(new_text)
+        end
+        
+        # this event kicks in just after the text widget is verified and modified
+        on_modify_text do |modify_event|
+          self.read_only = "Telephone area code is #{modify_event.widget.text.gsub(/[^0-9]/, '')[0...3]}"
+        end
+      }
+      
+      label {
+        text 'text(:wrap, :border)'
+      }
+      text(:wrap, :border) {
+        layout_data(:fill, :center, true, false) {
+          width_hint 100
+        }
+        text <=> [self, :wrap]
+      }
+      
+      label {
+        text 'text(:multi, :border)'
+      }
+      text(:multi, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :multi]
+      }
+    }
+  }
+  
+  def telephone?(text)
+    !!text.match(/^\d{0,3}[-.\/]?\d{0,3}[-.\/]?\d{0,4}$/)
+  end
+end
+
+HelloText.launch

data/samples/hello/hello_tool_bar.rb

@@ -31,7 +31,7 @@ class HelloToolBar
   end
   
   before_body {
-    self.font_size = '10'
+    self.font_size = '30'
   }
 
   body {
@@ -76,9 +76,9 @@ class HelloToolBar
       }
   
       label {
-        font height: 30
-        text bind(self, :operation)
-        text bind(self, :font_size)
+        font <= [self, :font_size, on_read: ->(size) { {height: size.to_i} }]
+        text <= [self, :operation]
+        text <= [self, :font_size]
       }
     }
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.0.4
+  version: 4.20.0.5
 platform: ruby
 authors:
 - Andy Maleh
@@ -505,6 +505,19 @@ files:
 - lib/glimmer/ui/custom_shell.rb
 - lib/glimmer/ui/custom_widget.rb
 - lib/glimmer/util/proc_tracker.rb
+- samples/elaborate/calculator.rb
+- samples/elaborate/calculator/model/command.rb
+- samples/elaborate/calculator/model/command/all_clear.rb
+- samples/elaborate/calculator/model/command/command_history.rb
+- samples/elaborate/calculator/model/command/equals.rb
+- samples/elaborate/calculator/model/command/number.rb
+- samples/elaborate/calculator/model/command/operation.rb
+- samples/elaborate/calculator/model/command/operation/add.rb
+- samples/elaborate/calculator/model/command/operation/divide.rb
+- samples/elaborate/calculator/model/command/operation/multiply.rb
+- samples/elaborate/calculator/model/command/operation/subtract.rb
+- samples/elaborate/calculator/model/command/point.rb
+- samples/elaborate/calculator/model/presenter.rb
 - samples/elaborate/contact_manager.rb
 - samples/elaborate/contact_manager/contact.rb
 - samples/elaborate/contact_manager/contact_manager_presenter.rb
@@ -528,6 +541,9 @@ files:
 - samples/elaborate/tic_tac_toe.rb
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb
+- samples/elaborate/timer.rb
+- samples/elaborate/timer/alarm1.wav
+- samples/elaborate/timer/sounds/alarm1.wav
 - samples/elaborate/user_profile.rb
 - samples/elaborate/weather.rb
 - samples/hello/hello_browser.rb
@@ -588,6 +604,7 @@ files:
 - samples/hello/hello_tab.rb
 - samples/hello/hello_table.rb
 - samples/hello/hello_table/baseball_park.png
+- samples/hello/hello_text.rb
 - samples/hello/hello_tool_bar.rb
 - samples/hello/hello_tree.rb
 - samples/hello/hello_world.rb