glimmer-dsl-libui 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d0cbf805427a73645a86c95d7fa1c36f030c24ca6a19b1273f7b37c2426f05
-  data.tar.gz: f8e728ea7b9e8b3a4393e8ba02d2958b5330d8d4292ed694a8ed02b0b651a1c9
+  metadata.gz: e20f859c1f0147fbdcdfe39d0caf2a284c922f0fd62d848e01a1ac6e6c05b6ee
+  data.tar.gz: a7cdd076d22cfeeb5675780c4f918364fac9f1207aa7d890ed1104effcb1ab3b
 SHA512:
-  metadata.gz: b79c4c8bb0138fb0059cd9bc0a9dfd5327245214c1eb1c4270c914b31065f832d065b73a6f365643eb7807c92420ed222ee91b8324dfde599c8047d6d2fc45ff
-  data.tar.gz: c2583ac2d4f84aa26f8a6528e49392c1bc2e7fea908f62787bf9378929093adc1e4058450e687e5d61cbf2ed58157b59a34300d70a1f44ea4714f757324fb399
+  metadata.gz: abe17c4c1f3a398cf3e318a68e8502ab8c657e55e80f90c9ecaa5980e16494732a970e023421d9b5bf39908ab06360458fa3cff08776879b701912c00cf86fab
+  data.tar.gz: 5c7224ebd340795677d51673fc1d6f477f4db15134ce683f4dc16f3b29c070cc34eedf748b4ffd81c41fec22e95beeac50c34ab0263826591baf420f111592f4

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 0.5.4
+
+- Support `figure` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Have `path` `draw_fill_mode` return `:winding` or `:alternate` while `draw_fill_mode_value` returns `0` or `1` respectively
+
+## 0.5.3
+
+- Support `polyline` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Support `polygon` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Support `polybezier` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+
+## 0.5.2
+
+- Support `line` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Support `bezier` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+
+## 0.5.1
+
+- Upgrade to libui 0.0.14
+- Alter `Shape#contain?` to support `outline: ` and `distance_tolerance: ` options as per perfect-shape gem
+- Support `arc` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Support `circle` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+
 ## 0.5.0
 
 - Upgrade to glimmer 2.6.0

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.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 LibUI 0.5.4
 ## 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)
