glimmer-dsl-libui 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a21485d1722dad246e40058c46dc14b63103e93b1243db1c0ae49bc3b96f96ab
-  data.tar.gz: 390bac7628f29d016bfac073d926011d5fd91d10e7c23a95cae8b59c0bb4a55f
+  metadata.gz: edec94cbcdfb5f8766a7b04c6c19719a8525d971349db5c3f2989b762cee2c56
+  data.tar.gz: 60706b17b64dd6660a14dc46e31ec16039daa3074e4f3e3561061d20898271ff
 SHA512:
-  metadata.gz: 43aa1f65c47353b9ce340ff18264edaf6d9e6c09ee700919e3661b56d2bc8db00f1b31dd365b0a62ae7e39323dc07ba247bb0d06da24f51b01e477ceefa99a34
-  data.tar.gz: c58efb32bc59359ec84cc804eec113004191fa0031676f0af7224c91b8271fb4851939ea761ddbecbc9ca912065bd4616869c76c05c95306991e5e0c68c73bf3
+  metadata.gz: e08e7c05b971f6ff16213dbdf14f8809fe45aa8f8d8b2ba563468eaf2eb14867a6cce4552fe4ae897e2a475b19b59f8179eb18864f15981db3c55bbe2dddd724
+  data.tar.gz: a96f5e238962f5998385046af93b2b5f101612e3626be7261de9373f7e106dd03fab044afe9bb2b5a7130f2b6e90ce900551a9ad209cddeb1fd2df59065edfca

data/CHANGELOG.md

@@ -1,8 +1,22 @@
 # Change Log
 
+## 0.5.11
+
+- Upgrade to perfect-shape 1.0.4
+- Update examples/shape_coloring.rb with basic drag and drop support
+- Support `#move_by(x_delta, y_delta)` (alias `translate`) method on all shapes and `path` (e.g. useful in drag and drop)
+- Support `#move(x, y)` method on all shapes and `path` to move to x,y coordinate directly
+- Support `#min_x` minimum x coordinate of shape/`path` (of top-left corner)
+- Support `#min_y` minimum y coordinate of shape/`path` (of top-left corner)
+- Support `#max_x` maximum x coordinate of shape/`path` (of bottom-right corner)
+- Support `#max_y` maximum y coordinate of shape/`path` (of bottom-right corner)
+- Support `#center_point` (`Array` of x,y) center point of shape/`path`
+- Support `#center_x` center x coordinate of shape/`path`
+- Support `#center_y` center y coordinate of shape/`path`
+
 ## 0.5.10
 
-- Support nesting area mouse and keyboard listeners underneath shapes directly given the newly added support for the `include?(x, y)` method, which can be used to detect if a mouse or keyboard event fired for a specific shape
+- Support nesting area mouse listeners underneath shapes directly given the newly added support for the `include?(x, y)` method, which can be used to detect if a mouse event fired for a specific shape
 - examples/shape_coloring.rb
 
 ## 0.5.9

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 LibUI 0.5.10
+# [<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 LibUI 0.5.11
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -579,7 +579,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.5.10'
+gem 'glimmer-dsl-libui', '~> 0.5.11'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -1088,13 +1088,22 @@ Mac | Windows | Linux
 ----|---------|------
 ![glimmer-dsl-libui-mac-area-gallery.png](images/glimmer-dsl-libui-mac-area-gallery.png) | ![glimmer-dsl-libui-windows-area-gallery.png](images/glimmer-dsl-libui-windows-area-gallery.png) | ![glimmer-dsl-libui-linux-area-gallery.png](images/glimmer-dsl-libui-linux-area-gallery.png)
 
