glimmer-dsl-swt 4.20.12.4 → 4.20.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ac26497d5bf601549eb0f566099c6dd5e37a6ca9c471bbd5169b0a7a46b560
-  data.tar.gz: 183f6ad0365f4022279bf16024551581ece3b171c9ce5683266c0448684c1d9a
+  metadata.gz: a2334810c1c1fb86f4539f50c79e463c1574abab93c58300e7352c68b1a6b77a
+  data.tar.gz: 8a64907ff1c3b7eabbd13e289fc7bb603886a9128981af6606082a323b31d952
 SHA512:
-  metadata.gz: d6b00d1a29dd7b31f9411f33862b7cf762f5bd83cc83ccab83800c725e6b7284814826f943192e4cf1650fad1bf22b0ee5c7d97809431b66e038b7dec75758fe
-  data.tar.gz: ec109fc95534945204495fed7b37d66172261b4ee826e20412e43cfeb03a3615ec6d9eb612bcea58c8b3fb89e53ed09a6d4b496dfd71e5761a94f928a23994fb
+  metadata.gz: 11fb6dea6fa4fdaccfde2ec485284a937eea521b7d41726b38c1e92cf098f2bd3d31ec739f5f1cf23f444df65983bea2a49b2dd2816d3dcc3f6a40720f8fc1a7
+  data.tar.gz: 936aa733ded3e24d379ee2f0bff42ec0d49abf8410578ebb42b686481a25b820c3a52eaa4bf9680b983e92e92a197b1c53703c54d564ff798fa917ca9de34984

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+### 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
+
+### 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
+- Shape `drag_source true` and `on_drop {|event| }` built-in support for drag and drop
+- Refactor Hello, Canvas Drag and Drop! to use new Shape built-in support for drag and drop
+
 ### 4.20.12.4
 
 - Update Hello, Shape! to take advantage of shape listeners (on mouse click, change color)

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.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
 ## 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.4 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.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.4
+jgem install glimmer-dsl-swt -v 4.20.13.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.4'
+gem 'glimmer-dsl-swt', '~> 4.20.13.2'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.4
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.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.4
+4.20.13.3

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,12 @@ module Glimmer
       class Shape
         include Properties
         
+        DropEvent = Struct.new(:doit, :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
+          alias dragging? dragging
+        
           def create(parent, keyword, *args, &property_block)
             potential_shape_class_name = keyword.to_s.camelcase(:upper).to_sym
             if constants.include?(potential_shape_class_name)
@@ -127,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
@@ -207,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)
@@ -218,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
@@ -572,11 +587,40 @@ module Glimmer
         
         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(
+                  doit: true,
+                  dragged_shape: Shape.dragged_shape,
+                  dragged_shape_original_x: Shape.dragged_shape_original_x,
+                  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
+                )
+                begin
+                  shape_block.call(drop_event)
+                rescue => e
+                  Glimmer::Config.logger.error e.full_message
+                ensure
+                  Shape.dragging = false
+                  if !drop_event.doit && Shape.dragged_shape
+                    Shape.dragged_shape.x = Shape.dragged_shape_original_x
+                    Shape.dragged_shape.y = Shape.dragged_shape_original_y
+                  end
+                  Shape.dragged_shape = nil
+                end
+              end
+            end
+          else
+            drawable.handle_observation_request(observation_request, &shape_block)
           end
-          drawable.handle_observation_request(observation_request, &shape_block)
         end
         
         # Sets data just like SWT widgets
@@ -599,7 +643,7 @@ module Glimmer
             set_attribute(method_name, *args)
           elsif has_attribute?(method_name)
             get_attribute(method_name)
-          else
+          else # TODO support proxying calls to handle_observation_request for listeners just like WidgetProxy
             super
           end
         end
@@ -613,6 +657,79 @@ module Glimmer
             super
           end
         end
+          
+        def drag_and_move=(drag_and_move_value)
+          drag_and_move_old_value = @drag_and_move
+          @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|
+              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
+                Shape.dragged_shape.move_by((event.x - Shape.dragging_x), (event.y - Shape.dragging_y))
+                Shape.dragging_x = event.x
+                Shape.dragging_y = event.y
+              end
+            end
+            @drawable_on_mouse_up = drawable.handle_observation_request('on_mouse_up') do |event|
+              if Shape.dragging && Shape.dragged_shape == self
+                Shape.dragging = false
+              end
+            end
+          elsif !@drag_and_move && drag_and_move_old_value
+            @on_drag_detected.deregister
+            @drawable_on_mouse_move.deregister
+            @drawable_on_mouse_up.deregister
+          end
+        end
+            
+        def drag_and_move
+          @drag_and_move
+        end
+        
+        def drag_source=(drag_source_value)
+          drag_source_old_value = @drag_source
+          @drag_source = drag_source_value
+          if @drag_source && !drag_source_old_value
+            @on_drag_detected = handle_observation_request('on_drag_detected') do |event|
+              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
+                Shape.dragged_shape.move_by((event.x - Shape.dragging_x), (event.y - Shape.dragging_y))
+                Shape.dragging_x = event.x
+                Shape.dragging_y = event.y
+              end
+            end
+            @drawable_on_mouse_up = drawable.handle_observation_request('on_mouse_up') do |event|
+              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
+            @on_drag_detected.deregister
+            @drawable_on_mouse_move.deregister
+            @drawable_on_mouse_up.deregister
+          end
+        end
+            
+        def drag_source
+          @drag_source
+        end
         
         def pattern(*args, type: nil)
           instance_variable_name = "@#{type}_pattern"
@@ -664,6 +781,7 @@ module Glimmer
             shapes.dup.each {|shape| shape.dispose(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: false) }
           end
         end
+        alias dispose_shapes clear_shapes
         
         # Indicate if this is a container shape (meaning a shape bag that is just there to contain nested shapes, but doesn't render anything of its own)
         def container?

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
@@ -43,55 +58,27 @@ class HelloCanvasDragAndDrop
           }
         
           on_mouse_move do
-            if @dragging
-              @drop_square_border.foreground = :red
-            end
+            @drop_square_border.foreground = :red if Glimmer::SWT::Custom::Shape.dragging?
           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
-                }
+          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
+            # drop_event.doit = false # drop event can be cancelled by setting doit attribute to false
+            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
+            }
+            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)
-            
-            # 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
       }
     }

data/samples/hello/hello_custom_shape.rb

@@ -67,6 +67,7 @@ class HelloCustomShape
           
           a_stick_figure = stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
             foreground foreground_color
+            drag_and_move true
             
             # on mouse click, change color
             on_mouse_up do

data/samples/hello/hello_shape.rb

@@ -39,6 +39,7 @@ class HelloShape
           
           a_stick_figure = stick_figure(x_location, y_location, 35+n*2, 35+n*2) {
             foreground foreground_color
+            drag_and_move true
             
             # on mouse click, change color
             on_mouse_up do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.12.4
+  version: 4.20.13.3
 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