glimmer-dsl-libui 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 588ece65aa562fd337018de00f5e60156926cb6d9ee6144f5f89e2e8dfaa2d74
-  data.tar.gz: f50f57a58f6b7915f5e9fc123eecf9e982be5f18ff93833a8d0603ce3955063d
+  metadata.gz: fcb53c296d806a067e4397ba0b51d6449672846fc126285f9b3ecdaf93b204a9
+  data.tar.gz: 97dd865c4b0b45e2ba88e6c16b47196f0c6aa2151697ba33c6a9dd391873507e
 SHA512:
-  metadata.gz: 6b0d02fde1567c4be008e81b91fc67df319fd2c46bf44466da6e4ff2e8a49f31bd239a78ed69be43f1338fa51dd4fcd648d6c5ecbe2aafe41fb345911df327bf
-  data.tar.gz: cfe32a98fddb52c1cf320e4e8d7651d0b083172ada4dd4b43441f0fdb839cde207841c96e39d9e47c7cffeb536a7d6620aed3abe869c790ce595c4361ac2988c
+  metadata.gz: daaff4633ae70ad0691cb4828fc1678ca2fda631d1ce23dce3ebbff889fef60f25569e84492ce121a2ff518af94b796a44c0ac54095f9b843e9ec7ce9e104902
+  data.tar.gz: 6a633312a198a65ff053d1ad28112716e2d8a2468c3336a471786dcb2cf6cdc9b31b12af1881da98864d2ab953a38d92e39278631c92cd9d1d995c4a6ad71360

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 0.1.3
+
+- New examples/area_gallery.rb
+- Support `figure(x = nil, y = nil) {}` (`draw_path_new_figure`)
+- Support `closed true` property inside nested figure (`draw_path_close_figure`)
+- Support `line`
+- Support `bezier`
+- Support `arc` (`draw_path_arc_to` if `draw_path_new_figure` was called already or `draw_path_new_figure_with_arc` if parent is a figure without x,y)
+- Support `square` with `x`, `y`, and `length` properties
+
 ## 0.1.2
 
 - Support re-opening a control by using `#content {...}`

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.2
+# [<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
 ## 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)
@@ -19,7 +19,7 @@ The main trade-off in using [Glimmer DSL for LibUI](https://rubygems.org/gems/gl
 - Scaffolding for new custom controls, apps, and gems
 - Native-Executable packaging on Mac, Windows, and Linux.
 
-Example:
+Hello, World!
 
 ```ruby
 require 'glimmer-dsl-libui'
@@ -32,6 +32,98 @@ window('hello world').show
 ![glimmer-dsl-libui-mac-basic-window.png](images/glimmer-dsl-libui-mac-basic-window.png)
 ![glimmer-dsl-libui-linux-basic-window.png](images/glimmer-dsl-libui-linux-basic-window.png)
 
+Basic Table Progress Bar
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['task 1', 0],
+  ['task 2', 15],
+  ['task 3', 100],
+  ['task 4', 75],
+  ['task 5', -1],
+]
+
+window('Task progress', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Task')
+      progress_bar_column('Progress')
+
+      cell_rows data
+    }
+  }
+}.show
+```
+
+![glimmer-dsl-libui-mac-basic-table-progress-bar.png](images/glimmer-dsl-libui-mac-basic-table-progress-bar.png)
+![glimmer-dsl-libui-linux-basic-table-progress-bar.png](images/glimmer-dsl-libui-linux-basic-table-progress-bar.png)
+
+Area Gallery
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      path { # declarative stable path
+        square(0, 0, 100)
+        square(100, 100, 400)
+        
+        fill r: 102, g: 102, b: 204
+      }
+      path { # declarative stable path
+        rectangle(0, 100, 100, 400)
+        rectangle(100, 0, 400, 100)
+        
+        fill r: 204, g: 102, b: 204
+      }
+      path { # declarative stable path
+        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 thickness: 1, r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        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 { # 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
+      }
+    }
+  }
+}.show
+```
+
+![glimmer-dsl-libui-mac-area-gallery.png](images/glimmer-dsl-libui-mac-area-gallery.png)
+![glimmer-dsl-libui-linux-area-gallery.png](images/glimmer-dsl-libui-linux-area-gallery.png)
+
+[Check Out Many More Examples Over Here!](#examples)
+
 NOTE: [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) is in early alpha mode (only supports included [examples](#examples)). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
 Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interested in:
@@ -43,9 +135,10 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-  - [Glimmer DSL for LibUI 0.1.2](#-glimmer-dsl-for-libui-012)
+- [Glimmer DSL for LibUI 0.1.3](#-glimmer-dsl-for-libui-013)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
+  - [Girb (Glimmer IRB)](#girb-glimmer-irb)
   - [API](#api)
     - [Supported Controls](#supported-controls)
     - [Common Control Properties](#common-control-properties)
@@ -58,7 +151,6 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [API Gotchas](#api-gotchas)
     - [Original API](#original-api)
   - [Glimmer Style Guide](#glimmer-style-guide)
-  - [Girb (Glimmer IRB)](#girb-glimmer-irb)
   - [Examples](#examples)
     - [Basic Window](#basic-window)
     - [Basic Button](#basic-button)
@@ -83,6 +175,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Form Table](#form-table)
     - [Basic Area](#basic-area)
     - [Dynamic Area](#dynamic-area)
+    - [Area Gallery](#area-gallery)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -170,7 +263,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.1.2'
+gem 'glimmer-dsl-libui', '~> 0.1.3'
 ```
 
 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.
