glimmer-dsl-swt 4.20.11.1 → 4.20.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83a247e9e977044f7294fcf2430d1ec527f15e0c46b372d0e8c2e91cfbb36321
-  data.tar.gz: 269d918b90ac0b565a27d71a17dfd7b01194e2df6f18c76a2c5b77d496b45202
+  metadata.gz: 0373a7dc65537a71945ca562aec3612f9acb7762ce04a54efb64deb3b4089c7f
+  data.tar.gz: 77fdddc56f1571a426b9786d6ab5343ab400d9a61efc92644ab62482085f3ce2
 SHA512:
-  metadata.gz: 033fb29c9fb0bc37ac6786bb33610ee550628a5def123af28b9c732477329edcb13bca3008581c117fd3751bda9e6c953ac4f69bff319f91848be177dac45d77
-  data.tar.gz: d286000814adaf8794105b357fbeec08cef2d202436930b64848f914d99eb1bfe27fffd03b51a430495174018ebdae54fb26165a18ca42cf8e8ecfd4bf5b3694
+  metadata.gz: baf76febcbe0b29e675c411fa4301cdc1b1ad7b3168a2f63ba91bfdd89a1ac2e8ae35eacebabdeb317bd6b68cbedefeaffc4e2b66e0e460cd2a704f20064c69f
+  data.tar.gz: cf93ef1f0efd3ad957c219a8024003c948d9f5c2fc6f260547ccf089786463624287e2648773c3992095dfa38ba0589d95fdf8cfaef2161c71b3d05971870978

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+### 4.20.12.3
+
+- Make Custom Shapes support on_event listeners just like Shapes
+- Update Hello, Custom Shape! to take advantage of custom shape listeners (on mouse click, change color)
+
+### 4.20.12.2
+
+- Make Shape listeners check inclusion against all sub-shapes
+- Refactor Hello, Canvas Drag & Drop! sample to use composite shapes (e.g. ball containing a ball border)
+
+### 4.20.12.1
+
+- Hello, Canvas Drag & Drop! sample
+
+### 4.20.12.0
+
+- Canvas Shape Listeners: on_mouse_up, on_mouse_down, on_mouse_move, on_drag_detected
+- Make scaffolding not generate an empty () after shell
+- Hello, Canvas Shape Listeners! Sample
+
 ### 4.20.11.1
 
 - Make scaffolded app project use bundler optionally only and still load glimmer-dsl-swt otherwise, like in gem-packaged mode (`glimmer package:gem`) to avoid erroring out about bundler.

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.11.1
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.12.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)
@@ -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.11.1 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.12.3 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 a beta, so default back to `bind` whenever needed).
 
@@ -45,12 +45,6 @@ shell {
 }.open
 ```
 
-Run via `glimmer samples` or directly:
-
-```
-glimmer samples/hello/hello_world.rb
-```
-
 Glimmer app:
 
 ![Hello World](images/glimmer-hello-world.png)
@@ -62,25 +56,25 @@ Learn more about [Hello, World!](docs/reference/GLIMMER_SAMPLES#hello-world).
 Glimmer GUI DSL code (from [samples/hello/hello_table.rb](samples/hello/hello_table.rb)):
 
 ```ruby
-# ... model code precedes
 shell {
   grid_layout
   
   text 'Hello, Table!'
   background_image File.expand_path('hello_table/baseball_park.png', __dir__)
+  image File.expand_path('hello_table/baseball_park.png', __dir__)
   
   label {
     layout_data :center, :center, true, false
     
     text 'BASEBALL PLAYOFF SCHEDULE'
-    background :transparent
+    background :transparent if OS.windows?
     foreground rgb(94, 107, 103)
     font name: 'Optima', height: 38, style: :bold
   }
   
   combo(:read_only) {
     layout_data :center, :center, true, false
-    selection bind(BaseballGame, :playoff_type)
+    selection <=> [BaseballGame, :playoff_type]
     font height: 14
   }
   
@@ -121,10 +115,10 @@ shell {
     }
     
     # Data-bind table items (rows) to a model collection property, specifying column properties ordering per nested model
-    items bind(BaseballGame, :schedule), column_properties(:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion)
+    items <=> [BaseballGame, :schedule, column_properties: [:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion]]
     
     # Data-bind table selection
-    selection bind(BaseballGame, :selected_game)
+    selection <=> [BaseballGame, :selected_game]
     
     # Default initial sort property
     sort_property :date
@@ -147,20 +141,13 @@ shell {
     text 'Book Selected Game'
     layout_data :center, :center, true, false
     font height: 14
-    enabled bind(BaseballGame, :selected_game)
+    enabled <= [BaseballGame, :selected_game]
     
     on_widget_selected {
       book_selected_game
     }
   }
-}.open
-# ...
-```
-
-Run via `glimmer samples` or directly:
-
-```
-glimmer samples/hello/hello_table.rb
+}
 ```
 
 Glimmer App:
@@ -174,7 +161,6 @@ Learn more about [Hello, Table!](docs/reference/GLIMMER_SAMPLES#hello-table).
 Glimmer GUI DSL code (from [samples/elaborate/tetris.rb](samples/elaborate/tetris.rb)):
 
 ```ruby