@@ -519,7 +519,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.5.0'
+gem 'glimmer-dsl-libui', '~> 0.5.4'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -985,6 +985,14 @@ 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
+
+- `::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.
+
 #### Area Text
 
 To draw `text` in an `area`, you simply nest a `text(x, y, width)` control directly under `area` or inside a `on_draw` listener, and then nest attributed `string {[attributes]; string_value}` controls underneath it returning an actual `String` (think of them as the `<span>` or `<p>` element in html, which contains a string of text). Alternatively, you can nest attributed `string(string_value) {[attributes]}` if `string_value` is a short single-line string. An attributed `string` value can be changed dynamically via its `string` property.
@@ -5533,7 +5541,7 @@ class ColorTheCircles
   
   def color_circle(x, y)
     clicked_circle_data = @circles_data.find do |circle_data|
-      circle_data[:fill].nil? && circle_data[:circle]&.include?(x, y)
+      circle_data[:fill].nil? && circle_data[:circle]&.contain?(x, y)
     end
     if clicked_circle_data
       clicked_circle_data[:fill] = clicked_circle_data[:stroke]

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.4

data/examples/color_the_circles.rb

@@ -81,7 +81,7 @@ class ColorTheCircles
   
   def color_circle(x, y)
     clicked_circle_data = @circles_data.find do |circle_data|
-      circle_data[:fill].nil? && circle_data[:circle]&.include?(x, y)
+      circle_data[:fill].nil? && circle_data[:circle]&.contain?(x, y)
     end
     if clicked_circle_data
       clicked_circle_data[:fill] = clicked_circle_data[:stroke]

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

@@ -60,6 +60,10 @@ module Glimmer
         end
         
         def draw_fill_mode
+          @args[0].is_a?(Integer) ? (@args[0] == 0 ? :winding : :alternate ) : ((@args[0].is_a?(String) || @args[0].is_a?(Symbol)) ? @args[0].to_sym : :winding)
+        end
+        
+        def draw_fill_mode_value
           @args[0].is_a?(Integer) ? @args[0] : @args[0].to_s == 'alternate' ? 1 : 0
         end
         
@@ -159,7 +163,7 @@ module Glimmer
         private
         
         def build_control
-          @libui = ::LibUI.draw_new_path(draw_fill_mode)
+          @libui = ::LibUI.draw_new_path(draw_fill_mode_value)
         end
         
         def init_draw_brush(draw_brush, draw_brush_args)

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

@@ -44,6 +44,23 @@ module Glimmer
           end
           super
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = [x_center, y_center, radius, start_angle, sweep, is_negative]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x_center, y_center, radius, start_angle, sweep, is_negative = @perfect_shape_dependencies = perfect_shape_dependencies
+            sign = is_negative ? 1 : -1
+            start = is_negative ? (360 - start_angle) : -1*start_angle
+            extent = is_negative ? (360 - sweep) : -1*sweep
+            @perfect_shape = PerfectShape::Arc.new(
+              type: :open,
+              center_x: x_center, center_y: y_center,
+              radius_x: radius, radius_y: radius,
+              start: start, extent: extent
+            )
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -49,6 +49,15 @@ module Glimmer
         def include_start_point?
           x && y
         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
+            x, y, c1_x, c1_y, c2_x, c2_y, end_x, end_y = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::CubicBezierCurve.new(points: [x, y, c1_x, c1_y, c2_x, c2_y, end_x, end_y].compact)
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -45,8 +45,13 @@ module Glimmer
           super
         end
         
-        def include?(x, y)
-          (x - x_center)**2 + (y - y_center)**2 < radius**2
+        def perfect_shape
+          perfect_shape_dependencies = [x_center, y_center, radius]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x_center, y_center, radius = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Circle.new(center_x: x_center, center_y: y_center, radius: radius)
+          end
+          @perfect_shape
         end
       end
     end

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

@@ -50,6 +50,18 @@ module Glimmer
         alias closed= closed
         alias set_closed closed
         alias closed? closed
+        
+        def perfect_shape
+          perfect_shape_dependencies = [x, y, closed, parent.draw_fill_mode, children]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x, y, closed, draw_fill_mode, children = @perfect_shape_dependencies = perfect_shape_dependencies
+            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)
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -52,6 +52,15 @@ module Glimmer
           # start point
           !parent.is_a?(Figure) && end_x && end_y
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = [x, y, end_x, end_y]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x, y, end_x, end_y = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Line.new(points: [x, y, end_x, end_y].compact)
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -39,6 +39,18 @@ module Glimmer
           end
           super
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = PerfectShape::MultiPoint.normalize_point_array(point_array)
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            point_array = @perfect_shape_dependencies = perfect_shape_dependencies
+            path_shapes = [point_array.first]
+            bezier_shape_points = point_array.drop(1).each.with_index.to_a.group_by {|pair| pair.last/3}.values.map {|arr| arr.map(&:first)}
+            path_shapes += bezier_shape_points.map { |points| PerfectShape::CubicBezierCurve.new(points: points) }
+            @perfect_shape = PerfectShape::Path.new(closed: false, shapes: path_shapes)
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -40,6 +40,17 @@ module Glimmer
           end
           super
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = PerfectShape::MultiPoint.normalize_point_array(point_array)
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            point_array = @perfect_shape_dependencies = perfect_shape_dependencies
+            path_shapes = [point_array.first]
+            path_shapes += point_array.drop(1).map { |point| PerfectShape::Line.new(points: [point]) }
+            @perfect_shape = PerfectShape::Path.new(closed: true, shapes: path_shapes)
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -39,6 +39,17 @@ module Glimmer
           end
           super
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = PerfectShape::MultiPoint.normalize_point_array(point_array)
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            point_array = @perfect_shape_dependencies = perfect_shape_dependencies
+            path_shapes = [point_array.first]
+            path_shapes += point_array.drop(1).map { |point| PerfectShape::Line.new(points: [point]) }
+            @perfect_shape = PerfectShape::Path.new(closed: false, shapes: path_shapes)
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -36,8 +36,8 @@ module Glimmer
         def perfect_shape
           perfect_shape_dependencies = [x, y, width, height]
           if perfect_shape_dependencies != @perfect_shape_dependencies
-            @perfect_shape_dependencies = perfect_shape_dependencies
-            @perfect_shape = PerfectShape::Rectangle.new(x: @perfect_shape_dependencies[0], y: @perfect_shape_dependencies[1], width: @perfect_shape_dependencies[2], height: @perfect_shape_dependencies[3])
+            x, y, width, height = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Rectangle.new(x: x, y: y, width: width, height: height)
           end
           @perfect_shape
         end

data/lib/glimmer/libui/shape.rb

@@ -146,18 +146,22 @@ module Glimmer
       alias transform= transform
       alias set_transform transform
     
-      # Returns if shape contains point on the inside
-      def contain?(*point)
-        perfect_shape&.contain?(*point)
+      # 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?
-          perfect_shape&.contain?(*point, outline: true, distance_tolerance: ((stroke[:thickness] || 1) - 1))
+          contain?(*point, outline: true, distance_tolerance: ((stroke[:thickness] || 1) - 1))
         else
-          perfect_shape&.contain?(*point)
+          contain?(*point)
         end
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-02-20 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.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement