glimmer-dsl-libui 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb53c296d806a067e4397ba0b51d6449672846fc126285f9b3ecdaf93b204a9
-  data.tar.gz: 97dd865c4b0b45e2ba88e6c16b47196f0c6aa2151697ba33c6a9dd391873507e
+  metadata.gz: cc9eaa2a61420e3a1d976ab3b6882bd1e34c82a945780a39ab7c22f4146f1c93
+  data.tar.gz: 35afb04fac90b577482203540944df84138267bf3de14551e6e3cb5c836c2149
 SHA512:
-  metadata.gz: daaff4633ae70ad0691cb4828fc1678ca2fda631d1ce23dce3ebbff889fef60f25569e84492ce121a2ff518af94b796a44c0ac54095f9b843e9ec7ce9e104902
-  data.tar.gz: 6a633312a198a65ff053d1ad28112716e2d8a2468c3336a471786dcb2cf6cdc9b31b12af1881da98864d2ab953a38d92e39278631c92cd9d1d995c4a6ad71360
+  metadata.gz: 935beb60983735533a31c2a25c20bb2c817c0a184113cbafaeb2918bf9a8d485b784b86bed2273141bbf068bff005bebcb5806de82650cfeee45c14af28a0f72
+  data.tar.gz: 4d9ae69fe974dc8a91e03577856f171f3270a4d02e8075c0796a6d9aaaa94ea2c6fd9e0d93086f1000aa4bc34c4e16db3d44b6bf3bd5038f7faf6957490eba0b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.1.4
+
+- Update examples/basic_table_progress_bar.rb with a listener
+- Set default values for shape parameters and support passing shape parameters as properties inside their body (e.g. `rectangle {x 2; y 3; width 400; height 800}`)
+- New examples/area_gallery2.rb (utilizing properties instead of args)
+- New examples/area_gallery3.rb (semi-declarative on_draw dynamic paths)
+- New examples/area_gallery4.rb (utilizing properties instead of args with semi-declarative on_draw dynamic paths)
+
 ## 0.1.3
 
 - New examples/area_gallery.rb

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.3
+# [<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.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)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-libui/maintainability)
@@ -47,13 +47,23 @@ data = [
   ['task 5', -1],
 ]
 
-window('Task progress', 300, 200) {
-  horizontal_box {
+window('Task Progress', 300, 200) {
+  vertical_box {
     table {
       text_column('Task')
       progress_bar_column('Progress')
 
-      cell_rows data
+      cell_rows data # implicit data-binding
+    }
+    
+    button('Mark All As Done') {
+      stretchy false
+      
+      on_clicked do
+        data.each_with_index do |row_data, row|
+          data[row] = [row_data[0], 100] # automatically updates table due to implicit data-binding
+        end
+      end
     }
   }
 }.show
@@ -94,7 +104,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 104, a: 0.5
-        stroke thickness: 1, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0
       }
       path { # declarative stable path
         figure(0, 0) {
@@ -135,7 +145,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.1.3](#-glimmer-dsl-for-libui-013)
+- [Glimmer DSL for LibUI 0.1.4](#-glimmer-dsl-for-libui-014)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -263,7 +273,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.1.3'
+gem 'glimmer-dsl-libui', '~> 0.1.4'
 ```
 
 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.
@@ -351,7 +361,7 @@ Control(Args) | Properties | Listeners
 `date_time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
 `editable_combobox` | `items` (`Array` of `String`), `text` (`String`) | `on_changed`
 `entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
-`figure(x as Numeric, y as Numeric)` | `x` (`Numeric`), `y` (`Numeric`), `closed` (Boolean) | None
+`figure(x=nil as Numeric, y=nil as Numeric)` | `x` (`Numeric`), `y` (`Numeric`), `closed` (Boolean) | None
 `font_button` | `font` [read-only] (`Hash` of keys: `:family`, `:size`, `:weight`, `:italic`, `:stretch`), `family` as `String`, `size` as `Float`, `weight` as `Integer`, `italic` as `Integer`, `stretch` as `Integer` | `on_changed`
 `form` | `padded` (Boolean) | None
 `grid` | `padded` (Boolean) | None
@@ -580,7 +590,7 @@ Available nested `path` shapes:
 - `arc(x_center as Numeric, y_center as Numeric, radius as Numeric, start_angle as Numeric, sweep as Numeric, is_negative as Boolean)`
 - `line(x as Numeric, y as Numeric)`
 - `bezier(c1_x as Numeric, c1_y as Numeric, c2_x as Numeric, c2_y as Numeric, end_x as Numeric, end_y as Numeric)`
-- `figure(x as Numeric, y as Numeric)` (composite that can contain other shapes) (can set `closed true` to connect last point to first point automatically)
+- `figure(x=nil as Numeric, y=nil as Numeric)` (composite that can contain other shapes) (can set `closed true` to connect last point to first point automatically)
 
 In general, it is recommended to use declarative stable paths whenever feasible since they require less code and simpler maintenance. But, in more advanced cases, semi-declarative dynamic paths could be used instead, especially if there are thousands of paths.
 
@@ -622,6 +632,7 @@ To redraw an `area`, you may call `#queue_redraw_all` method.
 
 - There is no proper way to destroy `grid` children due to [libui](https://github.com/andlabs/libui) not offering any API for deleting them from `grid` (no `grid_delete` similar to `box_delete` for `horizontal_box` and `vertical_box`).
 - `table` `checkbox_column` and `checkbox_text_column` checkbox editing only works on Windows and Linux (not Mac) due to a current limitation in [libui](https://github.com/andlabs/ui/issues/357).
+- It seems that `arc` `start_angle` and `sweep` properties are ignored by [libui](https://github.com/andlabs/libui) and always set to `0` and `360` respectively, producing a full circle.
 
 ### Original API
 
@@ -2729,13 +2740,23 @@ data = [
   ['task 5', -1],
 ]
 
-window('Task progress', 300, 200) {
-  horizontal_box {
+window('Task Progress', 300, 200) {
+  vertical_box {
     table {
       text_column('Task')
       progress_bar_column('Progress')
 
-      cell_rows data
+      cell_rows data # implicit data-binding
+    }
+    
+    button('Mark All As Done') {
+      stretchy false
+      
+      on_clicked do
+        data.each_with_index do |row_data, row|
+          data[row] = [row_data[0], 100] # automatically updates table due to implicit data-binding
+        end
+      end
     }
   }
 }.show
@@ -3247,7 +3268,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 104, a: 0.5
-        stroke thickness: 1, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0
       }
       path { # declarative stable path
         figure(0, 0) {
@@ -3272,6 +3293,303 @@ window('Area Gallery', 400, 400) {
 }.show
 ```
 
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 2:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      path { # declarative stable path
+        square {
+          x 0
+          y 0
+          length 100
+        }
+        square {
+          x 100
+          y 100
+          length 400
+        }
+        
+        fill r: 102, g: 102, b: 204
+      }
+      path { # declarative stable path
+        rectangle {
+          x 0
+          y 100
+          width 100
+          height 400
+        }
+        rectangle {
+          x 100
+          y 0
+          width 400
+          height 100
+        }
+        
+        fill r: 204, g: 102, b: 204
+      }
+      path { # declarative stable path
+        figure {
+          x 100
+          y 100
+          
+          line {
+            x 100
+            y 400
+          }
+          line {
+            x 400
+            y 100
+          }
+          line {
+            x 400
+            y 400
+          }
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 104, a: 0.5
+        stroke r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        figure {
+          x 0
+          y 0
+          
+          bezier {
+            c1_x 200
+            c1_y 100
+            c2_x 100
+            c2_y 200
+            end_x 400
+            end_y 100
+          }
+          bezier {
+            c1_x 300
+            c1_y 100
+            c2_x 100
+            c2_y 300
+            end_x 100
+            end_y 400
+          }
+          bezier {
+            c1_x 100
+            c1_y 300
+            c2_x 300
+            c2_y 100
+            end_x 400
+            end_y 400
+          }
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        arc {
+          x_center 200
+          y_center 200
+          radius 90
+          start_angle 0
+          sweep 360
+          is_negative false
+        }
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+    }
+  }
+}.show
+```
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 3:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          square(0, 0, 100)
+          square(100, 100, 400)
+          
+          fill r: 102, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle(0, 100, 100, 400)
+          rectangle(100, 0, 400, 100)
+
+          fill r: 204, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure(100, 100) {
+            line(100, 400)
+            line(400, 100)
+            line(400, 400)
+
+            closed true
+          }
+
+          fill r: 202, g: 102, b: 104, a: 0.5
+          stroke r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure(0, 0) {
+            bezier(200, 100, 100, 200, 400, 100)
+            bezier(300, 100, 100, 300, 100, 400)
+            bezier(100, 300, 300, 100, 400, 400)
+
+            closed true
+          }
+
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # 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
+        }
+      end
+    }
+  }
+}.show
+```
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 4:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          square {
+            x 0
+            y 0
+            length 100
+          }
+          square {
+            x 100
+            y 100
+            length 400
+          }
+          
+          fill r: 102, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle {
+            x 0
+            y 100
+            width 100
+            height 400
+          }
+          rectangle {
+            x 100
+            y 0
+            width 400
+            height 100
+          }
+          
+          fill r: 204, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure {
+            x 100
+            y 100
+            
+            line {
+              x 100
+              y 400
+            }
+            line {
+              x 400
+              y 100
+            }
+            line {
+              x 400
+              y 400
+            }
+  
+            closed true
+          }
+  
+          fill r: 202, g: 102, b: 104, a: 0.5
+          stroke r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure {
+            x 0
+            y 0
+            
+            bezier {
+              c1_x 200
+              c1_y 100
+              c2_x 100
+              c2_y 200
+              end_x 400
+              end_y 100
+            }
+            bezier {
+              c1_x 300
+              c1_y 100
+              c2_x 100
+              c2_y 300
+              end_x 100
+              end_y 400
+            }
+            bezier {
+              c1_x 100
+              c1_y 300
+              c2_x 300
+              c2_y 100
+              end_x 400
+              end_y 400
+            }
+  
+            closed true
+          }
+  
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          arc {
+            x_center 200
+            y_center 200
+            radius 90
+            start_angle 0
+            sweep 360
+            is_negative false
+          }
+  
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+      end
+    }
+  }
+}.show
+```
+
 ## Contributing to glimmer-dsl-libui
 
 -   Check out the latest master to make sure the feature hasn't been

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/examples/area_gallery.rb

@@ -27,7 +27,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 104, a: 0.5
-        stroke thickness: 1, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0
       }
       path { # declarative stable path
         figure(0, 0) {

data/examples/area_gallery2.rb

@@ -0,0 +1,113 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      path { # declarative stable path
+        square {
+          x 0
+          y 0
+          length 100
+        }
+        square {
+          x 100
+          y 100
+          length 400
+        }
+        
+        fill r: 102, g: 102, b: 204
+      }
+      path { # declarative stable path
+        rectangle {
+          x 0
+          y 100
+          width 100
+          height 400
+        }
+        rectangle {
+          x 100
+          y 0
+          width 400
+          height 100
+        }
+        
+        fill r: 204, g: 102, b: 204
+      }
+      path { # declarative stable path
+        figure {
+          x 100
+          y 100
+          
+          line {
+            x 100
+            y 400
+          }
+          line {
+            x 400
+            y 100
+          }
+          line {
+            x 400
+            y 400
+          }
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 104, a: 0.5
+        stroke r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        figure {
+          x 0
+          y 0
+          
+          bezier {
+            c1_x 200
+            c1_y 100
+            c2_x 100
+            c2_y 200
+            end_x 400
+            end_y 100
+          }
+          bezier {
+            c1_x 300
+            c1_y 100
+            c2_x 100
+            c2_y 300
+            end_x 100
+            end_y 400
+          }
+          bezier {
+            c1_x 100
+            c1_y 300
+            c2_x 300
+            c2_y 100
+            end_x 400
+            end_y 400
+          }
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        arc {
+          x_center 200
+          y_center 200
+          radius 90
+          start_angle 0
+          sweep 360
+          is_negative false
+        }
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+    }
+  }
+}.show

data/examples/area_gallery3.rb

@@ -0,0 +1,54 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          square(0, 0, 100)
+          square(100, 100, 400)
+          
+          fill r: 102, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle(0, 100, 100, 400)
+          rectangle(100, 0, 400, 100)
+
+          fill r: 204, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure(100, 100) {
+            line(100, 400)
+            line(400, 100)
+            line(400, 400)
+
+            closed true
+          }
+
+          fill r: 202, g: 102, b: 104, a: 0.5
+          stroke r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure(0, 0) {
+            bezier(200, 100, 100, 200, 400, 100)
+            bezier(300, 100, 100, 300, 100, 400)
+            bezier(100, 300, 300, 100, 400, 400)
+
+            closed true
+          }
+
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # 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
+        }
+      end
+    }
+  }
+}.show

data/examples/area_gallery4.rb

@@ -0,0 +1,115 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          square {
+            x 0
+            y 0
+            length 100
+          }
+          square {
+            x 100
+            y 100
+            length 400
+          }
+          
+          fill r: 102, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle {
+            x 0
+            y 100
+            width 100
+            height 400
+          }
+          rectangle {
+            x 100
+            y 0
+            width 400
+            height 100
+          }
+          
+          fill r: 204, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure {
+            x 100
+            y 100
+            
+            line {
+              x 100
+              y 400
+            }
+            line {
+              x 400
+              y 100
+            }
+            line {
+              x 400
+              y 400
+            }
+  
+            closed true
+          }
+  
+          fill r: 202, g: 102, b: 104, a: 0.5
+          stroke r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure {
+            x 0
+            y 0
+            
+            bezier {
+              c1_x 200
+              c1_y 100
+              c2_x 100
+              c2_y 200
+              end_x 400
+              end_y 100
+            }
+            bezier {
+              c1_x 300
+              c1_y 100
+              c2_x 100
+              c2_y 300
+              end_x 100
+              end_y 400
+            }
+            bezier {
+              c1_x 100
+              c1_y 300
+              c2_x 300
+              c2_y 100
+              end_x 400
+              end_y 400
+            }
+  
+            closed true
+          }
+  
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          arc {
+            x_center 200
+            y_center 200
+            radius 90
+            start_angle 0
+            sweep 360
+            is_negative false
+          }
+  
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+      end
+    }
+  }
+}.show

