glimmer-dsl-libui 0.5.8 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99fb74f5b4aa47cf07f00cf6afb426a66cbac0947d1e854c859703b9158d635
-  data.tar.gz: 75a27219914e19011e47051b60312e11ac83980d98e18fcb387ea84bfbfb6dd5
+  metadata.gz: edec94cbcdfb5f8766a7b04c6c19719a8525d971349db5c3f2989b762cee2c56
+  data.tar.gz: 60706b17b64dd6660a14dc46e31ec16039daa3074e4f3e3561061d20898271ff
 SHA512:
-  metadata.gz: bf483f831272a8d2443a1b932ab2e25043377d3c349a6dbd1810055ed87b6b8409b78e74e7e8d938dda8945108258dd692626dcc2f859d8309066c7e6c1ef058
-  data.tar.gz: 94d01b95cab06dbab277fdd1e2478b5f49c635e07c0702fb51e3726594de6a76a55d3d15185abeed8064ab12cec9bd16bbee5f1aa131ebae9c6e22d5401c4584
+  metadata.gz: e08e7c05b971f6ff16213dbdf14f8809fe45aa8f8d8b2ba563468eaf2eb14867a6cce4552fe4ae897e2a475b19b59f8179eb18864f15981db3c55bbe2dddd724
+  data.tar.gz: a96f5e238962f5998385046af93b2b5f101612e3626be7261de9373f7e106dd03fab044afe9bb2b5a7130f2b6e90ce900551a9ad209cddeb1fd2df59065edfca

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # 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 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
+
+- Upgrade to glimmer v2.7.3
+- Upgrade to perfect-shape v1.0.3
+- Support `path`/`figure`/shape `#contain?`, `#include?`, and `#bounding_box` methods via perfect-shape algorithms applying the path winding rule (aka `draw_fill_mode`)
+
 ## 0.5.8
 
 - Support `code_area` class-based custom control as a code-syntax-highlighted `area` control using the `rouge` gem

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.8
+# [<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)
@@ -322,11 +322,11 @@ Mac | Windows | Linux
 
 [Check Out Many More Examples Over Here!](#examples)
 
-![glimmer-dsl-libui-mac-snake.gif](images/glimmer-dsl-libui-mac-snake.gif)
+[![glimmer-dsl-libui-mac-snake.gif](images/glimmer-dsl-libui-mac-snake.gif)](https://github.com/AndyObtiva/glimmer-dsl-libui#snake)
 
-![glimmer-dsl-libui-mac-color-the-circles.gif](images/glimmer-dsl-libui-mac-color-the-circles.gif)
+[![glimmer-dsl-libui-mac-color-the-circles.gif](images/glimmer-dsl-libui-mac-color-the-circles.gif)](https://github.com/AndyObtiva/glimmer-dsl-libui#color-the-circles)
 
-![glimmer-dsl-libui-mac-tetris.gif](images/glimmer-dsl-libui-mac-tetris.gif)
+[![glimmer-dsl-libui-mac-tetris.gif](images/glimmer-dsl-libui-mac-tetris.gif)](https://github.com/AndyObtiva/glimmer-dsl-libui#tetris)
 
 NOTE: [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) is 100% feature-complete with regards to covering the C [libui](https://github.com/andlabs/libui) library API and in beta mode (though the C [libui](https://github.com/andlabs/libui) is still mid-alpha, which is why [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) cannot be declared v1.0.0 yet). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. The more feedback and issues you report the better.
 
@@ -428,6 +428,7 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
       - [Tetris](#tetris)
       - [Tic Tac Toe](#tic-tac-toe)
       - [Timer](#timer)
+      - [Shape Coloring](#shape-coloring)
   - [Applications](#applications)
     - [Manga2PDF](#manga2pdf)
     - [Befunge98 GUI](#befunge98-gui)
@@ -578,7 +579,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.5.8'
+gem 'glimmer-dsl-libui', '~> 0.5.11'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -1087,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
 
@@ -1392,6 +1402,10 @@ In general, it is recommended to use declarative stable paths whenever feasible
 
 #### Area Listeners
 
+`area` supports a number of keyboard and mouse listeners to enable observing the control for user interaction to execute some logic.
+
+The same listeners can be nested directly under `area` shapes like `rectangle` and `circle`, and [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) will automatically detect when the mouse lands within those shapes to constrain triggering the listeners by the shape regions.
+
 `area` supported listeners are:
 - `on_key_event {|area_key_event| ...}`: general catch-all key event (recommend using fine-grained key events below instead)
 - `on_key_down {|area_key_event| ...}`
@@ -11016,6 +11030,176 @@ end
 Timer.new
 ```
 
+#### Shape Coloring
+
+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)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/shape_coloring.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+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:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+class ShapeColoring
+  include Glimmer::LibUI::Application
+  
+  COLOR_SELECTION = Glimmer::LibUI.interpret_color(:red)
+  
+  before_body {
+    @shapes = []
+  }
+  
+  body {
+    window('Shape Coloring', 200, 220) {
+      margined false
+      
+      grid {
+        label("Drag & drop shapes to move or\nclick a shape to select and\nchange color via color button") {
+          left 0
+          top 0
+          hexpand true
+          halign :center
+          vexpand false
+        }
+        
+        color_button { |cb|
+          left 0
+          top 1
+          hexpand true
+          vexpand false
+          
+          on_changed do
+            @selected_shape&.fill = cb.color
+          end
+        }
+      
+        area {
+          left 0
+          top 2
+          hexpand true
+          vexpand true
+          
+          rectangle(0, 0, 600, 400) { # background shape
+            fill :white
+          }
+          
+          @shapes << colorable(:rectangle, 20, 20, 40, 20) {
+            fill :lime
+          }
+          
+          @shapes << colorable(:square, 80, 20, 20) {
+            fill :blue
+          }
+          
+          @shapes << colorable(:circle, 75, 70, 20) {
+            fill :green
+          }
+          
+          @shapes << colorable(:arc, 120, 70, 40, 0, 145) {
+            fill :orange
+          }
+          
+          @shapes << colorable(:polygon, 120, 10, 120, 50, 150, 10, 150, 50) {
+            fill :cyan
+          }
+          
+          @shapes << colorable(:polybezier, 20, 40,
+                     30, 100, 50, 80, 80, 110,
+                     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
+        }
+      }
+    }
+  }
+  
+  def colorable(shape_symbol, *args, &content)
+    send(shape_symbol, *args) do |shape|
+      on_mouse_up do |area_mouse_event|
+        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
+```
+
 ## Applications
 
 Here are some applications built with [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui)

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.11

data/examples/shape_coloring.rb

@@ -0,0 +1,137 @@
+require 'glimmer-dsl-libui'
+
+class ShapeColoring
+  include Glimmer::LibUI::Application
+  
+  COLOR_SELECTION = Glimmer::LibUI.interpret_color(:red)
+  
+  before_body {
+    @shapes = []
+  }
+  
+  body {
+    window('Shape Coloring', 200, 220) {
+      margined false
+      
+      grid {
+        label("Drag & drop shapes to move or\nclick a shape to select and\nchange color via color button") {
+          left 0
+          top 0
+          hexpand true
+          halign :center
+          vexpand false
+        }
+        
+        color_button { |cb|
+          left 0
+          top 1
+          hexpand true
+          vexpand false
+          
+          on_changed do
+            @selected_shape&.fill = cb.color
+          end
+        }
+      
+        area {
+          left 0
+          top 2
+          hexpand true
+          vexpand true
+          
+          rectangle(0, 0, 600, 400) { # background shape
+            fill :white
+          }
+          
+          @shapes << colorable(:rectangle, 20, 20, 40, 20) {
+            fill :lime
+          }
+          
+          @shapes << colorable(:square, 80, 20, 20) {
+            fill :blue
+          }
+          
+          @shapes << colorable(:circle, 75, 70, 20) {
+            fill :green
+          }
+          
+          @shapes << colorable(:arc, 120, 70, 40, 0, 145) {
+            fill :orange
+          }
+          
+          @shapes << colorable(:polygon, 120, 10, 120, 50, 150, 10, 150, 50) {
+            fill :cyan
+          }
+          
+          @shapes << colorable(:polybezier, 20, 40,
+                     30, 100, 50, 80, 80, 110,
+                     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
+        }
+      }
+    }
+  }
+  
+  def colorable(shape_symbol, *args, &content)
+    send(shape_symbol, *args) do |shape|
+      on_mouse_up do |area_mouse_event|
+        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/dsl/libui/listener_expression.rb

@@ -27,7 +27,7 @@ module Glimmer
     module Libui
       class ListenerExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::LibUI::ControlProxy) and
+          (parent.is_a?(Glimmer::LibUI::ControlProxy) or parent.is_a?(Glimmer::LibUI::Shape)) and
             block_given? and
             parent.can_handle_listener?(keyword)
         end

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

@@ -23,6 +23,7 @@ require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/parent'
 require 'glimmer/libui/control_proxy/transformable'
+require 'glimmer/libui/perfect_shaped'
 
 module Glimmer
   module LibUI
@@ -32,6 +33,7 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class PathProxy < ControlProxy
         include Parent
+        include PerfectShaped
         prepend Transformable
       
         def initialize(keyword, parent, args, &block)
@@ -160,6 +162,34 @@ 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
+            draw_fill_mode, children = @perfect_shape_dependencies = perfect_shape_dependencies
+            shapes = children.map(&:perfect_shape)
+            new_shapes = []
+            shapes.each do |shape|
+              if shape.is_a?(PerfectShape::Path)
+                new_shapes += shape.basic_shapes
+              else
+                new_shapes << shape
+              end
+            end
+            shapes = new_shapes
+            winding_rule = draw_fill_mode == :winding ? :wind_non_zero : :wind_even_odd
+            @perfect_shape = PerfectShape::Path.new(
+              shapes: shapes,
+              winding_rule: winding_rule,
+              line_to_complex_shapes: true
+            )
+          end
+          @perfect_shape
+        end
+        
         private
         
         def build_control

data/lib/glimmer/libui/perfect_shaped.rb

@@ -0,0 +1,65 @@
+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
+      # determining if a point lies on the outline (e.g. makes it easier to select
+      # a shape by mouse)
+      def contain?(*point, outline: false, distance_tolerance: 0)
+        perfect_shape&.contain?(*point, outline: outline, distance_tolerance: distance_tolerance)
+      end
+      
+      # Returns if shape includes point on the inside when filled
+      # or if shape includes point on the outline when stroked
+      def include?(*point)
+        if fill.empty?
+          contain?(*point, outline: true, distance_tolerance: ((stroke[:thickness] || 1) - 1))
+        else
+          contain?(*point)
+        end
+      end
+      
+      # Returns bounding box Array consisting of
+      # [minx, miny, width, height]
+      def bounding_box
+        perfect_shape_bounding_box = perfect_shape&.bounding_box
+        return if perfect_shape_bounding_box.nil?
+        [
+          perfect_shape_bounding_box.x,
+          perfect_shape_bounding_box.y,
+          perfect_shape_bounding_box.width,
+          perfect_shape_bounding_box.height,
+        ]
+      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
+      #
+      # Including classes must implement
+      def perfect_shape
+        # No Op
+      end
+    end
+  end
+end

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

@@ -29,7 +29,7 @@ module Glimmer
       class Figure < Shape
         parameters :x, :y
         parameter_defaults nil, nil
-      
+        
         def draw(area_draw_params)
           ::LibUI.draw_path_new_figure(path_proxy.libui, *@args) unless @args.compact.empty? # TODO if args empty then wait till there is an arc child and it starts the figure
           children.dup.each {|child| child.draw(area_draw_params)}
@@ -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
@@ -58,7 +64,12 @@ module Glimmer
             path_shapes = [[x, y]]
             path_shapes += children.map(&:perfect_shape)
             winding_rule = draw_fill_mode == :winding ? :wind_non_zero : :wind_even_odd
-            @perfect_shape = PerfectShape::Path.new(closed: closed, winding_rule: winding_rule, shapes: path_shapes)
+            @perfect_shape = PerfectShape::Path.new(
+              closed: closed,
+              winding_rule: winding_rule,
+              shapes: path_shapes,
+              line_to_complex_shapes: true
+            )
           end
           @perfect_shape
         end

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

@@ -23,6 +23,7 @@ require 'glimmer/libui/parent'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/control_proxy/path_proxy'
 require 'glimmer/libui/data_bindable'
+require 'glimmer/libui/perfect_shaped'
 
 module Glimmer
   module LibUI
@@ -65,6 +66,7 @@ module Glimmer
       end
       
       include Parent
+      include PerfectShaped
       include DataBindable
       
       attr_reader :parent, :args, :keyword, :block, :content_added
@@ -145,47 +147,17 @@ module Glimmer
       end
       alias transform= transform
       alias set_transform transform
-    
-      # 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
-      # determining if a point lies on the outline (e.g. makes it easier to select
-      # a shape by mouse)
-      def contain?(*point, outline: false, distance_tolerance: 0)
-        perfect_shape&.contain?(*point, outline: outline, distance_tolerance: distance_tolerance)
-      end
-      
-      # Returns if shape includes point on the inside when filled
-      # or if shape includes point on the outline when stroked
-      def include?(*point)
-        if fill.empty?
-          contain?(*point, outline: true, distance_tolerance: ((stroke[:thickness] || 1) - 1))
-        else
-          contain?(*point)
-        end
-      end
       
-      # Returns bounding box Array consisting of
-      # [minx, miny, width, height]
-      def bounding_box
-        perfect_shape_bounding_box = perfect_shape&.bounding_box
-        return if perfect_shape_bounding_box.nil?
-        [
-          perfect_shape_bounding_box.x,
-          perfect_shape_bounding_box.y,
-          perfect_shape_bounding_box.width,
-          perfect_shape_bounding_box.height,
-        ]
+      def can_handle_listener?(listener_name)
+        area_proxy.can_handle_listener?(listener_name)
       end
       
-      # Returns PerfectShape object matching this shape to enable
-      # executing computational geometry algorithms
-      #
-      # Subclasses must implement
-      def perfect_shape
-        # No Op
+      def handle_listener(listener_name, &listener)
+        area_proxy.handle_listener(listener_name) do |event|
+          listener.call(event) if include?(event[:x], event[:y])
+        end
       end
-      
+
       def respond_to?(method_name, *args, &block)
         self.class.parameters.include?(method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym) or
           super(method_name, true)
@@ -209,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.8
+  version: 0.5.11
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.7.3
 - !ruby/object:Gem::Dependency
   name: perfect-shape
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: super_module
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +355,7 @@ files:
 - examples/midi_player.rb
 - examples/midi_player2.rb
 - examples/midi_player3.rb
+- examples/shape_coloring.rb
 - examples/simple_notepad.rb
 - examples/snake.rb
 - examples/snake/model/apple.rb
@@ -471,6 +472,7 @@ files:
 - lib/glimmer/libui/data_bindable.rb
 - lib/glimmer/libui/image_path_renderer.rb
 - lib/glimmer/libui/parent.rb
+- lib/glimmer/libui/perfect_shaped.rb
 - lib/glimmer/libui/shape.rb
 - lib/glimmer/libui/shape/arc.rb
 - lib/glimmer/libui/shape/bezier.rb
@@ -509,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubygems_version: 3.3.1
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI