glimmer-dsl-libui 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f447a302c22ea118d50c6d8f1b81c3a74cbd81fb7b6b6d61a7bb0cf22e9dd3
-  data.tar.gz: 50faeffb8a2e2efaece4464432ecb6a51080e9662b4778f606f872a8286332a9
+  metadata.gz: dc16d9ab058fc6f75617c56ba43134253caf52ff729402efa045121823687245
+  data.tar.gz: 3ff67efc0e34b5730818c477693f81d31cb41a7f3b928fda34038d358d26c71e
 SHA512:
-  metadata.gz: 570a7e4002cb5da3dcd49d6eb03c5554817036626c293faf3cbc2abc72063b83954e1c4795ad64a1b975ff6b8bca9d84b31a142914489777754ca5afb0d73cc0
-  data.tar.gz: 0bdfb434406fc6bb3b1dcc08562ca0507d3d58821306dafec68089248910cb4e325fb0dd3282f2424754980682d46595b8fae1e658a5e4636b680f1e9ce52fff
+  metadata.gz: 7cfe89c0e5f2f0507484c8fadddc2bd75f02e8cb6f09368679c58ebde66fb37dc8c1980b9617e578846138e92b2a6b77920e2f7b5309ddb98cfc658b7bcaabd7
+  data.tar.gz: 99479329a3c7917bc2768f3ca7d7514c448ce70888b807741bf18db67e45d5c139c0ffe6ac7d21595a4f33ddb0cd92e7c328f63470cedd0569c974574fb5938a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.1.7
+
+- Support `stroke` `:dashes` and use in examples/area_gallery.rb
+- Support symbol values for draw_line_cap (`:round`, `:square`, `:flat`) and draw_line_join (`:miter`, `:round`, `:bevel`) and draw_fill_mode (`:winding` and `:alternate`)
+
 ## 0.1.6
 
 - Update default `window` `width` to `190`

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.1.6
+# [<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.1.7
 ## 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)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-libui/maintainability)
@@ -115,13 +115,13 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc(200, 200, 90, 0, 360, false)
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
   }
 }.show
@@ -143,7 +143,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.1.6](#-glimmer-dsl-for-libui-016)
+- [Glimmer DSL for LibUI 0.1.7](#-glimmer-dsl-for-libui-017)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -273,7 +273,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.1.6'
+gem 'glimmer-dsl-libui', '~> 0.1.7'
 ```
 
 Add `require 'glimmer-dsl-libui'` at the top, and then `include Glimmer` into the top-level main object for testing or into an actual class for serious usage.
@@ -381,7 +381,7 @@ Control(Args) | Properties | Listeners
 `msg_box(window = main_window as Glimmer::LibUI::WindowProxy, title as String, description as String)` | None | None
 `msg_box_error(window = main_window as Glimmer::LibUI::WindowProxy, title as String, description as String)` | None | None
 `non_wrapping_multiline_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
-`path` | `fill` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`), `stroke` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`, `:cap` as `Numeric`, `:join` as `Numeric`, `:thickness` as `Numeric`, `:miter_limit` as `Numeric` ) | None
+`path(draw_fill_mode = :winding)` | `fill` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`), `stroke` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`, `:cap` as (`:round`, `:square`, `:flat`), `:join` as (`:miter`, `:round`, `:bevel`), `:thickness` as `Numeric`, `:miter_limit` as `Numeric`, `:dashes` as `Array` of `Numeric` ) | None
 `preferences_menu_item` | None | `on_clicked`
 `progress_bar` | `value` (`Numeric`) | None
 `progress_bar_column(name as String)` | None | None
@@ -585,6 +585,8 @@ window('Basic Area', 400, 400) {
 
 Check [examples/dynamic_area.rb](#dynamic-area) for a more detailed semi-declarative example.
 
+`path` can receive a `draw_fill_mode` argument that can accept values `:winding` or `:alternate` and defaults to `:winding`.
+
 Available nested `path` shapes:
 - `rectangle(x as Numeric, y as Numeric, width as Numeric, height as Numeric)`
 - `square(x as Numeric, y as Numeric, length as Numeric)`
@@ -3367,13 +3369,13 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc(200, 200, 90, 0, 360, false)
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
   }
 }.show
@@ -3476,7 +3478,7 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc {
@@ -3489,7 +3491,7 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
   }
 }.show
@@ -3539,13 +3541,13 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc(200, 200, 90, 0, 360, false)
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
   }
@@ -3650,7 +3652,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc {
@@ -3663,7 +3665,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
   }

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/examples/area_gallery.rb

@@ -38,13 +38,13 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc(200, 200, 90, 0, 360, false)
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
   }
 }.show

data/examples/area_gallery2.rb

@@ -92,7 +92,7 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc {
@@ -105,7 +105,7 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
   }
 }.show

data/examples/area_gallery3.rb

@@ -39,13 +39,13 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc(200, 200, 90, 0, 360, false)
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
   }

data/examples/area_gallery4.rb

@@ -93,7 +93,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc {
@@ -106,7 +106,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
   }

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

@@ -117,17 +117,38 @@ module Glimmer
         
         def draw_stroke_params
           @draw_stroke_params ||= ::LibUI::FFI::DrawStrokeParams.malloc
-          @draw_stroke_params.Cap = @stroke[:cap] || 0 # flat
-          @draw_stroke_params.Join = @stroke[:join] || 0 # miter
+          @draw_stroke_params.Cap = draw_line_cap # flat
+          @draw_stroke_params.Join = draw_line_join # miter
           @draw_stroke_params.Thickness = @stroke[:thickness] || 1
           @draw_stroke_params.MiterLimit = @stroke[:miter_limit] || 10 # DEFAULT_MITER_LIMIT
-          @draw_stroke_params_dashes ||= Fiddle::Pointer.malloc(8)
-          @draw_stroke_params.Dashes = @draw_stroke_params_dashes
-          @draw_stroke_params.NumDashes = @stroke[:num_dashes] || 0 # TODO reimplement this line correctly (perhaps no need to pass num dashes, yet dashes themselves and use their count here)
+          @draw_stroke_params.Dashes = @stroke[:dashes].to_a.pack('d*')
+          @draw_stroke_params.NumDashes = @stroke[:dashes].to_a.count
           @draw_stroke_params.DashPhase = @stroke[:dash_phase] || 0
           @draw_stroke_params
         end
         
+        def draw_line_cap
+          case @stroke && @stroke[:cap].to_s
+          when 'round'
+            1
+          when 'square'
+            2
+          else # 'flat'
+            0
+          end
+        end
+        
+        def draw_line_join
+          case @stroke && @stroke[:join].to_s
+          when 'round'
+            1
+          when 'bevel'
+            2
+          else # 'miter'
+            0
+          end
+        end
+        
         def destroy
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Andy Maleh