data/examples/basic_table_progress_bar.rb

@@ -12,13 +12,23 @@ data = [
   ['task 5', -1],
 ]
 
-window('Task progress', 300, 200) {
-  horizontal_box {
+window('Task Progress', 300, 200) {
+  vertical_box {
     table {
       text_column('Task')
       progress_bar_column('Progress')
 
-      cell_rows data
+      cell_rows data # implicit data-binding
+    }
+    
+    button('Mark All As Done') {
+      stretchy false
+      
+      on_clicked do
+        data.each_with_index do |row_data, row|
+          data[row] = [row_data[0], 100] # automatically updates table due to implicit data-binding
+        end
+      end
     }
   }
 }.show

data/lib/glimmer/libui/arc.rb

@@ -25,6 +25,7 @@ module Glimmer
   module LibUI
     class Arc < Shape
       parameters :x_center, :y_center, :radius, :start_angle, :sweep, :is_negative
+      parameter_defaults 0, 0, 0, 0, 360, false
               
       def draw(area_draw_params)
         @args[5] ||= ControlProxy.boolean_to_integer(@args[5], allow_nil: false)

data/lib/glimmer/libui/area_proxy.rb

@@ -80,7 +80,7 @@ module Glimmer
         @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
           area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
           area_draw_params = area_draw_params_hash(area_draw_params)
-          children.each {|child| child.draw(area_draw_params)}
+          children.dup.each {|child| child.draw(area_draw_params)}
           on_draw.each {|listener| listener.call(area_draw_params) }
         end
         @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [0]) {}

data/lib/glimmer/libui/bezier.rb

@@ -25,6 +25,7 @@ module Glimmer
   module LibUI
     class Bezier < Shape
       parameters :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
+      parameter_defaults 0, 0, 0, 0, 0, 0
               
       def draw(area_draw_params)
         ::LibUI.draw_path_bezier_to(path_proxy.libui, *@args)

data/lib/glimmer/libui/figure.rb

@@ -27,10 +27,11 @@ module Glimmer
     # Can optionally have `closed true` property (connecting last point to first point automatically)
     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.empty? # TODO if args empty then wait till there is an arc child and it starts the figure
-        children.each {|child| child.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)}
         ::LibUI.draw_path_close_figure(path_proxy.libui) if closed?
         super
       end

