glimmer-dsl-swt 4.20.12.0 → 4.20.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6def93b1e2b7c5b5275126e53dbb42e23021721f41a23f98528d1f69f01f1b
-  data.tar.gz: 4d5b8fc17d10df490b1614e573d8a678c418f10cc2e5d43d0352905cf5245b1f
+  metadata.gz: 8665a978cb56164d4d65f8c141e63e1ca080ef9b0c0bf1a91e9032016967cd41
+  data.tar.gz: 4d21198129e1c53e30e0aa712b1242d518b41e2170c57f03b9ada278df32823d
 SHA512:
-  metadata.gz: fae5f9df309f2e0aada6c7557abb786faffc4cfdac5f82945183389bff644376106f0b41d1bc2b9b0d0cd2aaa14a07f2ad506545290cc7870354c377cad98c06
-  data.tar.gz: 85fabb309339aed175bb2bc662af3b9ba9f8b365114bbdaf3f4a642b94187bf2f07406c32c716b3ab71bcfa739a64ff53e7b846a9228e18ed0fe6d84f9890e3a
+  metadata.gz: 9767e3499bf28485234a4769c031d5a44b95b74e6ca134b8c89234db0fd152a8f6b8e993df30808e42dc877e1633a26c201beec7cfca510739b785033639f75f
+  data.tar.gz: 11dd762db3a0e6fbe2c2445bceb45ddc809b6cc99301aad405612f1a52b6b2553d5fb0f448b9bf0adb75729b76b52f227e2ae4db2baea497fbb537fc8dc15f12

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 # Change Log
 
+### 4.20.12.1
+
+- Hello, Canvas Drag & Drop! sample
+
 ### 4.20.12.0
 
 - Canvas Shape Listeners: on_mouse_up, on_mouse_down, on_mouse_move, on_drag_detected
 - Make scaffolding not generate an empty () after shell
+- Hello, Canvas Shape Listeners! Sample
 
 ### 4.20.11.1
 

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.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.12.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.12.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.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).
 
 **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.0
+jgem install glimmer-dsl-swt -v 4.20.12.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.12.0'
+gem 'glimmer-dsl-swt', '~> 4.20.12.1'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.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.12.0
+4.20.12.1

data/docs/reference/GLIMMER_SAMPLES.md

@@ -45,6 +45,7 @@
     - [Hello, Canvas Path!](#hello-canvas-path)
     - [Hello, Canvas Data Binding!](#hello-canvas-data-binding)
     - [Hello, Canvas Shape Listeners!](#hello-canvas-shape-listeners)
+    - [Hello, Canvas Drag and Drop!](#hello-canvas-drag-and-drop)
     - [Hello, Cursor!](#hello-cursor)
     - [Hello, Progress Bar!](#hello-progress-bar)
     - [Hello, Tree!](#hello-tree)
@@ -833,6 +834,16 @@ Hello, Canvas Shape Listeners! - Dragged Circle
 
 ![Hello Canvas Shape Listeners Dragged](/images/glimmer-hello-canvas-shape-listeners-dragged.png)
 
+#### Hello, Canvas Drag and Drop!
+
+This sample demonstrates Canvas Shape DSL drag and drop (different from standard widget drag and drop).
+
+Code:
+
+[samples/hello/hello_canvas_drag_and_drop.rb](/samples/hello/hello_canvas_drag_and_drop.rb)
+
+![Hello Canvas Drag and Drop](/images/glimmer-hello-canvas-drag-and-drop.gif)
+
 #### Hello, Cursor!
 
 This sample demonstrates the use of the `cursor` property keyword to change the mouse cursor.

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

@@ -573,6 +573,8 @@ module Glimmer
             block.call(event) if include?(event.x, event.y)
           end
           drawable.handle_observation_request(observation_request, &shape_block)
+          if shapes.present?
+          end
         end
         
         # Sets data just like SWT widgets

data/lib/glimmer/ui/custom_shape.rb

@@ -180,7 +180,7 @@ module Glimmer
         raise Glimmer::Error, 'Invalid custom shape for having no body! Please define body block!' if body_block.nil?
         @body_root = instance_exec(&body_block)
         raise Glimmer::Error, 'Invalid custom shape for having an empty body! Please fill body block!' if @body_root.nil?
-        auto_exec do
+        auto_exec do # TODO is this necessary given shape is a lightweight construct (not SWT widget) ?
           @body_root.set_data('custom_shape', self)
         end
         execute_hook('after_body')

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -0,0 +1,95 @@
+require 'glimmer-dsl-swt'
+
+class HelloCanvasDragAndDrop
+  include Glimmer::UI::CustomShell
+            
+  body {
+    shell {
+      row_layout(:vertical) {
+        margin_width 0
+        margin_height 0
+        fill true
+        center true
+      }
+      text 'Hello, Canvas Drag & Drop!'
+      
+      label(:center) {
+        text 'Drag orange balls and drop in the square.'
+        font height: 16
+      }
+      
+      canvas {
+        layout_data {
+          width 350
+          height 350
+        }
+      
+        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
+                    
+          @number_shape = text {
+            x :default
+            y :default
+            string '0'
+          }
+        
+          on_mouse_move do
+            if @dragging
+              @drop_square_border.foreground = :red
+            end
+          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
+                }
+              }
+              @dragging.dispose
+            end
+          end
+        }
+                                         
+        10.times do |n|
+          an_oval = oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
+            background rgb(255, 165, 0)
+
+            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
+      }
+    }
+  }
+end
+ 
+HelloCanvasDragAndDrop.launch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.12.0
+  version: 4.20.12.1
 platform: ruby
 authors:
 - Andy Maleh
@@ -576,6 +576,7 @@ files:
 - samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_canvas_animation_multi.rb
 - samples/hello/hello_canvas_data_binding.rb
+- samples/hello/hello_canvas_drag_and_drop.rb
 - samples/hello/hello_canvas_path.rb
 - samples/hello/hello_canvas_shape_listeners.rb
 - samples/hello/hello_canvas_transform.rb