glimmer-dsl-swt 4.20.12.1 → 4.20.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8665a978cb56164d4d65f8c141e63e1ca080ef9b0c0bf1a91e9032016967cd41
-  data.tar.gz: 4d21198129e1c53e30e0aa712b1242d518b41e2170c57f03b9ada278df32823d
+  metadata.gz: 94916ca37afe49d1a86e6cdc4dbc26ea0c427aeb367933bff3545cff184af89c
+  data.tar.gz: 9f661b2400af578023b997e2fd157a2ed83f9472be8e87a06a8e05f03b8c4510
 SHA512:
-  metadata.gz: 9767e3499bf28485234a4769c031d5a44b95b74e6ca134b8c89234db0fd152a8f6b8e993df30808e42dc877e1633a26c201beec7cfca510739b785033639f75f
-  data.tar.gz: 11dd762db3a0e6fbe2c2445bceb45ddc809b6cc99301aad405612f1a52b6b2553d5fb0f448b9bf0adb75729b76b52f227e2ae4db2baea497fbb537fc8dc15f12
+  metadata.gz: ae954846060d6f0128a1a0451cfabedd7b5911585c14276223660a8ed1783951e2c21207c03375b79c7c1fd56155f1611259c755964b4929cdbdd2c1c8751280
+  data.tar.gz: fffe1578254cc9f8fa633f519d4948a3f8f94712d5e5e16167ecbb3faf7d1cc7d37da40bd73a4bbb755aa75091682f50df450589e1c1b8a8bc8a582e67be7c4f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 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

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.12.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.2
 ## 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.12.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.2 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).
 
@@ -326,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.12.1
+jgem install glimmer-dsl-swt -v 4.20.12.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,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.12.1'
+gem 'glimmer-dsl-swt', '~> 4.20.12.2'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.2
       
 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.12.1
+4.20.12.2

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

@@ -570,11 +570,11 @@ module Glimmer
         
         def handle_observation_request(observation_request, &block)
           shape_block = lambda do |event|
-            block.call(event) if include?(event.x, event.y)
+            included = include?(event.x, event.y)
+            included ||= shapes.to_a.detect { |shape| shape.include?(event.x, event.y) }
+            block.call(event) if included
           end
           drawable.handle_observation_request(observation_request, &shape_block)
-          if shapes.present?
-          end
         end
         
         # Sets data just like SWT widgets

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -25,15 +25,16 @@ class HelloCanvasDragAndDrop
         }
       
         background :white
-        
-        @drop_square_border = rectangle(150, 260, 50, 50) {
-          foreground :black
-          line_width 3
-          line_style :dash
-        }
-                              
-        @drop_square = rectangle(153, 263, 44, 44) {
-          background :transparent
+                                                          
+        @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
@@ -66,6 +67,11 @@ class HelloCanvasDragAndDrop
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.12.1
+  version: 4.20.12.2
 platform: ruby
 authors:
 - Andy Maleh