data/lib/glimmer/libui/line.rb

@@ -25,7 +25,8 @@ module Glimmer
   module LibUI
     class Line < Shape
       parameters :x, :y
-              
+      parameter_defaults 0, 0
+
       def draw(area_draw_params)
         ::LibUI.draw_path_line_to(path_proxy.libui, *@args)
         super

data/lib/glimmer/libui/path_proxy.rb

@@ -56,7 +56,7 @@ module Glimmer
       
       def draw(area_draw_params)
         build_control
-        children.each {|child| child.draw(area_draw_params)}
+        children.dup.each {|child| child.draw(area_draw_params)}
         ::LibUI.draw_path_end(@libui)
         ::LibUI.draw_fill(area_draw_params[:context], @libui, fill_draw_brush.to_ptr) unless fill.empty?
         ::LibUI.draw_stroke(area_draw_params[:context], @libui, stroke_draw_brush, draw_stroke_params) unless stroke.empty?

data/lib/glimmer/libui/rectangle.rb

@@ -25,6 +25,7 @@ module Glimmer
   module LibUI
     class Rectangle < Shape
       parameters :x, :y, :width, :height
+      parameter_defaults 0, 0, 0, 0
     
       def draw(area_draw_params)
         ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args)

data/lib/glimmer/libui/shape.rb