@@ -197,6 +290,24 @@ end
 Application.new.launch
 ```
 
+If you are new to [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui), check out [Girb](#girb-glimmer-irb) and [Examples](#examples) to quickly learn through copy/paste. You may refer to the [API](#api) later on once you have gotten your feet wet with [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) and need more detailed reference information.
+
+## Girb (Glimmer IRB)
+
+You can run the `girb` command (`bin/girb` if you cloned the project locally) to do some quick and dirty experimentation and learning:
+
+```
+girb
+```
+
+This gives you `irb` with the `glimmer-dsl-libui` gem loaded and the `Glimmer` module mixed into the main object for easy experimentation with GUI.
+
+![glimmer-dsl-libui-girb.png](images/glimmer-dsl-libui-girb.png)
+
+For a more advanced code editing tool, check out the [Meta-Example (The Example of Examples)](#examples).
+
+Gotcha: On the Mac, when you close a window opened in `girb`, it remains open until you enter `exit` or open another GUI window.
+
 ## API
 
 Any control returned by a [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) keyword declaration can be introspected for its properties and updated via object-oriented attributes (standard Ruby `attr`/`attr=` or `set_attr`).
@@ -227,6 +338,8 @@ Control(Args) | Properties | Listeners
 ------------- | ---------- | ---------
 `about_menu_item` | None | `on_clicked`
 `area` | None | `on_draw`
+`arc(x_center as Numeric, y_center as Numeric, radius as Numeric, start_angle as Numeric, sweep as Numeric, is_negative as Boolean)` | `x_center` (`Numeric`), `y_center` (`Numeric`), `radius` (`Numeric`), `start_angle` (`Numeric`), `sweep` (`Numeric`), `is_negative` (Boolean) | None
+`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)` | `c1_x` (`Numeric`), `c1_y` (`Numeric`), `c2_x` (`Numeric`), `c2_y` (`Numeric`), `end_x` (`Numeric`), `end_y` (`Numeric`) | None
 `button(text as String)` | `text` (`String`) | `on_clicked`
 `button_column(name as String)` | `enabled` (Boolean) | None
 `checkbox(text as String)` | `checked` (Boolean), `text` (`String`) | `on_toggled`
@@ -238,6 +351,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
 `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
@@ -249,6 +363,7 @@ Control(Args) | Properties | Listeners
 `image_column(name as String)` | None | None
 `image_text_column(name as String)` | None | None
 `label(text as String)` | `text` (`String`) | None
+`line(x as Numeric, y as Numeric)` | `x` (`Numeric`), `y` (`Numeric`) | None
 `menu(text as String)` | None | None
 `menu_item(text as String)` | `checked` (Boolean) | `on_clicked`
 `multiline_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
@@ -261,9 +376,10 @@ Control(Args) | Properties | Listeners
 `progress_bar_column(name as String)` | None | None
 `quit_menu_item` | None | `on_clicked`
 `radio_buttons` | `selected` (`Integer`) | `on_selected`
-`rectangle(x as Numeric, y as Numeric, width as Numeric, height as Numeric)` | None | None
+`rectangle(x as Numeric, y as Numeric, width as Numeric, height as Numeric)` |  `x` (`Numeric`), `y` (`Numeric`), `width` (`Numeric`), `height` (`Numeric`) | None
 `slider(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `spinbox(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
+`square(x as Numeric, y as Numeric, length as Numeric)` | `x` (`Numeric`), `y` (`Numeric`), `length` (`Numeric`) | None
 `tab` | `margined` (Boolean), `num_pages` (`Integer`) | None
 `tab_item(name as String)` | `index` [read-only] (`Integer`), `margined` (Boolean), `name` [read-only] (`String`) | None
 `table` | `cell_rows` (`Array` (rows) of `Arrays` (row columns) of cell values (e.g. `String` values for `text_column` cells or `Array` of `image`/`String` for `image_text_column`)), `editable` as Boolean | None
@@ -328,6 +444,80 @@ Note that the `cell_rows` property declaration results in "implicit data-binding
 - Inserting cell rows: Calling `Array#<<`, `Array#push`, `Array#prepend`, or any insertion/addition `Array` method automatically inserts rows in actual `table` control
 - Changing cell rows: Calling `Array#[]=`, `Array#map!`, or any update `Array` method automatically updates rows in actual `table` control
 
+Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['Lisa Sky', 'lisa@sky.com', '720-523-4329', 'Denver', 'CO', '80014'],
+  ['Jordan Biggins', 'jordan@biggins.com', '617-528-5399', 'Boston', 'MA', '02101'],
+  ['Mary Glass', 'mary@glass.com', '847-589-8788', 'Elk Grove Village', 'IL', '60007'],
+  ['Darren McGrath', 'darren@mcgrath.com', '206-539-9283', 'Seattle', 'WA', '98101'],
+  ['Melody Hanheimer', 'melody@hanheimer.com', '213-493-8274', 'Los Angeles', 'CA', '90001'],
+]
+
+window('Contacts', 600, 600) { |w|
+  margined true
+  
+  vertical_box {
+    form {
+      stretchy false
+      
+      @name_entry = entry {
+        label 'Name'
+      }
+      @email_entry = entry {
+        label 'Email'
+      }
+      @phone_entry = entry {
+        label 'Phone'
+      }
+      @city_entry = entry {
+        label 'City'
+      }
+      @state_entry = entry {
+        label 'State'
+      }
+    }
+    
+    button('Save Contact') {
+      stretchy false
+      
+      on_clicked do
+        new_row = [@name_entry.text, @email_entry.text, @phone_entry.text, @city_entry.text, @state_entry.text]
+        if new_row.include?('')
+          msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+        else
+          data << new_row # automatically inserts a row into the table due to implicit data-binding
+          @name_entry.text = ''
+          @email_entry.text = ''
+          @phone_entry.text = ''
+          @city_entry.text = ''
+          @state_entry.text = ''
+        end
+      end
+    }
+    
+    table {
+      text_column('Name')
+      text_column('Email')
+      text_column('Phone')
+      text_column('City')
+      text_column('State')
+
+      cell_rows data # implicit data-binding
+    }
+  }
+}.show
+```
+
+![glimmer-dsl-libui-linux-form-table.png](images/glimmer-dsl-libui-linux-form-table.png)
+
+Learn more by checking out [examples](#examples).
+
 ### Area API
 
 The `area` control can be used in one of two ways:
@@ -384,6 +574,14 @@ window('Basic Area', 400, 400) {
 
 Check [examples/dynamic_area.rb](#dynamic-area) for a more detailed semi-declarative example.
 
+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)`
+- `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)
+
 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.
 
 To redraw an `area`, you may call `#queue_redraw_all` method.