-##### Shape Methods
+##### Area Path Shape Methods
 
 - `::parameters`: returns parameters of a shape class
 - `#bounding_box`: returns `Array` containing `[min_x, min_y, width, height]`
 - `#contain?(*point, outline: false, distance_tolerance: 0)`: Returns if point (`[x, y]` `Array` or args) is inside the shape when `outline` is `false` or on the outline when `outline` is `true`. `distance_tolerance` is used when `outline` is `true` as a fuzz factor for declaring a point on the outline of the shape (e.g. helps users select a shape from its outline more easily).
 - `#include?(*point)`: Returns if point (`[x, y]` `Array` or args) is inside the shape when filled (having `fill` value) or on the outline when stroked (not having `fill` value yet `stroke` value only)
 - `#perfect_shape`: returns [PerfectShape](https://github.com/AndyObtiva/perfect-shape) object matching the [libui](https://github.com/andlabs/libui) shape.
+- `#move_by(x_delta, y_delta)` (alias: `translate`): moves (translates) shape by x,y delta
+- `#move(x, y)`: moves (translates) shape to x,y coordinates (in the top-left x,y corner of the shape)
+- `#min_x`: minimum x coordinate of shape (of top-left corner)
+- `#min_y`: minimum y coordinate of shape (of top-left corner)
+- `#max_x`: maximum x coordinate of shape (of bottom-right corner)
+- `#max_y`: maximum y coordinate of shape (of bottom-right corner)
+- `#center_point` (`Array` of x,y): center point of shape
+- `#center_x`: center x coordinate of shape
+- `#center_y`: center y coordinate of shape
 
 #### Area Text
 
@@ -11023,7 +11032,9 @@ Timer.new
 
 #### Shape Coloring
 
-This example demonstrates being able to nest a listener within shapes directly, and [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) will automatically detect when the mouse lands inside a shape to notify listener.
+This example demonstrates being able to nest listeners within shapes directly, and [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) will automatically detect when the mouse lands inside the shapes to notify listeners.
+
+This example also demonstrates very basic drag and drop support, implemented manually with shape listeners.
 
 [examples/shape_coloring.rb](examples/shape_coloring.rb)
 
@@ -11039,7 +11050,12 @@ Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/
 ruby -r glimmer-dsl-libui -e "require 'examples/shape_coloring'"
 ```
 
+Shape Coloring Example
+
 ![glimmer-dsl-libui-mac-shape-coloring.png](images/glimmer-dsl-libui-mac-shape-coloring.png)
+
+![glimmer-dsl-libui-mac-shape-coloring-drag-and-drop.png](images/glimmer-dsl-libui-mac-shape-coloring-drag-and-drop.png)
+
 ![glimmer-dsl-libui-mac-shape-coloring-color-dialog.png](images/glimmer-dsl-libui-mac-shape-coloring-color-dialog.png)
 
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
@@ -11057,11 +11073,11 @@ class ShapeColoring
   }
   
   body {
-    window('Shape Coloring', 200, 200) {
+    window('Shape Coloring', 200, 220) {
       margined false
       
       grid {
-        label("Click a shape to select and\nchange color via color button") {
+        label("Drag & drop shapes to move or\nclick a shape to select and\nchange color via color button") {
           left 0
           top 0
           hexpand true
@@ -11090,19 +11106,19 @@ class ShapeColoring
             fill :white
           }
           
-          @shapes << colorable(:rectangle, 20, 20, 40, 20) { |shape|
+          @shapes << colorable(:rectangle, 20, 20, 40, 20) {
             fill :lime
           }
           
-          @shapes << colorable(:square, 80, 20, 20) { |shape|
+          @shapes << colorable(:square, 80, 20, 20) {
             fill :blue
           }
           
-          @shapes << colorable(:circle, 75, 70, 20, 20) { |shape|
+          @shapes << colorable(:circle, 75, 70, 20) {
             fill :green
           }
           
-          @shapes << colorable(:arc, 120, 70, 40, 0, 145) { |shape|
+          @shapes << colorable(:arc, 120, 70, 40, 0, 145) {
             fill :orange
           }
           
@@ -11115,6 +11131,14 @@ class ShapeColoring
                      40, 120, 20, 120, 30, 91) {
             fill :pink
           }
+          
+          on_mouse_dragged do |area_mouse_event|
+            mouse_dragged(area_mouse_event)
+          end
+          
+          on_mouse_dropped do |area_mouse_event|
+            mouse_dropped(area_mouse_event)
+          end
         }
       }
     }
@@ -11123,18 +11147,54 @@ class ShapeColoring
   def colorable(shape_symbol, *args, &content)
     send(shape_symbol, *args) do |shape|
       on_mouse_up do |area_mouse_event|
-        old_stroke = Glimmer::LibUI.interpret_color(shape.stroke).slice(:r, :g, :b)
-        @shapes.each {|sh| sh.stroke = nil}
-        @selected_shape = nil
-        unless old_stroke == COLOR_SELECTION
-          shape.stroke = COLOR_SELECTION.merge(thickness: 2)
-          @selected_shape = shape
+        unless @dragged_shape
+          old_stroke = Glimmer::LibUI.interpret_color(shape.stroke).slice(:r, :g, :b)
+          @shapes.each {|sh| sh.stroke = nil}
+          @selected_shape = nil
+          unless old_stroke == COLOR_SELECTION
+            shape.stroke = COLOR_SELECTION.merge(thickness: 2)
+            @selected_shape = shape
+          end
         end
       end
       
+      on_mouse_drag_started do |area_mouse_event|
+        mouse_drag_started(shape, area_mouse_event)
+      end
+      
+      on_mouse_dragged do |area_mouse_event|
+        mouse_dragged(area_mouse_event)
+      end
+      
+      on_mouse_dropped do |area_mouse_event|
+        mouse_dropped(area_mouse_event)
+      end
+      
       content.call(shape)
     end
   end
+  
+  def mouse_drag_started(dragged_shape, area_mouse_event)
+    @dragged_shape = dragged_shape
+    @dragged_shape_x = area_mouse_event[:x]
+    @dragged_shape_y = area_mouse_event[:y]
+  end
+  
+  def mouse_dragged(area_mouse_event)
+    if @dragged_shape && @dragged_shape_x && @dragged_shape_y
+      x_delta = area_mouse_event[:x] - @dragged_shape_x
+      y_delta = area_mouse_event[:y] - @dragged_shape_y
+      @dragged_shape.move_by(x_delta, y_delta)
+      @dragged_shape_x = area_mouse_event[:x]
+      @dragged_shape_y = area_mouse_event[:y]
+    end
+  end
+  
+  def mouse_dropped(area_mouse_event)
+    @dragged_shape = nil
+    @dragged_shape_x = nil
+    @dragged_shape_y = nil
+  end
 end
 
 ShapeColoring.launch

data/VERSION

@@ -1 +1 @@
-0.5.10
+0.5.11

data/examples/shape_coloring.rb

@@ -10,11 +10,11 @@ class ShapeColoring
   }
   
   body {
-    window('Shape Coloring', 200, 200) {
+    window('Shape Coloring', 200, 220) {
       margined false
       
       grid {
-        label("Click a shape to select and\nchange color via color button") {
+        label("Drag & drop shapes to move or\nclick a shape to select and\nchange color via color button") {
           left 0
           top 0
           hexpand true
@@ -43,19 +43,19 @@ class ShapeColoring
             fill :white
           }
           
-          @shapes << colorable(:rectangle, 20, 20, 40, 20) { |shape|
+          @shapes << colorable(:rectangle, 20, 20, 40, 20) {
             fill :lime
           }
           
-          @shapes << colorable(:square, 80, 20, 20) { |shape|
+          @shapes << colorable(:square, 80, 20, 20) {
             fill :blue
           }
           
-          @shapes << colorable(:circle, 75, 70, 20, 20) { |shape|
+          @shapes << colorable(:circle, 75, 70, 20) {
             fill :green
           }
           
-          @shapes << colorable(:arc, 120, 70, 40, 0, 145) { |shape|
+          @shapes << colorable(:arc, 120, 70, 40, 0, 145) {
             fill :orange
           }
           
@@ -68,6 +68,14 @@ class ShapeColoring
                      40, 120, 20, 120, 30, 91) {
             fill :pink
           }
+          
+          on_mouse_dragged do |area_mouse_event|
+            mouse_dragged(area_mouse_event)
+          end
+          
+          on_mouse_dropped do |area_mouse_event|
+            mouse_dropped(area_mouse_event)
+          end
         }
       }
     }
@@ -76,18 +84,54 @@ class ShapeColoring
   def colorable(shape_symbol, *args, &content)
     send(shape_symbol, *args) do |shape|
       on_mouse_up do |area_mouse_event|
-        old_stroke = Glimmer::LibUI.interpret_color(shape.stroke).slice(:r, :g, :b)
-        @shapes.each {|sh| sh.stroke = nil}
-        @selected_shape = nil
-        unless old_stroke == COLOR_SELECTION
-          shape.stroke = COLOR_SELECTION.merge(thickness: 2)
-          @selected_shape = shape
+        unless @dragged_shape
+          old_stroke = Glimmer::LibUI.interpret_color(shape.stroke).slice(:r, :g, :b)
+          @shapes.each {|sh| sh.stroke = nil}
+          @selected_shape = nil
+          unless old_stroke == COLOR_SELECTION
+            shape.stroke = COLOR_SELECTION.merge(thickness: 2)
+            @selected_shape = shape
+          end
         end
       end
       
+      on_mouse_drag_started do |area_mouse_event|
+        mouse_drag_started(shape, area_mouse_event)
+      end
+      
+      on_mouse_dragged do |area_mouse_event|
+        mouse_dragged(area_mouse_event)
+      end
+      
+      on_mouse_dropped do |area_mouse_event|
+        mouse_dropped(area_mouse_event)
+      end
+      
       content.call(shape)
     end
   end
+  
+  def mouse_drag_started(dragged_shape, area_mouse_event)
+    @dragged_shape = dragged_shape
+    @dragged_shape_x = area_mouse_event[:x]
+    @dragged_shape_y = area_mouse_event[:y]
+  end
+  
+  def mouse_dragged(area_mouse_event)
+    if @dragged_shape && @dragged_shape_x && @dragged_shape_y
+      x_delta = area_mouse_event[:x] - @dragged_shape_x
+      y_delta = area_mouse_event[:y] - @dragged_shape_y
+      @dragged_shape.move_by(x_delta, y_delta)
+      @dragged_shape_x = area_mouse_event[:x]
+      @dragged_shape_y = area_mouse_event[:y]
+    end
+  end
+  
+  def mouse_dropped(area_mouse_event)
+    @dragged_shape = nil
+    @dragged_shape_x = nil
+    @dragged_shape_y = nil
+  end
 end
 
 ShapeColoring.launch

data/lib/glimmer/libui/control_proxy/path_proxy.rb

@@ -162,6 +162,10 @@ module Glimmer
           @parent_proxy&.request_auto_redraw
         end
         
+        def move_by(x_delta, y_delta)
+          children.each {|child| child.move_by(x_delta, y_delta)}
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = [draw_fill_mode, children]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/perfect_shaped.rb

@@ -1,7 +1,14 @@
+require 'forwardable'
+  
 module Glimmer
   module LibUI
     # GUI View objects that can be represented by PerfectShape objects
     module PerfectShaped
+      extend Forwardable
+      
+      def_delegators :perfect_shape,
+                     :min_x, :min_y, :max_x, :max_y, :center_point, :center_x, :center_y
+      
       # Returns if shape contains point on the inside when outline is false (default)
       # or if point is on the outline when outline is true
       # distance_tolerance is used when outline is true to enable a fuzz factor in
@@ -34,6 +41,18 @@ module Glimmer
         ]
       end
       
+      # moves by x delta and y delta. Classes must implement
+      def move_by(x_delta, y_delta)
+        # No Op
+      end
+      alias translate move_by
+      
+      def move(x, y)
+        x_delta = x - perfect_shape.min_x
+        y_delta = y - perfect_shape.min_y
+        move_by(x_delta, y_delta)
+      end
+      
       # Returns PerfectShape object matching this shape to enable
       # executing computational geometry algorithms
       #

data/lib/glimmer/libui/shape/arc.rb

@@ -45,6 +45,11 @@ module Glimmer
           super
         end
         
+        def move_by(x_delta, y_delta)
+          self.x_center += x_delta
+          self.y_center += y_delta
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = [x_center, y_center, radius, start_angle, sweep, is_negative]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/bezier.rb

@@ -50,6 +50,17 @@ module Glimmer
           x && y
         end
         
+        def move_by(x_delta, y_delta)
+          self.x += x_delta
+          self.y += y_delta
+          self.c1_x += x_delta
+          self.c1_y += y_delta
+          self.c2_x += x_delta
+          self.c2_y += y_delta
+          self.end_x += x_delta
+          self.end_y += y_delta
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = [x, y, c1_x, c1_y, c2_x, c2_y, end_x, end_y]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/circle.rb

@@ -45,6 +45,11 @@ module Glimmer
           super
         end
         
+        def move_by(x_delta, y_delta)
+          self.x_center += x_delta
+          self.y_center += y_delta
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = [x_center, y_center, radius]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/figure.rb

@@ -51,6 +51,12 @@ module Glimmer
         alias set_closed closed
         alias closed? closed
         
+        def move_by(x_delta, y_delta)
+          self.x += x_delta
+          self.y += y_delta
+          children.each {|child| child.move_by(x_delta, y_delta)}
+        end
+                
         def perfect_shape
           perfect_shape_dependencies = [x, y, closed, parent.draw_fill_mode, children]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/line.rb

@@ -53,6 +53,13 @@ module Glimmer
           !parent.is_a?(Figure) && end_x && end_y
         end
         
+        def move_by(x_delta, y_delta)
+          self.x += x_delta
+          self.y += y_delta
+          self.end_x += x_delta
+          self.end_y += y_delta
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = [x, y, end_x, end_y]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/polybezier.rb

@@ -40,6 +40,10 @@ module Glimmer
           super
         end
         
+        def move_by(x_delta, y_delta)
+          self.point_array = point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = PerfectShape::MultiPoint.normalize_point_array(point_array)
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/polygon.rb

@@ -41,6 +41,10 @@ module Glimmer
           super
         end
         
+        def move_by(x_delta, y_delta)
+          self.point_array = point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = PerfectShape::MultiPoint.normalize_point_array(point_array)
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/polyline.rb

@@ -40,6 +40,10 @@ module Glimmer
           super
         end
         
+        def move_by(x_delta, y_delta)
+          self.point_array = point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = PerfectShape::MultiPoint.normalize_point_array(point_array)
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/rectangle.rb

@@ -33,6 +33,11 @@ module Glimmer
           super
         end
         
+        def move_by(x_delta, y_delta)
+          self.x += x_delta
+          self.y += y_delta
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = [x, y, width, height]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape/square.rb

@@ -35,6 +35,11 @@ module Glimmer
         
         # TODO look into refactoring/unifying code with Rectangle
         
+        def move_by(x_delta, y_delta)
+          self.x += x_delta
+          self.y += y_delta
+        end
+        
         def perfect_shape
           perfect_shape_dependencies = [x, y, length]
           if perfect_shape_dependencies != @perfect_shape_dependencies

data/lib/glimmer/libui/shape.rb

@@ -181,7 +181,7 @@ module Glimmer
           super
         end
       end
-      
+    
       private
       
       def build_control

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: super_module
   requirement: !ruby/object:Gem::Requirement