glimmer-dsl-swt 4.20.12.0 → 4.20.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6def93b1e2b7c5b5275126e53dbb42e23021721f41a23f98528d1f69f01f1b
-  data.tar.gz: 4d5b8fc17d10df490b1614e573d8a678c418f10cc2e5d43d0352905cf5245b1f
+  metadata.gz: 20ac26497d5bf601549eb0f566099c6dd5e37a6ca9c471bbd5169b0a7a46b560
+  data.tar.gz: 183f6ad0365f4022279bf16024551581ece3b171c9ce5683266c0448684c1d9a
 SHA512:
-  metadata.gz: fae5f9df309f2e0aada6c7557abb786faffc4cfdac5f82945183389bff644376106f0b41d1bc2b9b0d0cd2aaa14a07f2ad506545290cc7870354c377cad98c06
-  data.tar.gz: 85fabb309339aed175bb2bc662af3b9ba9f8b365114bbdaf3f4a642b94187bf2f07406c32c716b3ab71bcfa739a64ff53e7b846a9228e18ed0fe6d84f9890e3a
+  metadata.gz: d6b00d1a29dd7b31f9411f33862b7cf762f5bd83cc83ccab83800c725e6b7284814826f943192e4cf1650fad1bf22b0ee5c7d97809431b66e038b7dec75758fe
+  data.tar.gz: ec109fc95534945204495fed7b37d66172261b4ee826e20412e43cfeb03a3615ec6d9eb612bcea58c8b3fb89e53ed09a6d4b496dfd71e5761a94f928a23994fb

data/CHANGELOG.md

@@ -1,9 +1,28 @@
 # Change Log
 