@@ -439,21 +637,9 @@ check out the [libui C headers](https://github.com/andlabs/libui/blob/master/ui.
 - Control listeners are always declared starting with on_ prefix and affixing listener event method name afterwards in underscored lowercase form. Their multi-line blocks have a `do; end` style.
 - Pure logic multi-line blocks that do not constitute GUI DSL view elements have `do; end` style to clearly separate logic code from view code.
 
-## Girb (Glimmer IRB)
-
-You can run the `girb` command (`bin/girb` if you cloned the project locally):
-
-```
-girb
-```
-
-This gives you `irb` with the `glimmer-dsl-libui` gem loaded and the `Glimmer` module mixed into the main object for easy experimentation with GUI.
-
-Gotcha: On the Mac, when you close a window opened in `girb`, it remains open until you enter `exit` or open another GUI window.
-
 ## Examples
 
-These examples include reimplementions of the examples in the [LibUI](https://github.com/kojix2/LibUI) project utilizing the [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) as well as brand new examples.
+The following examples include reimplementions of the examples in the [LibUI](https://github.com/kojix2/LibUI) project utilizing the [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) as well as brand new examples.
 
 To browse all examples, simply launch the [Meta-Example](examples/meta_example.rb), which lists all examples and displays each example's code when selected. It also enables code editing to facilitate experimentation and learning.
 
@@ -3005,6 +3191,87 @@ window('Dynamic Area', 240, 600) {
 }.show
 ```
 
+### Area Gallery
+
+[examples/area_gallery.rb](examples/area_gallery.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/area_gallery.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/area_gallery'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-area-gallery.png](images/glimmer-dsl-libui-mac-area-gallery.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-area-gallery.png](images/glimmer-dsl-libui-linux-area-gallery.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      path { # declarative stable path
+        square(0, 0, 100)
+        square(100, 100, 400)
+        
+        fill r: 102, g: 102, b: 204
+      }
+      path { # declarative stable path
+        rectangle(0, 100, 100, 400)
+        rectangle(100, 0, 400, 100)
+        
+        fill r: 204, g: 102, b: 204
+      }
+      path { # declarative stable path
+        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 thickness: 1, r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        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 { # 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
+      }
+    }
+  }
+}.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.2
+0.1.3

data/examples/area_gallery.rb

@@ -0,0 +1,52 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      path { # declarative stable path
+        square(0, 0, 100)
+        square(100, 100, 400)
+        
+        fill r: 102, g: 102, b: 204
+      }
+      path { # declarative stable path
+        rectangle(0, 100, 100, 400)
+        rectangle(100, 0, 400, 100)
+        
+        fill r: 204, g: 102, b: 204
+      }
+      path { # declarative stable path
+        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 thickness: 1, r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        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 { # 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
+      }
+    }
+  }
+}.show

data/lib/glimmer/dsl/libui/control_expression.rb

@@ -29,7 +29,7 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          Glimmer::LibUI::ControlProxy.control_exists?(keyword)
+          Glimmer::LibUI::ControlProxy.exists?(keyword)
         end
   
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/dsl/libui/dsl.rb

@@ -39,6 +39,7 @@ module Glimmer
           listener
           property
           control
+          shape
         ]
       )
     end

data/lib/glimmer/dsl/libui/property_expression.rb

@@ -21,13 +21,17 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/shape'
 
 module Glimmer
   module DSL
     module Libui
       class PropertyExpression < 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.nil? and
             parent.respond_to?(keyword, *args)
         end

data/lib/glimmer/dsl/libui/shape_expression.rb

@@ -0,0 +1,56 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+
+module Glimmer
+  module DSL
+    module Libui
+      class ShapeExpression < Expression
+        include ParentExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          Glimmer::LibUI::Shape.exists?(keyword) and
+            (
+              parent.is_a?(Glimmer::LibUI::PathProxy) or
+                parent.is_a?(Glimmer::LibUI::Shape)
+            )
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::LibUI::Shape.create(keyword, parent, args, &block)
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          super
+          parent.post_add_content
+        end
+        
+      end
+    end
+  end
+end
+
+# TODO Consider moving all shapes underneath Shape namespace
+require 'glimmer/libui/path_proxy'
+require 'glimmer/libui/shape'
+Dir[File.expand_path('../../libui/*.rb', __dir__)].each {|f| require f}

data/lib/glimmer/libui/arc.rb

@@ -0,0 +1,40 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Arc < Shape
+      parameters :x_center, :y_center, :radius, :start_angle, :sweep, :is_negative
+              
+      def draw(area_draw_params)
+        @args[5] ||= ControlProxy.boolean_to_integer(@args[5], allow_nil: false)
+        if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
+          ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *@args)
+        else
+          ::LibUI.draw_path_arc_to(path_proxy.libui, *@args)
+        end
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/bezier.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Bezier < Shape
+      parameters :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
+              
+      def draw(area_draw_params)
+        ::LibUI.draw_path_bezier_to(path_proxy.libui, *@args)
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy.rb

@@ -26,7 +26,7 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class ControlProxy
       class << self
-        def control_exists?(keyword)
+        def exists?(keyword)
           ::LibUI.respond_to?("new_#{keyword}") ||
             ::LibUI.respond_to?(keyword) ||
             Glimmer::LibUI.constants.include?("#{keyword.camelcase(:upper)}Proxy".to_sym)
@@ -55,12 +55,12 @@ module Glimmer
           control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
         end
         
-        def integer_to_boolean(int)
-          int.nil? ? nil : int == 1
+        def integer_to_boolean(int, allow_nil: true)
+          int.nil? ? (allow_nil ? nil : false) : int == 1
         end
         
-        def boolean_to_integer(bool)
-          bool.nil? ? nil : (bool ? 1 : 0)
+        def boolean_to_integer(bool, allow_nil: true)
+          bool.nil? ? (allow_nil ? nil : 0) : (bool ? 1 : 0)
         end
         
         def menu_proxies
@@ -92,7 +92,7 @@ module Glimmer
       ]
       
       # libui returns the contained LibUI object
-      attr_reader :parent_proxy, :libui, :args, :keyword
+      attr_reader :parent_proxy, :libui, :args, :keyword, :block
       
       def initialize(keyword, parent, args, &block)
         @keyword = keyword

data/lib/glimmer/libui/figure.rb

@@ -0,0 +1,51 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    # Represents a figure consisting of shapes (nested under path)
+    # Can optionally have `closed true` property (connecting last point to first point automatically)
+    class Figure < Shape
+      parameters :x, :y
+    
+      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_close_figure(path_proxy.libui) if closed?
+        super
+      end
+      
+      def closed(value = nil)
+        if value.nil?
+          @closed
+        else
+          @closed = value
+          area_proxy&.queue_redraw_all
+        end
+      end
+      alias closed= closed
+      alias set_closed closed
+      alias closed? closed
+    end
+  end
+end

data/lib/glimmer/libui/line.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Line < Shape
+      parameters :x, :y
+              
+      def draw(area_draw_params)
+        ::LibUI.draw_path_line_to(path_proxy.libui, *@args)
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/path_proxy.rb

@@ -72,6 +72,7 @@ module Glimmer
           @fill ||= {}
         else
           @fill = args
+          @fill[:a] = 1.0 if @fill[:a].nil?
           @parent_proxy&.queue_redraw_all
         end
         @fill.tap do
@@ -95,6 +96,7 @@ module Glimmer
           @stroke ||= {}
         else
           @stroke = args
+          @stroke[:a] = 1.0 if @stroke[:a].nil?
           @parent_proxy&.queue_redraw_all
         end
         @stroke.tap do

data/lib/glimmer/libui/rectangle.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Rectangle < Shape
+      parameters :x, :y, :width, :height
+    
+      def draw(area_draw_params)
+        ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args)
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape.rb

@@ -0,0 +1,129 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module Glimmer
+  module LibUI
+    # Represents LibUI lightweight shape objects nested under path (e.g. line, rectangle, arc, bezier)
+    class Shape
+      class << self
+        def exists?(keyword)
+          Glimmer::LibUI.constants.include?(constant_symbol(keyword)) and
+            shape_class(keyword).respond_to?(:ancestors) and
+            shape_class(keyword).ancestors.include?(Shape)
+        end
+        
+        def create(keyword, parent, args, &block)
+          shape_class(keyword).new(keyword, parent, args, &block)
+        end
+        
+        def shape_class(keyword)
+          Glimmer::LibUI.const_get(constant_symbol(keyword))
+        end
+        
+        def parameters(*params)
+          if params.empty?
+            @parameters
+          else
+            @parameters = params
+          end
+        end
+        
+        private
+        
+        def constant_symbol(keyword)
+          "#{keyword.camelcase(:upper)}".to_sym
+        end
+      end
+      
+      attr_reader :parent, :args, :keyword, :block
+      
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent = parent
+        @args = args
+        @block = block
+        post_add_content if @block.nil?
+      end
+      
+      # Subclasses may override to perform post add_content work (normally must call super)
+      def post_add_content
+        @parent&.post_initialize_child(self)
+      end
+      
+      # Subclasses may override to perform post initialization work on an added child (normally must call super)
+      def post_initialize_child(child)
+        children << child
+      end
+      
+      def children
+        @children ||= []
+      end
+      
+      # Subclasses must override to perform draw work and call super afterwards to ensure calling destroy when semi-declarative in an on_draw method
+      def draw(area_draw_params)
+        destroy if area_proxy.nil?
+      end
+      
+      def destroy
+        @parent.children.delete(self)
+      end
+      
+      def area_proxy
+        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(AreaProxy) }
+      end
+      
+      def path_proxy
+        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(PathProxy) }
+      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)
+      end
+      
+      def method_missing(method_name, *args, &block)
+        method_name_parameter = method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym
+        if self.class.parameters.include?(method_name_parameter)
+          method_name = method_name.to_s
+          parameter_index = self.class.parameters.index(method_name_parameter)
+          if method_name.start_with?('set_') || method_name.end_with?('=') || !args.empty?
+            @args[parameter_index] = args.first
+            area_proxy&.queue_redraw_all
+          else
+            @args[parameter_index]
+          end
+        else
+          super
+        end
+      end
+      
+      private
+      
+      def find_parent_in_ancestors(&condition)
+        found = self
+        until condition.call(found)
+          found = found.respond_to?(:parent_proxy) ? found.parent_proxy : found.parent
+        end
+        found
+      end
+    end
+  end
+end

data/lib/glimmer/libui/square.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/shape'
+
+module Glimmer
+  module LibUI
+    class Square < Shape
+      parameters :x, :y, :length
+    
+      def draw(area_draw_params)
+        ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
+        super
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -194,6 +194,7 @@ files:
 - VERSION
 - bin/girb
 - bin/girb_runner.rb
+- examples/area_gallery.rb
 - examples/basic_area.rb
 - examples/basic_area2.rb
 - examples/basic_button.rb
@@ -230,10 +231,13 @@ files:
 - lib/glimmer/dsl/libui/open_file_expression.rb
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
+- lib/glimmer/dsl/libui/shape_expression.rb
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/fiddle_consumer.rb
 - lib/glimmer/libui/about_menu_item_proxy.rb
+- lib/glimmer/libui/arc.rb
 - lib/glimmer/libui/area_proxy.rb
+- lib/glimmer/libui/bezier.rb
 - lib/glimmer/libui/box.rb
 - lib/glimmer/libui/button_column_proxy.rb
 - lib/glimmer/libui/button_proxy.rb
@@ -251,6 +255,7 @@ files:
 - lib/glimmer/libui/editable_column.rb
 - lib/glimmer/libui/editable_combobox_proxy.rb
 - lib/glimmer/libui/enableable_column.rb
+- lib/glimmer/libui/figure.rb
 - lib/glimmer/libui/font_button_proxy.rb
 - lib/glimmer/libui/form_proxy.rb
 - lib/glimmer/libui/grid_proxy.rb
@@ -261,6 +266,7 @@ files:
 - lib/glimmer/libui/image_proxy.rb
 - lib/glimmer/libui/image_text_column_proxy.rb
 - lib/glimmer/libui/label_proxy.rb
+- lib/glimmer/libui/line.rb
 - lib/glimmer/libui/menu_item_proxy.rb
 - lib/glimmer/libui/menu_proxy.rb
 - lib/glimmer/libui/multiline_entry_proxy.rb
@@ -270,8 +276,10 @@ files:
 - lib/glimmer/libui/progress_bar_column_proxy.rb
 - lib/glimmer/libui/quit_menu_item_proxy.rb
 - lib/glimmer/libui/radio_buttons_proxy.rb
-- lib/glimmer/libui/rectangle_proxy.rb
+- lib/glimmer/libui/rectangle.rb
 - lib/glimmer/libui/separator_menu_item_proxy.rb
+- lib/glimmer/libui/shape.rb
+- lib/glimmer/libui/square.rb
 - lib/glimmer/libui/tab_item_proxy.rb
 - lib/glimmer/libui/table_proxy.rb
 - lib/glimmer/libui/text_column_proxy.rb

data/lib/glimmer/libui/rectangle_proxy.rb

@@ -1,100 +0,0 @@
-# Copyright (c) 2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'glimmer/libui/control_proxy'
-
-module Glimmer
-  module LibUI
-    # Proxy for LibUI rectangle objects
-    #
-    # Follows the Proxy Design Pattern
-    class RectangleProxy < ControlProxy
-      def initialize(keyword, parent, args, &block)
-        @keyword = keyword
-        @parent_proxy = parent
-        @args = args
-        @block = block
-        @enabled = true
-        post_add_content if @block.nil?
-      end
-    
-      def draw(area_draw_params)
-        ::LibUI.draw_path_add_rectangle(@parent_proxy.libui, *@args)
-        destroy if @parent_proxy.parent_proxy.nil?
-      end
-      
-      def destroy
-        @parent_proxy.children.delete(self) unless @parent_proxy.nil?
-        ControlProxy.control_proxies.delete(self)
-      end
-      
-      def x(value = nil)
-        if value.nil?
-          @args[0]
-        else
-          @args[0] = value
-          @parent_proxy.parent_proxy&.queue_redraw_all
-        end
-      end
-      alias x= x
-      alias set_x x
-      
-      def y(value = nil)
-        if value.nil?
-          @args[1]
-        else
-          @args[1] = value
-          @parent_proxy.parent_proxy&.queue_redraw_all
-        end
-      end
-      alias y= y
-      alias set_y y
-      
-      def width(value = nil)
-        if value.nil?
-          @args[2]
-        else
-          @args[2] = value
-          @parent_proxy.parent_proxy&.queue_redraw_all
-        end
-      end
-      alias width= width
-      alias set_width width
-      
-      def height(value = nil)
-        if value.nil?
-          @args[3]
-        else
-          @args[3] = value
-          @parent_proxy.parent_proxy&.queue_redraw_all
-        end
-      end
-      alias height= height
-      alias set_height height
-      
-      private
-      
-      def build_control
-        # No Op
-      end
-    end
-  end
-end