glimmer-dsl-swt 4.20.13.0 → 4.20.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f381c0b3d2f94fb562307642fe38f69d806f1bd48432e49f1039dc19f23084e
-  data.tar.gz: 9e9965fcbc725ef7da7a4fb1b79d6026dc5ed4865fa4e81d19805ce93fd63db8
+  metadata.gz: 52a35ca793ca95839f0f328a465b2d9dafc008d5434520b92e2411ce19bde4ad
+  data.tar.gz: 7ec9d1550c1aedcb265761bb3f8c6b295a7d1d28af1944b81dcd4c8a4eb9e0f3
 SHA512:
-  metadata.gz: 4fb4fb09032cf57af92d9afd700ee81c6bf7ebb5969abbf5e1927bfccb3604269f49a6e79a9761cddd005ea506146e50aa76dbcd34cb64aba16136b18b4b191c
-  data.tar.gz: b5c319a6c4d14d014297ffaa2f1a6d3195a662cd7d4604bd4685cbd026feee873c80ec400c1b47f680867f3176fef854048359bbbbba1db21f5dc89a25c3f9e7
+  metadata.gz: bf6b815412f32c1a8d986c2f927f845abbebdc051adf9edfb64dfa4472715ef08970bc05dd69833de7311e596b01dc21735570175ffb74b08bc8c1888ebe46d0
+  data.tar.gz: fb05c6d864f98d744e57507c0c00145d1b19f689f76b4970d1c6901390ff94a8c4eea0bc81c6b7c3fb27371c3b46e23c28a9911853654d9adb97a77dbffa62d6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+### 4.20.13.1
+
+- Supporting having a `drag_source` that is dragged and not dropped at a target go back to its original position
+- Fix issue of dragged shape getting obscured by ensuring that it is rendered on top of all other shapes
+- Fix issue with shapes obscured by shapes on top of them getting preference when dragged (surprising behavior). Now, the top-most shapes get dragged first if they overlap with others.
+
 ### 4.20.13.0
 
 - Shape `drag_and_move true` property to make shapes movable via dragging

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.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.20.13.1
 ## 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.0 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.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).
 
 **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.0
+jgem install glimmer-dsl-swt -v 4.20.13.1
 ```
 
 `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.0'
+gem 'glimmer-dsl-swt', '~> 4.20.13.1'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.1
       
 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.0
+4.20.13.1

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

@@ -120,6 +120,10 @@ module Glimmer
                 paintable_shapes.each do |shape|
                   shape.paint(paint_event)
                 end
+                # When dragging, render dragged shape again on top of everything else.
+                if !@image_double_buffered && Glimmer::SWT::Custom::Shape.dragging?
+                  Glimmer::SWT::Custom::Shape.dragged_shape.paint(paint_event)
+                end
               end
               if @image_double_buffered
                 if @image_proxy_buffer.nil?

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

@@ -62,7 +62,7 @@ module Glimmer
       class Shape
         include Properties
         
-        DropEvent = Struct.new(:x, :y, :dragged_shape, :dragged_shape_original_x, :dragged_shape_original_y, :dragging_x, :dragging_y, keyword_init: true)
+        DropEvent = Struct.new(:x, :y, :dragged_shape, :dragged_shape_original_x, :dragged_shape_original_y, :dragging_x, :dragging_y, :drop_shapes, keyword_init: true)
         
         class << self
           attr_accessor :dragging, :dragging_x, :dragging_y, :dragged_shape, :dragged_shape_original_x, :dragged_shape_original_y
@@ -132,6 +132,11 @@ module Glimmer
           def flyweight_patterns
             @flyweight_patterns ||= {}
           end
+          
+          # shapes that have defined on_drop expecting to received a dragged shape
+          def drop_shapes
+            @drop_shapes ||= []
+          end
         end
         
         attr_reader :drawable, :parent, :name, :args, :options, :shapes, :properties
@@ -223,6 +228,11 @@ module Glimmer
           contain?(x, y)
         end
 
+        def include_with_children?(x, y)
+          included = include?(x, y)
+          included ||= expanded_shapes.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)
         def irregular?
           false
@@ -570,18 +580,17 @@ module Glimmer
             @properties[attribute_name.to_s]
           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
+            block.call(event) if include_with_children?(event.x, event.y)
           end
           if observation_request == 'on_drop'
