glimmer-dsl-swt 4.20.13.2 → 4.20.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2fa9af6ffbacb6449131175cd36971568e98ed763ac861d4126bb638c8f975
-  data.tar.gz: ef23b0d547e1d42e2832f5f10c0b15b1c70ce3c8adb6b588b6b74dafa8b1e6de
+  metadata.gz: 9d49b7c8377c625821d745fe902daa4f2120a2f913aac28cc180a541b4d5e7b2
+  data.tar.gz: fa0600350138e85e73ddd25487890357080f0a7c5bf3d329b374239690ac9cec
 SHA512:
-  metadata.gz: 58bfac7f7af0ef1de30e4d9db32fb8c218a272c6de892f0b59261e4c9e96458e1b50169e3ee8da96b2c686f05c8687ee79f801189a7eef3bd225bf42ad1e684c
-  data.tar.gz: 7f5ee3e3f28e7a8bdd32aeea1ac18f20953480ba4dbed2e186e5c299f1af8de908c32df2ae3cfe417599b5b684725cbf06697ec3802e1ab4abddc43946adcf79
+  metadata.gz: d29652357d6e5cbcb667b69584f6bc50551d5a04733e799522945ec38a36456c6d2dadbe48c44f0646b46edeebc95f43f5b37e56701b6067fa18cf17adf65c64
+  data.tar.gz: 383f1cbae1582175c8047f25e6a03889f46099cda58d9c885d6a5a820bfc2fc3675e19cc3bda4f6760f8dd905814a69dafa54d230b62f7f9a2a7937e88a2b2b1

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+### 4.20.13.6
+
+- Ensure a dragged shape can be dropped back into a parent it originally belonged to without it counting as a drop into itself.
+- Add set_data and get_data to Glimmer::UI::CustomShape, which proxies calls to body_root
+
+### 4.20.13.5
+
+- Fix issue occurring with shape drag & drop when the dragged shape is a drop target too, thus getting dropped back to itself.
+
+### 4.20.13.4
+
+- Improved shape drag and drop checking for inclusion in drop target when there are multiple drop targets
+
+### 4.20.13.3
+
+- Fix issue regarding `nil` calculated_width/calculated_height encountered in Shape#contain?
+
 ### 4.20.13.2
 
 - Support `drop_event.doit = false` to deny dropping and move dragged shape back to where it was

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.13.2
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.13.6
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.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).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.6 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.13.2
+jgem install glimmer-dsl-swt -v 4.20.13.6
 ```
 
 `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.13.2'
+gem 'glimmer-dsl-swt', '~> 4.20.13.6'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.6
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.20.13.2
+4.20.13.6

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

@@ -217,7 +217,7 @@ module Glimmer
         # some shapes may choose to provide a fuzz factor to make usage of this method for mouse clicking more user friendly
         def contain?(x, y)
           # assume a rectangular filled shape by default (works for several shapes like image, text, and focus)
-          x.between?(self.absolute_x, self.absolute_x + calculated_width) && y.between?(self.absolute_y, self.absolute_y + calculated_height)
+          x.between?(self.absolute_x, self.absolute_x + calculated_width.to_f) && y.between?(self.absolute_y, self.absolute_y + calculated_height.to_f)
         end
         
         # Returns if shape includes a point. When the shape is filled, this is the same as contain. When the shape is drawn, it only returns true if the point lies on the edge (boundary/border)
@@ -228,9 +228,9 @@ module Glimmer
           contain?(x, y)
         end
 
-        def include_with_children?(x, y)
+        def include_with_children?(x, y, except_child: nil)
           included = include?(x, y)
-          included ||= expanded_shapes.detect { |shape| shape.include?(x, y) }
+          included ||= expanded_shapes.reject {|shape| shape == except_child}.detect { |shape| shape.include?(x, y) }
         end
 
         # Indicates if a shape's x, y, width, height differ from its bounds calculation (e.g. arc / polygon)
@@ -592,7 +592,7 @@ module Glimmer
           if observation_request == 'on_drop'
             Shape.drop_shapes << self
             handle_observation_request('on_mouse_up') do |event|
-              if Shape.dragged_shape
+              if Shape.dragging && include_with_children?(event.x, event.y, except_child: Shape.dragged_shape)
                 drop_event = DropEvent.new(
                   doit: true,
                   dragged_shape: Shape.dragged_shape,
@@ -605,7 +605,7 @@ module Glimmer
                   y: event.y
                 )
                 begin
-                  shape_block.call(drop_event)
+                  block.call(drop_event)
                 rescue => e
                   Glimmer::Config.logger.error e.full_message
                 ensure

data/lib/glimmer/ui/custom_shape.rb

@@ -264,6 +264,19 @@ module Glimmer
         body_root.handle_observation_request(observation_request, &block)
       end
       
+      # Sets data just like SWT widgets
+      def set_data(key=nil, value)
+        body_root.set_data(key, value)
+      end
+      alias setData set_data # for compatibility with SWT APIs
+
+      # Gets data just like SWT widgets
+      def get_data(key=nil)
+        body_root.get_data(key)
+      end
+      alias getData get_data # for compatibility with SWT APIs
+      alias data get_data # for compatibility with SWT APIs
+    
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.2
+  version: 4.20.13.6
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement