glimmer-dsl-swt 4.20.12.4 → 4.20.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ac26497d5bf601549eb0f566099c6dd5e37a6ca9c471bbd5169b0a7a46b560
-  data.tar.gz: 183f6ad0365f4022279bf16024551581ece3b171c9ce5683266c0448684c1d9a
+  metadata.gz: 3f381c0b3d2f94fb562307642fe38f69d806f1bd48432e49f1039dc19f23084e
+  data.tar.gz: 9e9965fcbc725ef7da7a4fb1b79d6026dc5ed4865fa4e81d19805ce93fd63db8
 SHA512:
-  metadata.gz: d6b00d1a29dd7b31f9411f33862b7cf762f5bd83cc83ccab83800c725e6b7284814826f943192e4cf1650fad1bf22b0ee5c7d97809431b66e038b7dec75758fe
-  data.tar.gz: ec109fc95534945204495fed7b37d66172261b4ee826e20412e43cfeb03a3615ec6d9eb612bcea58c8b3fb89e53ed09a6d4b496dfd71e5761a94f928a23994fb
+  metadata.gz: 4fb4fb09032cf57af92d9afd700ee81c6bf7ebb5969abbf5e1927bfccb3604269f49a6e79a9761cddd005ea506146e50aa76dbcd34cb64aba16136b18b4b191c
+  data.tar.gz: b5c319a6c4d14d014297ffaa2f1a6d3195a662cd7d4604bd4685cbd026feee873c80ec400c1b47f680867f3176fef854048359bbbbba1db21f5dc89a25c3f9e7

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+### 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.0
 ## 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.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).
 
 **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.0
 ```
 
 `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.0'
 ```
 
 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.0
       
 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.0

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

@@ -62,7 +62,12 @@ 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)
+        
         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)
@@ -565,7 +570,7 @@ module Glimmer
             @properties[attribute_name.to_s]
           end
         end
-        
+          
         def can_handle_observation_request?(observation_request)
           drawable.can_handle_observation_request?(observation_request)
         end
@@ -576,7 +581,31 @@ module Glimmer
             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)
+          if observation_request == 'on_drop'
+            handle_observation_request('on_mouse_up') do |event|
+              if Shape.dragged_shape
+                drop_event = DropEvent.new(
+                  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,
+                  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
+                  Shape.dragged_shape = nil
+                end
+              end
+            end
+          else
+            drawable.handle_observation_request(observation_request, &shape_block)
+          end
         end
         
         # Sets data just like SWT widgets
@@ -599,7 +628,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 +642,80 @@ 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|
+              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
+            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|
+              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
+            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_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"

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -43,55 +43,37 @@ 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 |event|
+            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
+            }
+            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
             }
-
-            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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.12.4
+  version: 4.20.13.0
 platform: ruby
 authors:
 - Andy Maleh