+            Shape.drop_shapes << self
             handle_observation_request('on_mouse_up') do |event|
               if Shape.dragged_shape
                 drop_event = DropEvent.new(
@@ -590,6 +599,7 @@ module Glimmer
                   dragged_shape_original_y: Shape.dragged_shape_original_y,
                   dragging_x: Shape.dragging_x,
                   dragging_y: Shape.dragging_y,
+                  drop_shapes: Shape.drop_shapes,
                   x: event.x,
                   y: event.y
                 )
@@ -648,14 +658,12 @@ module Glimmer
           @drag_and_move = drag_and_move_value
           if @drag_and_move && !drag_and_move_old_value
             @on_drag_detected = handle_observation_request('on_drag_detected') do |event|
-              if !Shape.dragging
-                Shape.dragging = true
-                Shape.dragging_x = event.x
-                Shape.dragging_y = event.y
-                Shape.dragged_shape = self
-                Shape.dragged_shape_original_x = x
-                Shape.dragged_shape_original_y = y
-              end
+              Shape.dragging = true
+              Shape.dragging_x = event.x
+              Shape.dragging_y = event.y
+              Shape.dragged_shape = self
+              Shape.dragged_shape_original_x = x
+              Shape.dragged_shape_original_y = y
             end
             @drawable_on_mouse_move = drawable.handle_observation_request('on_mouse_move') do |event|
               if Shape.dragging && Shape.dragged_shape == self
@@ -685,14 +693,12 @@ module Glimmer
           @drag_source = drag_source_value
           if @drag_source && !drag_source_old_value
             @on_drag_detected = handle_observation_request('on_drag_detected') do |event|
-              if !Shape.dragging
-                Shape.dragging = true
-                Shape.dragging_x = event.x
-                Shape.dragging_y = event.y
-                Shape.dragged_shape = self
-                Shape.dragged_shape_original_x = x
-                Shape.dragged_shape_original_y = y
-              end
+              Shape.dragging = true
+              Shape.dragging_x = event.x
+              Shape.dragging_y = event.y
+              Shape.dragged_shape = self
+              Shape.dragged_shape_original_x = x
+              Shape.dragged_shape_original_y = y
             end
             @drawable_on_mouse_move = drawable.handle_observation_request('on_mouse_move') do |event|
               if Shape.dragging && Shape.dragged_shape == self
@@ -702,8 +708,11 @@ module Glimmer
               end
             end
             @drawable_on_mouse_up = drawable.handle_observation_request('on_mouse_up') do |event|
-              if Shape.dragging && Shape.dragged_shape == self
+              if Shape.dragging && Shape.dragged_shape == self && !Shape.drop_shapes.detect {|shape| shape.include_with_children?(event.x, event.y)}
                 Shape.dragging = false
+                Shape.dragged_shape.x = Shape.dragged_shape_original_x
+                Shape.dragged_shape.y = Shape.dragged_shape_original_y
+                Shape.dragged_shape = nil
               end
             end
           elsif !@drag_source && drag_source_old_value

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -25,6 +25,21 @@ class HelloCanvasDragAndDrop
         }
       
         background :white
+        
+        10.times do |n|
+          an_oval = oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
+            background rgb(255, 165, 0)
+            
+            # declare shape as a drag source, which unlike `drag_and_move true`, it means the shape now
+            # goes back to original position if not dropped at an on_drop shape target
+            drag_source true
+            
+            # unspecified width and height become max width and max height by default
+            oval(0, 0) {
+              foreground :black
+            }
+          }
+        end
                                                           
         @drop_square = rectangle(150, 260, 50, 50) {
           background :white
@@ -46,7 +61,8 @@ class HelloCanvasDragAndDrop
             @drop_square_border.foreground = :red if Glimmer::SWT::Custom::Shape.dragging?
           end
           
-          on_drop do |event|
+          on_drop do |drop_event|
+            # drop_event attributes: :x, :y, :dragged_shape, :dragged_shape_original_x, :dragged_shape_original_y, :dragging_x, :dragging_y, :drop_shapes
             ball_count = @number_shape.string.to_i
             @number_shape.dispose
             @drop_square.content {
@@ -56,22 +72,10 @@ class HelloCanvasDragAndDrop
                 string (ball_count + 1).to_s
               }
             }
-            event.dragged_shape.dispose
+            drop_event.dragged_shape.dispose
           end
         }
-                                         
-        10.times do |n|
-          an_oval = oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
-            background rgb(255, 165, 0)
-            drag_source true
-            
-            # unspecified width and height become max width and max height by default
-            oval(0, 0) {
-              foreground :black
-            }
-          }
-        end
-                                         
+                                                                                  
         on_mouse_up do
           @drop_square_border.foreground = :black
         end

metadata

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