+### 4.20.12.4
+
+- Update Hello, Shape! to take advantage of shape listeners (on mouse click, change color)
+
+### 4.20.12.3
+
+- Make Custom Shapes support on_event listeners just like Shapes
+- Update Hello, Custom Shape! to take advantage of custom shape listeners (on mouse click, change color)
+
+### 4.20.12.2
+
+- Make Shape listeners check inclusion against all sub-shapes
+- Refactor Hello, Canvas Drag & Drop! sample to use composite shapes (e.g. ball containing a ball border)
+
+### 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.4
 ## 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.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).
 
 **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.4
 ```
 
 `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.4'
 ```
 
 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.4
       
 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.4

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/dsl/swt/dsl.rb

@@ -39,7 +39,7 @@ module Glimmer
         SWT,
         %w[
           layout
-          widget_listener
+          listener
           combo_selection_data_binding
           checkbox_group_selection_data_binding
           radio_group_selection_data_binding

data/lib/glimmer/dsl/swt/{widget_listener_expression.rb → listener_expression.rb}

@@ -22,17 +22,17 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/custom/shape'
+require 'glimmer/ui/custom_shape'
 
 module Glimmer
   module DSL
     module SWT
-      class WidgetListenerExpression < Expression
-        include_package 'org.eclipse.swt.widgets'
-  
+      # Widget, Shape, and Display listener experssion
+      class ListenerExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           Glimmer::Config.logger.debug {"keyword starts with on_: #{keyword.start_with?('on_')}"}
           return false unless keyword.start_with?('on_')
-          proper_parent = parent.respond_to?(:swt_widget) || parent.is_a?(Glimmer::SWT::DisplayProxy) || parent.is_a?(Glimmer::SWT::Custom::Shape)
+          proper_parent = parent.respond_to?(:swt_widget) || parent.is_a?(Glimmer::SWT::DisplayProxy) || parent.is_a?(Glimmer::SWT::Custom::Shape) || parent.is_a?(Glimmer::UI::CustomShape)
           Glimmer::Config.logger.debug {"parent #{parent} is a widget, shape, or display: #{proper_parent}"}
           return false unless proper_parent
           Glimmer::Config.logger.debug {"block exists?: #{!block.nil?}"}

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

@@ -509,6 +509,7 @@ module Glimmer
         def set_attribute(attribute_name, *args)
           options = args.last if args.last.is_a?(Hash)
           args.pop if !options.nil? && !options[:redraw].nil?
+          options ||= {}
           perform_redraw = @perform_redraw
           perform_redraw = options[:redraw] if perform_redraw.nil? && !options.nil?
           perform_redraw ||= true
@@ -529,11 +530,12 @@ module Glimmer
             @properties[ruby_attribute_getter_name] = args
             amend_method_name_options_based_on_properties! if @content_added && new_property
             property_change = true
+            calculated_paint_args_changed! if container?
           end
           if @content_added && perform_redraw && !drawable.is_disposed
             redrawn = false
             unless property_change
-              @calculated_paint_args = false
+              calculated_paint_args_changed!(children: false)
               if is_a?(PathSegment)
                 root_path&.calculated_path_args = @calculated_path_args = false
                 calculated_args_changed!
@@ -549,7 +551,7 @@ module Glimmer
             end
             # TODO consider redrawing an image proxy's gc in the future
             # TODO consider ensuring only a single redraw happens for a hierarchy of nested shapes
-            drawable.redraw unless redrawn || drawable.is_a?(ImageProxy)
+            drawable.redraw if !redrawn && !drawable.is_a?(ImageProxy)
           end
         end
         
@@ -570,7 +572,9 @@ module Glimmer
         
         def handle_observation_request(observation_request, &block)
           shape_block = lambda do |event|
-            block.call(event) if include?(event.x, event.y)
+            included = include?(event.x, event.y)
+            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)
         end
@@ -788,7 +792,7 @@ module Glimmer
             extent_args << extent_flags unless extent_flags.nil?
             self.extent = paint_event.gc.send("#{@name}Extent", *extent_args)
           end
-          if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y)
+          if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y) # TODO add a check to text content changing too
             calculated_args_changed!
             parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
           end
@@ -810,6 +814,12 @@ module Glimmer
           shapes.each(&:calculated_args_changed!) if children
         end
         
+        def calculated_paint_args_changed!(children: true)
+          @calculated_paint_args = nil
+          @all_parent_properties = nil
+          shapes.each(&:calculated_paint_args_changed!) if children
+        end
+        
         # Notifies object that calculated args changed for defaults. Returns true if redrawing and false otherwise.
         def calculated_args_changed_for_defaults!
           has_default_dimensions = default_width? || default_height?
@@ -1203,7 +1213,8 @@ module Glimmer
                 end
               end
             else
-              @properties = all_parent_properties.merge(@properties)
+              @original_properties ||= @properties
+              @properties = all_parent_properties.merge(@original_properties)
               @properties['background'] = [@drawable.background] if fill? && !has_some_background?
               @properties['foreground'] = [@drawable.foreground] if @drawable.respond_to?(:foreground) && draw? && !has_some_foreground?
               # TODO regarding alpha, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes

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')
@@ -254,6 +254,16 @@ module Glimmer
         end
       end
       
+      # TODO consider bringing observer_registrations method from CustomWidget if needed
+
+      def can_handle_observation_request?(observation_request)
+        body_root&.can_handle_observation_request?(observation_request)
+      end
+
+      def handle_observation_request(observation_request, &block)
+        body_root.handle_observation_request(observation_request, &block)
+      end
+      
       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

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -0,0 +1,101 @@
+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 = rectangle(150, 260, 50, 50) {
+          background :white
+                                                  
+          # unspecified width and height become max width and max height by default
+          @drop_square_border = rectangle(0, 0) {
+            foreground :black
+            line_width 3
+            line_style :dash
+          }
+                    
+          @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)
+            
+            # 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
+      }
+    }
+  }
+end
+ 
+HelloCanvasDragAndDrop.launch

data/samples/hello/hello_custom_shape.rb

@@ -65,8 +65,13 @@ class HelloCustomShape
           y_location = (rand*HEIGHT/2).to_i%HEIGHT + (rand*15).to_i
           foreground_color = rgb(rand*255, rand*255, rand*255)
           
-          stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
+          a_stick_figure = stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
             foreground foreground_color
+            
+            # on mouse click, change color
+            on_mouse_up do
+              a_stick_figure.foreground = rgb(rand*255, rand*255, rand*255)
+            end
           }
         }
       }

data/samples/hello/hello_shape.rb

@@ -37,8 +37,13 @@ class HelloShape
           y_location = (rand*125).to_i%200 + (rand*15).to_i
           foreground_color = rgb(rand*255, rand*255, rand*255)
           
-          stick_figure(x_location, y_location, 35+n*2, 35+n*2) {
+          a_stick_figure = stick_figure(x_location, y_location, 35+n*2, 35+n*2) {
             foreground foreground_color
+            
+            # on mouse click, change color
+            on_mouse_up do
+              a_stick_figure.foreground = rgb(rand*255, rand*255, rand*255)
+            end
           }
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.12.0
+  version: 4.20.12.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -438,6 +438,7 @@ files:
 - lib/glimmer/dsl/swt/layout_data_expression.rb
 - lib/glimmer/dsl/swt/layout_expression.rb
 - lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
+- lib/glimmer/dsl/swt/listener_expression.rb
 - lib/glimmer/dsl/swt/menu_bar_expression.rb
 - lib/glimmer/dsl/swt/menu_expression.rb
 - lib/glimmer/dsl/swt/message_box_expression.rb
@@ -462,7 +463,6 @@ files:
 - lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
 - lib/glimmer/dsl/swt/tree_properties_expression.rb
 - lib/glimmer/dsl/swt/widget_expression.rb
-- lib/glimmer/dsl/swt/widget_listener_expression.rb
 - lib/glimmer/launcher.rb
 - lib/glimmer/rake_task.rb
 - lib/glimmer/rake_task/list.rb
@@ -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