glimmer-dsl-libui 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99fb74f5b4aa47cf07f00cf6afb426a66cbac0947d1e854c859703b9158d635
-  data.tar.gz: 75a27219914e19011e47051b60312e11ac83980d98e18fcb387ea84bfbfb6dd5
+  metadata.gz: 6a198df8af13246ffee6aa56434bfa89740e9211e19da28fb0dddb1705000eec
+  data.tar.gz: cb4c0b685980983fb17cc3f501165d8fa788a56ce4da9ced03630a78329045af
 SHA512:
-  metadata.gz: bf483f831272a8d2443a1b932ab2e25043377d3c349a6dbd1810055ed87b6b8409b78e74e7e8d938dda8945108258dd692626dcc2f859d8309066c7e6c1ef058
-  data.tar.gz: 94d01b95cab06dbab277fdd1e2478b5f49c635e07c0702fb51e3726594de6a76a55d3d15185abeed8064ab12cec9bd16bbee5f1aa131ebae9c6e22d5401c4584
+  metadata.gz: 3809a094cb6cd607d94c0d37c10f67213c3bab4cc3d74d7d8d3c4d49514da75e3ae2b99328d09291f4905b7d3c85aea14f6935f22d3cac249edf533eff5e575d
+  data.tar.gz: 3efefe3c53b4520b077165df099f9427f112c7cc1acafed0d878fe187d65657264b6317de470e6330a12c63bde1edd4694455bc675be87f8e374ee0113235ae0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 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.9
 ## 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.
 
@@ -578,7 +578,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.9'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

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,30 @@ module Glimmer
           @parent_proxy&.request_auto_redraw
         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,46 @@
+module Glimmer
+  module LibUI
+    # GUI View objects that can be represented by PerfectShape objects
+    module PerfectShaped
+      # 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
+      
+      # 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/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)}
@@ -58,7 +58,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.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,7 @@ 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,
-        ]
-      end
-      
-      # Returns PerfectShape object matching this shape to enable
-      # executing computational geometry algorithms
-      #
-      # Subclasses must implement
-      def perfect_shape
-        # No Op
-      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)

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.9
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-04-26 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.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: super_module
   requirement: !ruby/object:Gem::Requirement
@@ -471,6 +471,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 +510,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