-# ... more code resides in other files (navigate sample files to learn more)
 shell(:no_resize) {
   grid_layout {
     num_columns 2
@@ -196,13 +182,6 @@ shell(:no_resize) {
     layout_data(:fill, :fill, true, true)
   }
 }
-# ...
-```
-
-Run via `glimmer samples` or directly:
-
-```
-glimmer samples/elaborate/tetris.rb
 ```
 
 Glimmer app:
@@ -347,7 +326,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.11.1
+jgem install glimmer-dsl-swt -v 4.20.12.3
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -375,7 +354,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.11.1'
+gem 'glimmer-dsl-swt', '~> 4.20.12.3'
 ```
 
 And, then run:
@@ -396,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.11.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.3
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -443,7 +422,9 @@ Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and
   glimmer scaffold:gem:customwidget[name,namespace]          # Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under its own Ruby gem project (namespace is required) [alt: scaffold:gem:cw]
 ```
 
-Learn more at: [docs/reference/GLIMMER_COMMAND.md](docs/reference/GLIMMER_COMMAND.md)
+Learn more at:
+
+[docs/reference/GLIMMER_COMMAND.md](docs/reference/GLIMMER_COMMAND.md)
 
 ## Girb (Glimmer irb) Command
 
@@ -455,7 +436,9 @@ girb
 
 ![GIRB](/images/glimmer-girb.png)
 
-Learn more at: [docs/reference/GLIMMER_GIRB.md](docs/reference/GLIMMER_GIRB.md)
+Learn more at:
+
+[docs/reference/GLIMMER_GIRB.md](docs/reference/GLIMMER_GIRB.md)
 
 ## Glimmer GUI DSL Syntax
 
@@ -495,13 +478,17 @@ table(:multi) {
 
 If you need more widgets, you can check out the [Nebula Project](https://github.com/AndyObtiva/glimmer-cw-nebula) (50+ enterprise-grade custom widgets)
 
-Learn more at: [docs/reference/GLIMMER_GUI_DSL_SYNTAX.md](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md)
+Learn more at:
+
+[docs/reference/GLIMMER_GUI_DSL_SYNTAX.md](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md)
 
 ## Glimmer Configuration
 
 Glimmer configuration may be done via the `Glimmer::Config` module.
 
-Learn more at: [docs/reference/GLIMMER_CONFIGURATION.md](docs/reference/GLIMMER_CONFIGURATION.md)
+Learn more at:
+
+[docs/reference/GLIMMER_CONFIGURATION.md](docs/reference/GLIMMER_CONFIGURATION.md)
 
 ## Glimmer Style Guide
 
@@ -509,6 +496,10 @@ Learn more at: [docs/reference/GLIMMER_CONFIGURATION.md](docs/reference/GLIMMER_
 
 ## Samples
 
+See a listing of samples including screenshots and explanations at:
+
+[docs/reference/GLIMMER_SAMPLES.md](/docs/reference/GLIMMER_SAMPLES.md)
+
 Check the [samples](/docs/reference/GLIMMER_SAMPLES.md) directory in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer-dsl-swt` gem first and then run:
 ```
 glimmer samples
@@ -518,8 +509,6 @@ glimmer samples
 
 ![Glimmer Meta-Sample](/images/glimmer-meta-sample.png)
 
-See a listing of samples including screenshots and explanations at: [docs/reference/GLIMMER_SAMPLES.md](/docs/reference/GLIMMER_SAMPLES.md)
-
 ## In Production
 
 The following production apps have been built with Glimmer.

data/VERSION

@@ -1 +1 @@
-4.20.11.1
+4.20.12.3

data/docs/reference/GLIMMER_SAMPLES.md

@@ -44,6 +44,8 @@
     - [Hello, Canvas Transform!](#hello-canvas-transform)
     - [Hello, Canvas Path!](#hello-canvas-path)
     - [Hello, Canvas Data Binding!](#hello-canvas-data-binding)
+    - [Hello, Canvas Shape Listeners!](#hello-canvas-shape-listeners)
+    - [Hello, Canvas Drag and Drop!](#hello-canvas-drag-and-drop)
     - [Hello, Cursor!](#hello-cursor)
     - [Hello, Progress Bar!](#hello-progress-bar)
     - [Hello, Tree!](#hello-tree)
@@ -816,6 +818,32 @@ Hello, Canvas Data Binding!
 
 ![Hello Canvas Data Binding Line Changed](/images/glimmer-hello-canvas-data-binding-line-changed.png)
 
+#### Hello, Canvas Shape Listeners!
+
+This sample demonstrates Canvas Shape DSL listeners, which are constrained within the bounds of their owning shape.
+
+Code:
+
+[samples/hello/hello_canvas_shape_listeners.rb](/samples/hello/hello_canvas_shape_listeners.rb)
+
+Hello, Canvas Shape Listeners!
+
+![Hello Canvas Shape Listeners](/images/glimmer-hello-canvas-shape-listeners.png)
+
+Hello, Canvas Shape Listeners! - Dragged Circle
+
+![Hello Canvas Shape Listeners Dragged](/images/glimmer-hello-canvas-shape-listeners-dragged.png)
+
+#### Hello, Canvas Drag and Drop!
+
+This sample demonstrates Canvas Shape DSL drag and drop (different from standard widget drag and drop).
+
+Code:
+
+[samples/hello/hello_canvas_drag_and_drop.rb](/samples/hello/hello_canvas_drag_and_drop.rb)
+
+![Hello Canvas Drag and Drop](/images/glimmer-hello-canvas-drag-and-drop.gif)
+
 #### Hello, Cursor!
 
 This sample demonstrates the use of the `cursor` property keyword to change the mouse cursor.

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

@@ -39,7 +39,7 @@ module Glimmer
         SWT,
         %w[
           layout
-          widget_listener
+          listener
           combo_selection_data_binding
           checkbox_group_selection_data_binding
           radio_group_selection_data_binding

data/lib/glimmer/dsl/swt/{widget_listener_expression.rb → listener_expression.rb}

@@ -21,19 +21,20 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/custom/shape'
+require 'glimmer/ui/custom_shape'
 
 module Glimmer
   module DSL
     module SWT
-      class WidgetListenerExpression < Expression
-        include_package 'org.eclipse.swt.widgets'
-  
+      # Widget, Shape, and Display listener experssion
+      class ListenerExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           Glimmer::Config.logger.debug {"keyword starts with on_: #{keyword.start_with?('on_')}"}
           return false unless keyword.start_with?('on_')
-          widget_or_display_parentage = parent.respond_to?(:swt_widget) || parent.is_a?(Glimmer::SWT::DisplayProxy)
-          Glimmer::Config.logger.debug {"parent #{parent} is a widget or display: #{widget_or_display_parentage}"}
-          return false unless widget_or_display_parentage
+          proper_parent = parent.respond_to?(:swt_widget) || parent.is_a?(Glimmer::SWT::DisplayProxy) || parent.is_a?(Glimmer::SWT::Custom::Shape) || parent.is_a?(Glimmer::UI::CustomShape)
+          Glimmer::Config.logger.debug {"parent #{parent} is a widget, shape, or display: #{proper_parent}"}
+          return false unless proper_parent
           Glimmer::Config.logger.debug {"block exists?: #{!block.nil?}"}
           raise Glimmer::Error, "Listener is missing block for keyword: #{keyword}" unless block_given?
           Glimmer::Config.logger.debug {"args are empty?: #{args.empty?}"}

data/lib/glimmer/rake_task/scaffold.rb

@@ -640,7 +640,7 @@ module Glimmer
       ## Top-most widget must be a shell or another custom shell
       #
       body {
-        shell(#{':fill_screen' if shell_type == :desktopify}) {
+        shell#{'(:fill_screen)' if shell_type == :desktopify} {
           # Replace example content below with custom shell content
           minimum_size #{shell_type == :desktopify ? '768, 432' : '420, 240'}
           image File.join(APP_ROOT, 'package', 'windows', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.ico") if OS.windows?

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

@@ -239,6 +239,7 @@ module Glimmer
             end
           end
         end
+        alias translate move_by
         
         # rotates shape for an angle around its center
         # this operation is not cumulative (it resets angle every time)
@@ -508,6 +509,7 @@ module Glimmer
         def set_attribute(attribute_name, *args)
           options = args.last if args.last.is_a?(Hash)
           args.pop if !options.nil? && !options[:redraw].nil?
+          options ||= {}
           perform_redraw = @perform_redraw
           perform_redraw = options[:redraw] if perform_redraw.nil? && !options.nil?
           perform_redraw ||= true
@@ -528,11 +530,12 @@ module Glimmer
             @properties[ruby_attribute_getter_name] = args
             amend_method_name_options_based_on_properties! if @content_added && new_property
             property_change = true
+            calculated_paint_args_changed! if container?
           end
           if @content_added && perform_redraw && !drawable.is_disposed
             redrawn = false
             unless property_change
-              @calculated_paint_args = false
+              calculated_paint_args_changed!(children: false)
               if is_a?(PathSegment)
                 root_path&.calculated_path_args = @calculated_path_args = false
                 calculated_args_changed!
@@ -548,7 +551,7 @@ module Glimmer
             end
             # TODO consider redrawing an image proxy's gc in the future
             # TODO consider ensuring only a single redraw happens for a hierarchy of nested shapes
-            drawable.redraw unless redrawn || drawable.is_a?(ImageProxy)
+            drawable.redraw if !redrawn && !drawable.is_a?(ImageProxy)
           end
         end
         
@@ -563,6 +566,19 @@ module Glimmer
           end
         end
         
+        def can_handle_observation_request?(observation_request)
+          drawable.can_handle_observation_request?(observation_request)
+        end
+        
+        def handle_observation_request(observation_request, &block)
+          shape_block = lambda do |event|
+            included = include?(event.x, event.y)
+            included ||= expanded_shapes.detect { |shape| shape.include?(event.x, event.y) }
+            block.call(event) if included
+          end
+          drawable.handle_observation_request(observation_request, &shape_block)
+        end
+        
         # Sets data just like SWT widgets
         def set_data(key=nil, value)
           @data ||= {}
@@ -776,7 +792,7 @@ module Glimmer
             extent_args << extent_flags unless extent_flags.nil?
             self.extent = paint_event.gc.send("#{@name}Extent", *extent_args)
           end
-          if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y)
+          if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y) # TODO add a check to text content changing too
             calculated_args_changed!
             parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
           end
@@ -798,6 +814,12 @@ module Glimmer
           shapes.each(&:calculated_args_changed!) if children
         end
         
+        def calculated_paint_args_changed!(children: true)
+          @calculated_paint_args = nil
+          @all_parent_properties = nil
+          shapes.each(&:calculated_paint_args_changed!) if children
+        end
+        
         # Notifies object that calculated args changed for defaults. Returns true if redrawing and false otherwise.
         def calculated_args_changed_for_defaults!
           has_default_dimensions = default_width? || default_height?
@@ -1191,7 +1213,8 @@ module Glimmer
                 end
               end
             else
-              @properties = all_parent_properties.merge(@properties)
+              @original_properties ||= @properties
+              @properties = all_parent_properties.merge(@original_properties)
               @properties['background'] = [@drawable.background] if fill? && !has_some_background?
               @properties['foreground'] = [@drawable.foreground] if @drawable.respond_to?(:foreground) && draw? && !has_some_foreground?
               # TODO regarding alpha, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes

data/lib/glimmer/ui/custom_shape.rb

@@ -180,7 +180,7 @@ module Glimmer
         raise Glimmer::Error, 'Invalid custom shape for having no body! Please define body block!' if body_block.nil?
         @body_root = instance_exec(&body_block)
         raise Glimmer::Error, 'Invalid custom shape for having an empty body! Please fill body block!' if @body_root.nil?
-        auto_exec do
+        auto_exec do # TODO is this necessary given shape is a lightweight construct (not SWT widget) ?
           @body_root.set_data('custom_shape', self)
         end
         execute_hook('after_body')
@@ -254,6 +254,16 @@ module Glimmer
         end
       end
       
+      # TODO consider bringing observer_registrations method from CustomWidget if needed
+
+      def can_handle_observation_request?(observation_request)
+        body_root&.can_handle_observation_request?(observation_request)
+      end
+
+      def handle_observation_request(observation_request, &block)
+        body_root.handle_observation_request(observation_request, &block)
+      end
+      
       def method_missing(method, *args, &block)
         # TODO Consider supporting a glimmer error silencing option for methods defined here
         # but fail the glimmer DSL for the right reason to avoid seeing noise in the log output

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -0,0 +1,101 @@
+require 'glimmer-dsl-swt'
+
+class HelloCanvasDragAndDrop
+  include Glimmer::UI::CustomShell
+            
+  body {
+    shell {
+      row_layout(:vertical) {
+        margin_width 0
+        margin_height 0
+        fill true
+        center true
+      }
+      text 'Hello, Canvas Drag & Drop!'
+      
+      label(:center) {
+        text 'Drag orange balls and drop in the square.'
+        font height: 16
+      }
+      
+      canvas {
+        layout_data {
+          width 350
+          height 350
+        }
+      
+        background :white
+                                                          
+        @drop_square = rectangle(150, 260, 50, 50) {
+          background :white
+                                                  
+          # unspecified width and height become max width and max height by default
+          @drop_square_border = rectangle(0, 0) {
+            foreground :black
+            line_width 3
+            line_style :dash
+          }
+                    
+          @number_shape = text {
+            x :default
+            y :default
+            string '0'
+          }
+        
+          on_mouse_move do
+            if @dragging
+              @drop_square_border.foreground = :red
+            end
+          end
+          
+          on_mouse_up do
+            if @dragging
+              ball_count = @number_shape.string.to_i
+              @number_shape.dispose
+              @drop_square.content {
+                @number_shape = text {
+                  x :default
+                  y :default
+                  string (ball_count + 1).to_s
+                }
+              }
+              @dragging.dispose
+            end
+          end
+        }
+                                         
+        10.times do |n|
+          an_oval = oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
+            background rgb(255, 165, 0)
+            
+            # unspecified width and height become max width and max height by default
+            oval(0, 0) {
+              foreground :black
+            }
+
+            on_drag_detected do |event|
+              @dragging = an_oval
+              @last_x = event.x
+              @last_y = event.y
+            end
+          }
+        end
+                                         
+        on_mouse_up do
+          @drop_square_border.foreground = :black
+          @dragging = nil
+        end
+              
+        on_mouse_move do |event|
+          if @dragging
+            @dragging.move_by((event.x - @last_x), (event.y - @last_y))
+            @last_x = event.x
+            @last_y = event.y
+          end
+        end
+      }
+    }
+  }
+end
+ 
+HelloCanvasDragAndDrop.launch

data/samples/hello/hello_canvas_shape_listeners.rb

@@ -0,0 +1,171 @@
+# 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-swt'
+
+class HelloCanvasShapeListeners
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :shape_name, :listener_event, :dragged_shape
+
+  body {
+    shell {
+      row_layout(:vertical) {
+        fill true
+        center true
+        margin_width 0
+        margin_height 0
+      }
+      
+      text 'Hello, Canvas Shape Listeners!'
+      
+      label(:center) {
+        text 'Current Shape:'
+        font style: :bold
+      }
+      label(:center) {
+        text <= [self, :shape_name]
+      }
+      
+      label(:center) {
+        text 'Current Event:'
+        font style: :bold
+      }
+      label(:center) {
+        text <= [self, :listener_event]
+      }
+      
+      canvas { |canvas_proxy|
+        layout_data {
+          width 350
+          height 200
+        }
+        
+        background :white
+      
+        @rectangle = rectangle(25, 25, 50, 50) {
+          background :red
+                    
+          # these listener events are limited to the rectangle bounds
+                    
+          on_mouse_down do |event|
+            self.shape_name = 'Square'
+            self.listener_event = 'Mouse Down'
+          end
+          
+          on_drag_detected do |event|
+            self.shape_name = 'Square'
+            self.listener_event += ' / Drag Detected'
+            self.dragged_shape = @rectangle
+          end
+          
+          on_mouse_move do |event|
+            if listener_event.to_s.empty? || shape_name != 'Square'
+              self.listener_event = "Mouse Move"
+            elsif !listener_event.to_s.include?('Mouse Move')
+              self.listener_event += " / Mouse Move"
+            end
+            self.shape_name = 'Square'
+          end
+          
+          on_mouse_up do |event|
+            self.shape_name = 'Square'
+            self.listener_event += ' / Mouse Up'
+            self.dragged_shape = nil
+          end
+        }
+        
+        @oval = oval(150, 120, 50, 50) {
+          background :green
+          
+          # these listener events are limited to the oval bounds
+          
+          on_mouse_down do |event|
+            self.shape_name = 'Circle'
+            self.listener_event = 'Mouse Down'
+          end
+          
+          on_drag_detected do |event|
+            self.shape_name = 'Circle'
+            self.listener_event += ' / Drag Detected'
+            self.dragged_shape = @oval
+          end
+          
+          on_mouse_move do |event|
+            if listener_event.to_s.empty? || shape_name != 'Circle'
+              self.listener_event = "Mouse Move"
+            elsif !listener_event.to_s.include?('Mouse Move')
+              self.listener_event += " / Mouse Move"
+            end
+            self.shape_name = 'Circle'
+          end
+          
+          on_mouse_up do |event|
+            self.shape_name = 'Circle'
+            self.listener_event += ' / Mouse Up'
+            self.dragged_shape = nil
+          end
+        }
+        
+        @polygon = polygon(260, 25, 300, 25, 260, 65) {
+          background :blue
+          
+          # these listener events are limited to the polygon bounds
+          
+          on_mouse_down do |event|
+            self.shape_name = 'Triangle'
+            self.listener_event = 'Mouse Down'
+          end
+          
+          on_drag_detected do |event|
+            self.shape_name = 'Triangle'
+            self.listener_event += ' / Drag Detected'
+            self.dragged_shape = @polygon
+          end
+          
+          on_mouse_move do |event|
+            if listener_event.to_s.empty? || shape_name != 'Triangle'
+              self.listener_event = "Mouse Move"
+            elsif !listener_event.to_s.include?('Mouse Move')
+              self.listener_event += " / Mouse Move"
+            end
+            self.shape_name = 'Triangle'
+          end
+          
+          on_mouse_up do |event|
+            self.shape_name = 'Triangle'
+            self.listener_event += ' / Mouse Up'
+            self.dragged_shape = nil
+          end
+        }
+
+        # This is a general canvas listener event, which is used to move shape even if mouse goes out of its bounds
+        on_mouse_move do |event|
+          dragged_shape.move_by(event.x - @last_x.to_f, event.y - @last_y.to_f) if dragged_shape
+          @last_x = event.x
+          @last_y = event.y
+        end
+      }
+    }
+  }
+end
+
+HelloCanvasShapeListeners.launch

data/samples/hello/hello_custom_shape.rb

@@ -65,8 +65,13 @@ class HelloCustomShape
           y_location = (rand*HEIGHT/2).to_i%HEIGHT + (rand*15).to_i
           foreground_color = rgb(rand*255, rand*255, rand*255)
           
-          stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
+          a_stick_figure = stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
             foreground foreground_color
+            
+            # on mouse click, change color
+            on_mouse_up do
+              a_stick_figure.foreground = rgb(rand*255, rand*255, rand*255)
+            end
           }
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.11.1
+  version: 4.20.12.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -438,6 +438,7 @@ files:
 - lib/glimmer/dsl/swt/layout_data_expression.rb
 - lib/glimmer/dsl/swt/layout_expression.rb
 - lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
+- lib/glimmer/dsl/swt/listener_expression.rb
 - lib/glimmer/dsl/swt/menu_bar_expression.rb
 - lib/glimmer/dsl/swt/menu_expression.rb
 - lib/glimmer/dsl/swt/message_box_expression.rb
@@ -462,7 +463,6 @@ files:
 - lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
 - lib/glimmer/dsl/swt/tree_properties_expression.rb
 - lib/glimmer/dsl/swt/widget_expression.rb
-- lib/glimmer/dsl/swt/widget_listener_expression.rb
 - lib/glimmer/launcher.rb
 - lib/glimmer/rake_task.rb
 - lib/glimmer/rake_task/list.rb
@@ -576,7 +576,9 @@ files:
 - samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_canvas_animation_multi.rb
 - samples/hello/hello_canvas_data_binding.rb
+- samples/hello/hello_canvas_drag_and_drop.rb
 - samples/hello/hello_canvas_path.rb
+- samples/hello/hello_canvas_shape_listeners.rb
 - samples/hello/hello_canvas_transform.rb
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb