glimmer-dsl-swt 4.22.0.0 → 4.22.1.0

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.22.0.0
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.22.1.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)
@@ -17,7 +17,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.22.0.0 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (please report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.1.0 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 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.
 
@@ -325,7 +325,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.22.0.0
+jgem install glimmer-dsl-swt -v 4.22.1.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -353,7 +353,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.22.0.0'
+gem 'glimmer-dsl-swt', '~> 4.22.1.0'
 ```
 
 And, then run:
@@ -376,7 +376,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.0.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.1.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.22.0.0
+4.22.1.0

data/docs/reference/GLIMMER_COMMAND.md

@@ -227,13 +227,13 @@ glimmer bin/greeter
 
 #### Desktopify
 
-Desktopify basically turns a website into a desktop application by wrapping the website within a [Browser Widget](#browser-widget).
+Desktopify basically turns a website into a desktop application by wrapping the website within a [Browser Widget](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#browser-widget).
 
 The desktopify app is similar to the standard scaffolded app. It can be extended and the [browser may even be instrumented](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html).
 
 The app even remembers your cookies if you log into the website, close the app, and reopen again.
 
-Note that on Linux, the default SWT browser, which runs on webkit, does not support HTML5 Video out of the box. If you need video support, open `Gemfile` after scaffolding and enable the line that has the `glimmer-cw-browser-chromium` gem then replace the `browser` in "app/views/snowboard_utah/app_view.rb" with `browser(:chromium)`
+Note that on Linux, the default SWT browser, which runs on webkit, does not support HTML5 Video out of the box. If you need video support on Linux, you may try the [JxBrowser](https://www.teamdev.com/jxbrowser) SWT widget instead, which embeds Chromium instead.
 
 Before you start, make sure you are in a JRuby environment with Glimmer gem installed as per "Direct Install" pre-requisites.
 

data/docs/reference/GLIMMER_CONFIGURATION.md

@@ -13,7 +13,7 @@ Example:
 ```ruby
 Glimmer::Config.logger.level = :debug
 ```
-This results in more verbose debug loggging to `STDOUT`, which is very helpful in troubleshooting Glimmer DSL syntax when needed.
+This results in more verbose debug logging to `STDOUT`, which is very helpful in troubleshooting Glimmer DSL syntax when needed.
 
 Example log:
 ```
@@ -37,9 +37,20 @@ To reset `logger` to the default instance, you may call `Glimmer::Config.reset_l
 
 All logging is done lazily via blocks (e.g. `logger.debug {message}`) to avoid affecting app performance with logging when below the configured logging level threshold.
 
-[Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) enhances Glimmer default logging support via the Ruby [`logging`](https://github.com/TwP/logging) gem, enabling buffered asynchronous logging in a separate thread, thus completely unhindering normal desktop app performance.
+Optionally, [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) enhances Glimmer default logging support via the Ruby [`logging`](https://github.com/TwP/logging) gem, enabling buffered asynchronous logging in a separate thread, thus completely unhindering normal desktop app performance.
 
-Other config options related to the [`logging`](https://github.com/TwP/logging) gem are mentioned below.
+You can alternatively use the [logging](https://github.com/TwP/logging) gem for asynchronous logging (note that it adds about 0.5 - 1.0 second to startup time) by adding the gem:
+```ruby
+gem 'logging', '>= 2.3.0', '< 3.0.0'
+```
+
+And, updating the logger type:
+```ruby
+require 'logging'
+Glimmer::Config.logger_type = :logging
+```
+
+Other config options related to the [logging](https://github.com/TwP/logging) gem are mentioned below.
 
 #### logging_devices
 

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -69,6 +69,7 @@ This guide should help you get started with Glimmer DSL for SWT. For more advanc
       - [Class-Based Custom Widget Example](#class-based-custom-widget-example)
     - [Custom Widget Lifecycle Hooks](#custom-widget-lifecycle-hooks)
     - [Lifecycle Hooks Example](#lifecycle-hooks-example)
+    - [Custom Widget Listeners](#custom-widget-listeners)
     - [Custom Widget API](#custom-widget-api)
     - [Content/Options Example](#contentoptions-example)
     - [Custom Widget Gotchas](#custom-widget-gotchas)
@@ -1107,6 +1108,8 @@ shell {
 }.open
 ```
 
+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 the [SWT Browser widget](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html) API.
 
 ### Widget Styles
@@ -3119,7 +3122,7 @@ Approach #1 is a casual Ruby-based approach. Approach #2 is the official Glimmer
 
 A developer might start with approach #1 to eliminate duplication in a view and later upgrade it to approach #2 when needing to export a custom widget to make it available in many views.
 
-Class-based Custom Widgets  a number of benefits over method-based custom widgets, such as built-in support for passing SWT style, nested block of extra widgets and properties, and `before_body`/`after_body` hooks.
+Class-based Custom Widgets offer a number of benefits over method-based custom widgets, such as built-in support for passing SWT style, nested block of extra widgets and properties, and `before_body`/`after_body` hooks.
 
 #### Simple Example
 
@@ -3217,6 +3220,100 @@ Notice how `Red::Composite` became `red__composite` with double-underscore, whic
 
 Keep in mind that namespaces are not needed to be specified if the Custom Widget class has a unique name, not clashing with a basic SWT widget or another custom widget name.
 
+#### Custom Widget Listeners
+
+If you need to declare a custom listener on a custom widget, you must override these methods:
+- `can_handle_observation_request?(event, &block)`: returns if an event is supported or delegates to super otherwise (to ensure continued support for built-in events)
+- `handle_observation_request(event, &block)`: handles event by storing the block in a list of block handlers to invoke at the right time in the custom widget code
+
+Example (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
+
+```ruby
+require 'glimmer-dsl-swt'
+
+# This class declares a `greeting_label` custom widget (by convention)
+class GreetingLabel
+  include Glimmer::UI::CustomWidget
+  
+  # multiple options without default values
+  options :name, :colors
+  
+  # single option with default value
+  option :greeting, default: 'Hello'
+  
+  # internal attribute (not a custom widget option)
+  attr_accessor :label_color
+  
+  def can_handle_observation_request?(event, &block)
+    event.to_s == 'on_color_changed' || super
+  end
+  
+  def handle_observation_request(event, &block)
+    if event.to_s == 'on_color_changed'
+      @color_changed_handlers ||= []
+      @color_changed_handlers << block
+    else
+      super
+    end
+  end
+  
+  before_body do
+    @font = {height: 24, style: :bold}
+    @label_color = :black
+  end
+  
+  after_body do
+    return if colors.nil?
+    
+    Thread.new {
+      colors.cycle { |color|
+        self.label_color = color
+        @color_changed_handlers&.each {|handler| handler.call(color)}
+        sleep(1)
+      }
+    }
+  end
+  
+  body {
+    # pass received swt_style through to label to customize (e.g. :center to center text)
+    label(swt_style) {
+      text "#{greeting}, #{name}!"
+      font @font
+      foreground <=> [self, :label_color]
+    }
+  }
+  
+end
+
+# including Glimmer enables the Glimmer DSL syntax, including auto-discovery of the `greeting_label` custom widget
+include Glimmer
+
+shell {
+  fill_layout :vertical
+  
+  minimum_size 215, 215
+  text 'Hello, Custom Widget!'
+  
+  # custom widget options are passed in a hash
+  greeting_label(name: 'Sean')
+  
+  # pass :center SWT style followed by custom widget options hash
+  greeting_label(:center, name: 'Laura', greeting: 'Aloha') #
+  
+  greeting_label(:right, name: 'Rick') {
+    # you can nest attributes under custom widgets just like any standard widget
+    foreground :red
+  }
+  
+  # the colors option cycles between colors for the label foreground every second
+  greeting_label(:center, name: 'Mary', greeting: 'Aloha', colors: [:red, :dark_green, :blue]) {
+    on_color_changed do |color|
+      puts "Label color changed: #{color}"
+    end
+  }
+}.open
+```
+
 #### Custom Widget API
 
 Custom Widgets have the following attributes available to call from inside the `#body` method:
@@ -4041,25 +4138,6 @@ You may run `glimmer` with the `--profile.graph` instead for a more detailed out
 
 Learn more at the [JRuby Performance Profile WIKI page](https://github.com/jruby/jruby/wiki/Profiling-JRuby).
 
-##### SWT Browser Style Options
-
-The `browser` widget can use a particular desktop browser by setting the SWT Style to:
-- `:webkit`: use the Webkit browser engine
-- `:chromium`: use the Chromium browser engine
-
-Example using the Chromium browser (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
-
-```ruby
-shell {
-  minimum_size 1024, 860
-  browser(:chromium) {
-    url 'http://brightonresort.com/about'
-  }
-}.open
-```
-
-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).
-
 ## License
 
 [MIT](LICENSE.txt)

data/docs/reference/GLIMMER_SAMPLES.md

@@ -78,6 +78,7 @@
     - [Stock Ticker](#stock-ticker)
     - [Metronome](#metronome)
     - [Weather](#weather)
+    - [Quarto](#quarto)
   - [External Samples](#external-samples)
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
@@ -1369,6 +1370,18 @@ Atlanta - Fahrenheit
 
 ![Atlanta F](/images/glimmer-weather-atlanta-fahrenheit.png)
 
+#### Quarto
+
+This sample is a classic game called [Quarto](https://en.gigamic.com/game/quarto-classic), which demonstrates Canvas Drag and Drop and Custom Shapes (`cylinder`, `cube`, and `message_box_panel`) in an MVC application.
+
+Code:
+
+[samples/elaborate/quarto.rb](/samples/elaborate/quarto.rb)
+
+Quarto
+
+![Quarto](/images/glimmer-quarto.png)
+
 ### External Samples
 
 #### Glimmer Calculator

data/lib/ext/glimmer/config.rb

@@ -59,6 +59,20 @@ module Glimmer
       end
       alias auto_sync_exec? auto_sync_exec
       
+      # allowed logger types are :logger (default) and :logging (logging gem supporting async logging)
+      # updating logger type value resets logger
+      def logger_type=(logger_type_class)
+        @@logger_type = logger_type_class
+        reset_logger!
+      end
+      
+      def logger_type
+        unless defined? @@logger_type
+          @@logger_type = :logger
+        end
+        @@logger_type
+      end
+      
       # Returns Logging Devices. Default is [:stdout, :syslog]
       def logging_devices
         unless defined? @@logging_devices
@@ -112,39 +126,42 @@ module Glimmer
         reset_logger!
       end
       
+      alias reset_logger_without_glimmer_dsl_swt! reset_logger!
       def reset_logger!
-        @first_time = !defined?(@@logger)
-        old_level = logger.level unless @first_time
-        self.logger = Logging.logger['glimmer'].tap do |logger|
-          logger.level = old_level || :error
-          appenders = []
-          appenders << Logging.appenders.stdout(logging_appender_options) if logging_devices.include?(:stdout)
-          appenders << Logging.appenders.stderr(logging_appender_options) if logging_devices.include?(:stderr)
-          if logging_devices.include?(:file)
-            require 'fileutils'
-            FileUtils.mkdir_p('log')
-            appenders << Logging.appenders.rolling_file('log/glimmer.log', logging_appender_options.merge(logging_device_file_options)) if logging_devices.include?(:file)
+        if logger_type == :logger
+          reset_logger_without_glimmer_dsl_swt!
+        else
+          require 'logging'
+          @first_time = !defined?(@@logger)
+          old_level = logger.level unless @first_time
+          self.logger = Logging.logger['glimmer'].tap do |logger|
+            logger.level = old_level || :error
+            appenders = []
+            appenders << Logging.appenders.stdout(logging_appender_options) if logging_devices.include?(:stdout)
+            appenders << Logging.appenders.stderr(logging_appender_options) if logging_devices.include?(:stderr)
+            if logging_devices.include?(:file)
+              require 'fileutils'
+              FileUtils.mkdir_p('log')
+              appenders << Logging.appenders.rolling_file('log/glimmer.log', logging_appender_options.merge(logging_device_file_options)) if logging_devices.include?(:file)
+            end
+            if Object.const_defined?(:Syslog) && logging_devices.include?(:syslog)
+              Syslog.close if Syslog.opened?
+              appenders << Logging.appenders.syslog('glimmer', logging_appender_options)
+            end
+            logger.appenders = appenders
           end
-          if Object.const_defined?(:Syslog) && logging_devices.include?(:syslog)
-            Syslog.close if Syslog.opened?
-            appenders << Logging.appenders.syslog('glimmer', logging_appender_options)
-          end
-          logger.appenders = appenders
         end
-        
       end
-      
     end
-    
   end
-  
 end
 
-Glimmer::Config.reset_logger! unless ENV['GLIMMER_LOGGER_ENABLED'].to_s.downcase == 'false'
 if ENV['GLIMMER_LOGGER_LEVEL']
-  # if glimmer log level is being overridden for debugging purposes, then disable async logging making logging immediate
-  Glimmer::Config.logging_appender_options = Glimmer::Config.logging_appender_options.merge(async: false, auto_flushing: 1, immediate_at: [:unknown, :debug, :info, :error, :fatal])
-  Glimmer::Config.logging_devices = [:stdout]
+  if Glimmer::Config.logger_type == :logging
+    # if glimmer log level is being overridden for debugging purposes, then disable async logging making logging immediate
+    Glimmer::Config.logging_appender_options = Glimmer::Config.logging_appender_options.merge(async: false, auto_flushing: 1, immediate_at: [:unknown, :debug, :info, :error, :fatal])
+    Glimmer::Config.logging_devices = [:stdout]
+  end
   begin
     puts "Adjusting Glimmer logging level to #{ENV['GLIMMER_LOGGER_LEVEL']}"
     Glimmer::Config.logger.level = ENV['GLIMMER_LOGGER_LEVEL'].strip

data/lib/glimmer/data_binding/observable_widget.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
@@ -25,9 +25,9 @@ module Glimmer
       # TODO see if it is worth it to eliminate duplication of method_missing
       # from WidgetProxy using a module
 
-      def method_missing(method, *args, &block)
-        method_name = method.to_s
-        if can_handle_observation_request?(method_name)
+      def method_missing(method_name, *args, &block)
+        method_name = method_name.to_s
+        if block && can_handle_observation_request?(method_name)
           handle_observation_request(method_name, &block)
         else
           super

data/lib/glimmer/data_binding/widget_binding.rb

@@ -38,11 +38,12 @@ module Glimmer
         @sync_exec = sync_exec
         @async_exec = async_exec
         SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @sync_exec, override_async_exec: @async_exec) do
-          if @widget.respond_to?(:on_widget_disposed)
+          if @widget.is_a?(Glimmer::SWT::WidgetProxy) && @widget.respond_to?(:on_widget_disposed)
             @widget.on_widget_disposed do |dispose_event|
               deregister_all_observables unless @widget.shell_proxy.last_shell_closing?
             end
           end
+          # TODO look into hooking on_shape_disposed without slowing down shapes in samples like Tetris
         end
       end
       

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

@@ -23,6 +23,7 @@ require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/dsl/observe_expression'
 require 'glimmer/ui/custom_widget'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -33,7 +34,7 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           observer_registration = super
-          Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(observer_registration)
+          Glimmer::SWT::DisplayProxy.current_custom_widgets_and_shapes.last&.observer_registrations&.push(observer_registration)
           observer_registration
         end
       end

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

@@ -34,7 +34,7 @@ module Glimmer
         
         def can_interpret?(parent, keyword, *args, &block)
           super and
-            (parent.nil? or parent.is_a?(Glimmer::SWT::Custom::Shape))
+            (parent.nil? or parent.is_a?(Glimmer::SWT::Custom::Shape) or parent.is_a?(Glimmer::UI::CustomShape))
         end
         
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/launcher.rb

@@ -89,8 +89,7 @@ module Glimmer
       def glimmer_lib
         unless @glimmer_lib
           @glimmer_lib = GLIMMER_LIB_GEM
-          glimmer_gem_listing = `jgem list #{GLIMMER_LIB_GEM}`.split("\n").map {|l| l.split.first}
-          if !glimmer_gem_listing.include?(GLIMMER_LIB_GEM) && File.exists?(GLIMMER_LIB_LOCAL)
+          if File.exists?(GLIMMER_LIB_LOCAL)
             @glimmer_lib = GLIMMER_LIB_LOCAL
             puts "[DEVELOPMENT MODE] (detected #{@glimmer_lib})"
           end
@@ -121,18 +120,21 @@ module Glimmer
           ENV[k] = v
         end
         the_glimmer_lib = glimmer_lib
-        if the_glimmer_lib == GLIMMER_LIB_LOCAL
-          require 'puts_debuggerer'
+        require 'puts_debuggerer' if the_glimmer_lib == GLIMMER_LIB_LOCAL
+        is_rake_task = !application.end_with?('.rb')
+        rake_tasks = []
+        if is_rake_task
+          load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile')) && caller.join("\n").include?('/bin/glimmer:')
+          require_relative 'rake_task'
+          rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
+           
+          # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
+          application = 'package[msi]' if application == 'packages'
+          
+          potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
+          application = potential_rake_task_parts[1]
+          rake_task_args = potential_rake_task_parts[2].split(',')
         end
-        require_relative 'rake_task'
-        rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
-         
-        # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
-        application = 'package[msi]' if application == 'packages'
-        
-        potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
-        application = potential_rake_task_parts[1]
-        rake_task_args = potential_rake_task_parts[2].split(',')
         if rake_tasks.include?(application)
           load_env_vars(glimmer_option_env_vars(glimmer_options))
           rake_task = "glimmer:#{application}"
@@ -171,7 +173,6 @@ module Glimmer
     private
 
     def launch_application
-      load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile')) && caller.join("\n").include?('/bin/glimmer_runner.rb:')
       self.class.launch(
         @application_path,
         jruby_options: @jruby_options,

data/lib/glimmer/rake_task/scaffold.rb

@@ -429,19 +429,7 @@ module Glimmer
         end
         
         def gemfile(shell_type)
-          if shell_type == :desktopify
-            lines = APP_GEMFILE.split("\n")
-            require_glimmer_dsl_swt_index = lines.index(lines.detect {|l| l.include?("gem 'glimmer-dsl-swt'") })
-            lines[(require_glimmer_dsl_swt_index + 1)..(require_glimmer_dsl_swt_index + 1)] = [
-              "",
-              "# Enable Chromium Browser Glimmer Custom Widget gem if needed (e.g. Linux needs it to support HTML5 Video), and use `browser(:chromium)` in GUI.",
-              "# gem 'glimmer-cw-browser-chromium', '>= 0'",
-              "",
-            ]
-            lines.join("\n")
-          else
-            APP_GEMFILE
-          end
+          APP_GEMFILE
         end
     
         def app_main_file(app_name)
@@ -643,7 +631,7 @@ module Glimmer
           minimum_size #{shell_type == :desktopify ? '768, 432' : '420, 240'}
           image File.join(APP_ROOT, 'icons', 'windows', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.ico") if OS.windows?
           image File.join(APP_ROOT, 'icons', 'linux', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.png") unless OS.windows?
-          text "#{human_name(namespace)} - #{human_name(custom_shell_name)}"
+          text "#{human_name(namespace)}#{' - ' + human_name(custom_shell_name) if shell_type != :desktopify}"
         
           MULTI_LINE_STRING
             

data/lib/glimmer/swt/color_proxy.rb

@@ -83,15 +83,15 @@ module Glimmer
         @swt_color
       end
       
-      def method_missing(method, *args, &block)
-        swt_color.send(method, *args, &block)
+      def method_missing(method_name, *args, &block)
+        swt_color.send(method_name, *args, &block)
       rescue => e
-        Glimmer::Config.logger.debug {"Neither ColorProxy nor #{swt_color.class.name} can handle the method ##{method}"}
+        Glimmer::Config.logger.debug {"Neither ColorProxy nor #{swt_color.class.name} can handle the method ##{method_name}"}
         super
       end
       
-      def respond_to?(method, *args, &block)
-        super || swt_color.respond_to?(method, *args, &block)
+      def respond_to?(method_name, *args, &block)
+        super || swt_color.respond_to?(method_name, *args, &block)
       end
       
       private

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

@@ -44,6 +44,10 @@ module Glimmer
           @image_buffered_shapes ||= []
         end
         
+        def drop_shapes
+          @drop_shapes ||= []
+        end
+        
         # TODO add a method like shapes that specifies drawable_properties to be able to adjust properties like transform in between shapes
           
         def shape_at_location(x, y)

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

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

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

@@ -101,10 +101,10 @@ module Glimmer
             end
           end
           
-          def dispose(redraw: true)
+          def dispose(dispose_images: true, dispose_patterns: true, redraw: true)
             Glimmer::SWT::DisplayProxy.instance.auto_exec do
               clear if self.class == Path
-              super(redraw: redraw) if (parent.is_a?(Shape) && (!parent.is_a?(PathSegment) || !parent.part_of_path?)) || parent.is_a?(Drawable)
+              super(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: redraw) if (parent.is_a?(Shape) && (!parent.is_a?(PathSegment) || !parent.part_of_path?)) || parent.is_a?(Drawable)
             end
           end
           

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

@@ -75,7 +75,7 @@ module Glimmer
             true
           end
           
-          def dispose(redraw: true)
+          def dispose(dispose_images: true, dispose_patterns: true, redraw: true)
             Glimmer::SWT::DisplayProxy.instance.auto_exec do
               # including classes could override to dispose of resources first
               # afterwards, parent removes from its path segments with post_dispose_content
@@ -83,7 +83,7 @@ module Glimmer
               if part_of_path?
                 drawable.redraw if redraw && !drawable.is_a?(ImageProxy)
               else
-                super(redraw: redraw)
+                super(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: redraw)
               end
             end
           end

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

@@ -53,7 +53,14 @@ module Glimmer
             # 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
-          alias contain? include?
+          
+          def contain?(x, y)
+            include?(x, y)
+          end
+          
+          def bounds_contain?(x, y)
+            include?(x, y)
+          end
           
           def path_segment_method_name
             'addRectangle'