@@ -46,6 +46,14 @@ module Glimmer
           end
         end
         
+        def parameter_defaults(*defaults)
+          if defaults.empty?
+            @parameter_defaults
+          else
+            @parameter_defaults = defaults
+          end
+        end
+        
         private
         
         def constant_symbol(keyword)
@@ -60,6 +68,7 @@ module Glimmer
         @parent = parent
         @args = args
         @block = block
+        set_parameter_defaults
         post_add_content if @block.nil?
       end
       
@@ -117,6 +126,12 @@ module Glimmer
       
       private
       
+      def set_parameter_defaults
+        self.class.parameter_defaults.each_with_index do |default, i|
+          @args[i] ||= default
+        end
+      end
+      
       def find_parent_in_ancestors(&condition)
         found = self
         until condition.call(found)

data/lib/glimmer/libui/square.rb

@@ -25,6 +25,7 @@ module Glimmer
   module LibUI
     class Square < Shape
       parameters :x, :y, :length
+      parameter_defaults 0, 0, 0
     
       def draw(area_draw_params)
         ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andy Maleh
@@ -195,6 +195,9 @@ files:
 - bin/girb
 - bin/girb_runner.rb
 - examples/area_gallery.rb
+- examples/area_gallery2.rb
+- examples/area_gallery3.rb
+- examples/area_gallery4.rb
 - examples/basic_area.rb
 - examples/basic_area2.rb
 - examples/basic_button.rb