glimmer-dsl-libui 0.0.25 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6b80413ffc1933a0e36dd536f06d67538002ef7777aa682ef19f7ef01f7b28
-  data.tar.gz: fb188b7bb041bdaf0a95aee368f339268459d41de7aa76947fa1504b56d465d2
+  metadata.gz: f0e5255370f70684a7f60de75fe52399f604761996059b23370ce53c4e11cdd1
+  data.tar.gz: 00fe32154a83c206843d2386406cde3841da5296cb432585d8aedf421578c47c
 SHA512:
-  metadata.gz: 1530e1e986263701efebab10a2eff549bcadb7bc23c8e67cdde4c622822b9c6a54d74d9b2ccffb700f48021d1f34b6b10b683d85d0062202055b4d7b20acfb2f
-  data.tar.gz: 89df7b4eab9bdd449ead5ac40a92fa1f7e5b56a72191dc649bc53df96994a733d048eb99f1710149a1e26a87123e45413f2d4d973704ca0e16406a43764ce0c2
+  metadata.gz: 92ef8efbe6d9563dcf20affce754ea4f8fd6ee3eceec014f7499a8ea15631e0127877526ca313513129aee506dc9b363651dde235e2e965a456ddcb2df29c7ae
+  data.tar.gz: 9ceec5135f065862bfc7590883346dc0930380da5e12f6b575a5c4a6c1c6d45e7d575392daf0b003cf78889a5c90cc4033cd48783e1a6c2cd5f4e53d4814b009

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## 0.1.0
+
+- Support examples/basic_area.rb
+- Support `area` control
+- Support `path(fill_mode)` control
+- Support `rectangle(x, y, width, height)` figure
+- Support `path` `fill` property
+- Support `path` `stroke` property
+
+## 0.0.28
+
+- Support automatic table row change when updating a row in `cell_rows` (e.g. `data[3] = ['new', 'row', 'cell', 'values']`)
+- Support `editable` property for `checkbox_column` (checkbox editing only works in Windows due to a [libui](https://github.com/andlabs/libui) limitation)
+- Support `editable`, `editable_checkbox`, and `editable_text` properties for `checkbox_text_column` (checkbox editing only works in Windows due to a [libui](https://github.com/andlabs/libui) limitation)
+- Fix examples/basic_table_checkbox_text.rb by removing `editable` property
+
+## 0.0.27
+
+- New examples/form_table.rb
+- Support automatic table row insertion upon inserting data rows into `cell_rows`
+
+## 0.0.26
+
+- New examples/basic_table_progress_bar.rb
+- Support table `progress_bar_column`
+
 ## 0.0.25
 
 - New examples/basic_table_checkbox_text.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.0.25
+# [<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.0
 ## 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)
@@ -43,7 +43,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.0.25](#-glimmer-dsl-for-libui-0025)
+  - [Glimmer DSL for LibUI 0.1.0](#-glimmer-dsl-for-libui-010)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -52,6 +52,8 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Common Control Operations](#common-control-operations)
     - [Extra Dialogs](#extra-dialogs)
     - [Extra Operations](#extra-operations)
+    - [Table API](#table-api)
+    - [Area API](#area-api)
     - [Smart Defaults and Conventions](#smart-defaults-and-conventions)
     - [API Gotchas](#api-gotchas)
     - [Original API](#original-api)
@@ -77,6 +79,9 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Basic Table Button](#basic-table-button)
     - [Basic Table Checkbox](#basic-table-checkbox)
     - [Basic Table Checkbox Text](#basic-table-checkbox-text)
+    - [Basic Table Progress Bar](#basic-table-progress-bar)
+    - [Form Table](#form-table)
+    - [Basic Area](#basic-area)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -164,7 +169,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.25'
+gem 'glimmer-dsl-libui', '~> 0.1.0'
 ```
 
 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.
@@ -220,11 +225,12 @@ w.libui # => #<Fiddle::Pointer:0x00007fde53997980 ptr=0x00007fde51352a60 size=0
 Control(Args) | Properties | Listeners
 ------------- | ---------- | ---------
 `about_menu_item` | None | `on_clicked`
+`area` | None | 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`
-`checkbox_column(name as String)` | None | None
-`checkbox_text_column(name as String)` | `editable` (Boolean) | None
+`checkbox_column(name as String)` | `editable` (Boolean) | None
+`checkbox_text_column(name as String)` | `editable` (Boolean), `editable_checkbox` (Boolean), `editable_text` (Boolean) | None
 `combobox` | `items` (`Array` of `String`), `selected` (`Integer`) | `on_selected`
 `color_button` | `color` (Array of `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float`), `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float` | `on_changed`
 `date_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`
@@ -248,10 +254,13 @@ Control(Args) | Properties | Listeners
 `msg_box(window as Glimmer::LibUI::WindowProxy, title as String, description as String)` | None | None
 `msg_box_error(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
 `preferences_menu_item` | None | `on_clicked`
 `progress_bar` | `value` (`Numeric`) | None
+`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
 `slider(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `spinbox(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `tab` | `margined` (Boolean), `num_pages` (`Integer`) | None
@@ -299,6 +308,28 @@ Control(Args) | Properties | Listeners
 - `ControlProxy::main_window_proxy`: returns the first window proxy instantiated in the application
 - `ControlProxy#window_proxy`: returns the window proxy parent for a control
 
+### Table API
+
+The `table` control must first declare its columns via one of these column keywords (mentioned in [Supported Controls](#supported-controls)):
+  - `button_column`: expects `String` cell values
+  - `checkbox_column`: expects Boolean cell values
+  - `checkbox_text_column`: expects dual-element `Array` of Boolean and `String` cell values
+  - `image_column`: expects `image` cell values (produced by `image` and `image_part` keywords as per [Supported Controls](#supported-controls))
+  - `image_text_column`: expects dual-element `Array` of `image` and `String` cell values
+  - `text_column`: expects `String` cell values
+  - `progress_bar_column`: expects `Integer` cell values
+  
+Afterwards, it must declare its `cell_rows` array (`Array` of `Array`s of column cell values) and whether it is `editable` (Boolean) for all its columns.
+
+Note that the `cell_rows` property declaration results in "implicit data-binding" between the `table` control and `Array` of `Arrays` (a new innovation) to provide convenience automatic support for:
+- Deleting cell rows: Calling `Array#delete`, `Array#delete_at`, `Array#delete_if`, or any filtering/deletion `Array` method automatically deletes rows in actual `table` control
+- 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
+
+### Area API
+
+The `area` control can have a `path` nested underneath declaratively, containing figures like `rectangle`, and all the drawing logic is generated automatically from that.
+
 ### Smart Defaults and Conventions
 
 - `horizontal_box`, `vertical_box`, `grid`, and `form` controls have `padded` as `true` upon instantiation to ensure more user-friendly GUI by default
@@ -324,13 +355,15 @@ Control(Args) | Properties | Listeners
 - Smart defaults for `grid` child attributes are `left` (`0`), `top` (`0`), `xspan` (`1`), `yspan` (`1`), `hexpand` (`false`), `halign` (`0`), `vexpand` (`false`), and `valign` (`0`)
 - The `table` control automatically constructs required `TableModelHandler`, `TableModel`, and `TableParams`, calculating all their arguments from `cell_rows` and `editable` properties (e.g. `NumRows`) as well as nested columns (e.g. `text_column`)
 - Table model instances are automatically freed from memory after `window` is destroyed.
-- Table `cell_rows` data has implicit data-binding to table cell values. When deleting data from `cell_rows` array, then actual rows from the `table` are automatically deleted.
+- Table `cell_rows` data has implicit data-binding to table cell values for deletion, insertion, and change (done by diffing `cell_rows` value before and after change and auto-informing `table` of deletions [`LibUI.table_model_row_deleted`], insertions [`LibUI.table_model_row_deleted`], and changes [`LibUI.table_model_row_changed`]). When deleting data rows from `cell_rows` array, then actual rows from the `table` are automatically deleted. When inserting data rows into `cell_rows` array, then actual `table` rows are automatically inserted. When updating data rows in `cell_rows` array, then actual `table` rows are automatically updated.
 - `image` instances are automatically freed from memory after `window` is destroyed.
 - `image` `width` and `height` can be left off if it has one `image_part` only as they default to the same `width` and `height` of the `image_part`
+- `area` paths are specified declaratively with figures underneath (e.g. `rectangle`) and `area` draw listener is automatically generated
 
 ### API Gotchas
 
-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`)
+- 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).
 
 ### Original API
 
@@ -2411,6 +2444,251 @@ window('Animal sounds', 400, 200) {
 }.show
 ```
 
+### Basic Table Progress Bar
+
+[examples/basic_table_progress_bar.rb](examples/basic_table_progress_bar.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/basic_table_progress_bar.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/basic_table_progress_bar'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-progress-bar.png](images/glimmer-dsl-libui-mac-basic-table-progress-bar.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-progress-bar.png](images/glimmer-dsl-libui-linux-basic-table-progress-bar.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```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
+```
+
+### Form Table
+
+[examples/form_table.rb](examples/form_table.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/form_table.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/form_table'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-form-table.png](images/glimmer-dsl-libui-mac-form-table.png)
+![glimmer-dsl-libui-mac-form-table-contact-entered.png](images/glimmer-dsl-libui-mac-form-table-contact-entered.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-form-table.png](images/glimmer-dsl-libui-linux-form-table.png)
+![glimmer-dsl-libui-linux-form-table-contact-entered.png](images/glimmer-dsl-libui-linux-form-table-contact-entered.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```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
+```
+
+### Basic Area
+
+[examples/basic_area.rb](examples/basic_area.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/basic_area.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/basic_area'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-area.png](images/glimmer-dsl-libui-mac-basic-area.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-area.png](images/glimmer-dsl-libui-linux-basic-area.png)
+
+[LibUI](https://github.com/kojix2/LibUI) Original Version:
+
+```ruby
+require 'libui'
+
+UI = LibUI
+
+UI.init
+
+handler = UI::FFI::AreaHandler.malloc
+area    = UI.new_area(handler)
+brush   = UI::FFI::DrawBrush.malloc
+
+handler_draw_event = Fiddle::Closure::BlockCaller.new(0, [1, 1, 1]) do |_, _, area_draw_params|
+  path = UI.draw_new_path(0)
+  UI.draw_path_add_rectangle(path, 0, 0, 400, 400)
+  UI.draw_path_end(path)
+  brush.Type = 0
+  brush.R = 0.4
+  brush.G = 0.4
+  brush.B = 0.8
+  brush.A = 1.0
+  area_draw_params = UI::FFI::AreaDrawParams.new(area_draw_params)
+  UI.draw_fill(area_draw_params.Context, path, brush.to_ptr)
+  UI.draw_free_path(path)
+end
+
+handler.Draw         = handler_draw_event
+handler.MouseEvent   = Fiddle::Closure::BlockCaller.new(0, [0]) {}
+handler.MouseCrossed = Fiddle::Closure::BlockCaller.new(0, [0]) {}
+handler.DragBroken   = Fiddle::Closure::BlockCaller.new(0, [0]) {}
+handler.KeyEvent     = Fiddle::Closure::BlockCaller.new(0, [0]) {}
+
+box = UI.new_vertical_box
+UI.box_set_padded(box, 1)
+UI.box_append(box, area, 1)
+
+main_window = UI.new_window('Basic Area', 400, 400, 1)
+UI.window_set_margined(main_window, 1)
+UI.window_set_child(main_window, box)
+
+UI.window_on_closing(main_window) do
+  UI.control_destroy(main_window)
+  UI.quit
+  0
+end
+UI.control_show(main_window)
+
+UI.main
+UI.quit
+```
+
+[Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Area', 400, 400) {
+  margined true
+  
+  vertical_box {
+    area {
+      path { # a stable path is added declaratively
+        rectangle(0, 0, 400, 400)
+        
+        fill r: 102, g: 102, b: 204, a: 1.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.0.25
+0.1.0

data/examples/basic_area.rb

@@ -0,0 +1,17 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Area', 400, 400) {
+  margined true
+  
+  vertical_box {
+    area {
+      path { # a stable path is added declaratively
+        rectangle(0, 0, 400, 400)
+        
+        fill r: 102, g: 102, b: 204, a: 1.0
+      }
+    }
+  }
+}.show

data/examples/basic_table_progress_bar.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+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

data/examples/form_table.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+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

data/lib/glimmer/fiddle_consumer.rb

@@ -0,0 +1,33 @@
+# 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 FiddleConsumer
+    # Protects Fiddle::Closure::BlockCaller objects from garbage collection.
+    def fiddle_closure_block_caller(*args, &block)
+      @blockcaller ||= []
+      args << [0] if args.size == 1 # Argument types are ommited
+      blockcaller = ::Fiddle::Closure::BlockCaller.new(*args, &block)
+      @blockcaller << blockcaller
+      blockcaller
+    end
+  end
+end

data/lib/glimmer/libui/area_proxy.rb

@@ -0,0 +1,68 @@
+# 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'
+require 'glimmer/fiddle_consumer'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI area objects
+    #
+    # Follows the Proxy Design Pattern
+    class AreaProxy < ControlProxy
+      include Glimmer::FiddleConsumer
+      
+      attr_reader :area_handler
+      
+      def post_initialize_child(child)
+        super
+        children << child
+      end
+      
+      def post_add_content
+        super
+        install_listeners
+      end
+      
+      def children
+        @children ||= []
+      end
+      
+      private
+      
+      def build_control
+        @area_handler = ::LibUI::FFI::AreaHandler.malloc
+        @libui    = ::LibUI.new_area(@area_handler)
+      end
+      
+      def install_listeners
+        @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)
+          children.each {|child| child.draw(area_draw_params)}
+        end
+        @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [0]) {}
+        @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [0]) {}
+        @area_handler.DragBroken   = fiddle_closure_block_caller(0, [0]) {}
+        @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [0]) {}
+      end
+    end
+  end
+end

data/lib/glimmer/libui/checkbox_column_proxy.rb

@@ -30,12 +30,12 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class CheckboxColumnProxy < ControlProxy
       include Column
-#       include EditableColumn # TODO enable this once checkbox column becomes editable on macosx in C libui (currently has a bug)
+      include EditableColumn
       
       private
       
       def build_control
-        @parent_proxy.append_checkbox_column(name, column_index, -1)
+        @parent_proxy.append_checkbox_column(name, column_index, editable_value)
       end
     end
   end

data/lib/glimmer/libui/checkbox_text_column_proxy.rb

@@ -32,12 +32,44 @@ module Glimmer
     class CheckboxTextColumnProxy < ControlProxy
       include Column
       include DualColumn
-      include EditableColumn # TODO split into editable_checkbox and editable_text properties in the future given that checkbox and text can be edited separately
+      include EditableColumn
       
+      def editable_checkbox(value = nil)
+        if value.nil?
+          @editable_checkbox = false if @editable_checkbox.nil?
+          @editable_checkbox
+        else
+          @editable_checkbox = !!value
+        end
+      end
+      alias editable_checkbox= editable_checkbox
+      alias set_editable_checkbox editable_checkbox
+      alias editable_checkbox? editable_checkbox
+
+      def editable_text(value = nil)
+        if value.nil?
+          @editable_text = false if @editable_text.nil?
+          @editable_text
+        else
+          @editable_text = !!value
+        end
+      end
+      alias editable_text= editable_text
+      alias set_editable_text editable_text
+      alias editable_text? editable_text
+
       private
       
       def build_control
-        @parent_proxy.append_checkbox_text_column(name, column_index, -1, second_column_index, editable_value)
+        @parent_proxy.append_checkbox_text_column(name, column_index, editable_checkbox_value, second_column_index, editable_text_value)
+      end
+      
+      def editable_checkbox_value
+        (@parent_proxy.editable? || editable? || editable_checkbox?) ? -2 : -1
+      end
+      
+      def editable_text_value
+        (@parent_proxy.editable? || editable? || editable_text?) ? -2 : -1
       end
     end
   end

data/lib/glimmer/libui/path_proxy.rb

@@ -0,0 +1,141 @@
+# 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 path objects
+    #
+    # Follows the Proxy Design Pattern
+    class PathProxy < ControlProxy
+      # TODO support mode without parent proxy
+      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 post_initialize_child(child)
+        super
+        children << child
+      end
+      
+      def children
+        @children ||= []
+      end
+      
+      def draw(area_draw_params)
+        build_control
+        children.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?
+        ::LibUI.draw_free_path(@libui)
+      end
+      
+      def draw_fill_mode
+        @args[0].is_a?(Integer) ? @args[0] : @args[0].to_s == 'alternate' ? 1 : 0
+      end
+      
+      def fill(args = nil)
+        if args.nil?
+          @fill ||= {}
+        else
+          @fill = args
+        end
+      end
+      alias fill= fill
+      alias set_fill fill
+      
+      def fill_draw_brush
+        @fill_draw_brush ||= ::LibUI::FFI::DrawBrush.malloc
+        init_draw_brush(@fill_draw_brush, @fill)
+        @fill_draw_brush
+      end
+    
+      def stroke(args = nil)
+        if args.nil?
+          @stroke ||= {}
+        else
+          @stroke = args
+        end
+      end
+      alias stroke= stroke
+      alias set_stroke stroke
+      
+      def stroke_draw_brush
+        @stroke_draw_brush ||= ::LibUI::FFI::DrawBrush.malloc
+        init_draw_brush(@stroke_draw_brush, @stroke)
+        @stroke_draw_brush
+      end
+      
+      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.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.DashPhase = @stroke[:dash_phase] || 0
+        @draw_stroke_params
+      end
+    
+      def destroy
+        if @parent_proxy
+          @parent_proxy.children.delete(self)
+        end
+      end
+    
+      private
+      
+      def build_control
+        @libui = ::LibUI.draw_new_path(draw_fill_mode)
+      end
+      
+      def init_draw_brush(draw_brush, draw_brush_args)
+        case draw_brush_args[:type]
+        when Integer
+          draw_brush.Type = draw_brush_args[:type]
+        when :solid, 'solid'
+          draw_brush.Type = 0
+        when :linear_gradient, 'linear_gradient'
+          draw_brush.Type = 1
+        when :radial_gradient, 'radial_gradient'
+          draw_brush.Type = 2
+        when :image, 'image'
+          draw_brush.Type = 3
+        else
+          draw_brush.Type = 0
+        end
+        draw_brush.R = (draw_brush_args[:r] || draw_brush_args[:red]).to_f / 255.0
+        draw_brush.G = (draw_brush_args[:g] || draw_brush_args[:green]).to_f / 255.0
+        draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0
+        draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha])
+      end
+    end
+  end
+end

data/lib/glimmer/libui/progress_bar_column_proxy.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/control_proxy'
+require 'glimmer/libui/column'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI progress bar column objects
+    #
+    # Follows the Proxy Design Pattern
+    class ProgressBarColumnProxy < ControlProxy
+      include Column
+          
+      private
+      
+      def build_control
+        @parent_proxy.append_progress_bar_column(name, column_index)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/rectangle_proxy.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/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)
+      end
+      
+      def destroy
+        if @parent_proxy
+          @parent_proxy.children.delete(self)
+        end
+      end
+      
+      private
+      
+      def build_control
+        # No Op
+      end
+    end
+  end
+end

data/lib/glimmer/libui/table_proxy.rb

@@ -21,6 +21,7 @@
 
 require 'glimmer/libui/control_proxy'
 require 'glimmer/data_binding/observer'
+require 'glimmer/fiddle_consumer'
 
 using ArrayIncludeMethods
 
@@ -30,6 +31,8 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TableProxy < ControlProxy
+      include Glimmer::FiddleConsumer
+      
       attr_reader :model_handler, :model, :table_params, :columns
     
       def initialize(keyword, parent, args, &block)
@@ -71,8 +74,16 @@ module Glimmer
             @last_cell_rows = @cell_rows.clone
             Glimmer::DataBinding::Observer.proc do
               if @cell_rows.size < @last_cell_rows.size && @last_cell_rows.include_all?(*@cell_rows)
-                @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |index|
-                  ::LibUI.table_model_row_deleted(model, index)
+                @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |row|
+                  ::LibUI.table_model_row_deleted(model, row)
+                end
+              elsif @cell_rows.size > @last_cell_rows.size && @cell_rows.include_all?(*@last_cell_rows)
+                @cell_rows.array_diff_indexes(@last_cell_rows).each do |row|
+                  ::LibUI.table_model_row_inserted(model, row)
+                end
+              else
+                @cell_rows.each_with_index do |new_row_data, row|
+                  ::LibUI.table_model_row_changed(model, row) if new_row_data != @last_cell_rows[row]
                 end
               end
               @last_cell_rows = @cell_rows.clone
@@ -104,21 +115,19 @@ module Glimmer
       
       def build_control
         @model_handler = ::LibUI::FFI::TableModelHandler.malloc
-        @model_handler.NumColumns   = rbcallback(4) { @columns.map {|c| c.is_a?(DualColumn) ? 2 : 1}.sum }
-        @model_handler.ColumnType   = rbcallback(4, [1, 1, 4]) do |_, _, column|
+        @model_handler.NumColumns   = fiddle_closure_block_caller(4) { @columns.map {|c| c.is_a?(DualColumn) ? 2 : 1}.sum }
+        @model_handler.ColumnType   = fiddle_closure_block_caller(4, [1, 1, 4]) do |_, _, column|
           case @columns[column]
           when TextColumnProxy, ButtonColumnProxy, NilClass
             0
           when ImageColumnProxy, ImageTextColumnProxy
             1
-          when CheckboxColumnProxy, CheckboxTextColumnProxy
+          when CheckboxColumnProxy, CheckboxTextColumnProxy, ProgressBarColumnProxy
             2
-#           when ProgressBarColumnProxy
-#             2
           end
         end
-        @model_handler.NumRows      = rbcallback(4) { cell_rows.count }
-        @model_handler.CellValue    = rbcallback(1, [1, 1, 4, 4]) do |_, _, row, column|
+        @model_handler.NumRows      = fiddle_closure_block_caller(4) { cell_rows.count }
+        @model_handler.CellValue    = fiddle_closure_block_caller(1, [1, 1, 4, 4]) do |_, _, row, column|
           the_cell_rows = expanded_cell_rows
           case @columns[column]
           when TextColumnProxy, ButtonColumnProxy, NilClass
@@ -127,9 +136,11 @@ module Glimmer
             ::LibUI.new_table_value_image((expanded_cell_rows[row] && (expanded_cell_rows[row][column].respond_to?(:libui) ? expanded_cell_rows[row][column].libui : expanded_cell_rows[row][column])))
           when CheckboxColumnProxy, CheckboxTextColumnProxy
             ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column] == 1 || expanded_cell_rows[row][column].to_s.strip.downcase == 'true' ? 1 : 0)))
+          when ProgressBarColumnProxy
+            ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column].to_i)))
           end
         end
-        @model_handler.SetCellValue = rbcallback(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
+        @model_handler.SetCellValue = fiddle_closure_block_caller(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
           case @columns[column]
           when TextColumnProxy
             column = @columns[column].index
@@ -159,16 +170,6 @@ module Glimmer
         end
       end
       
-      def rbcallback(*args, &block)
-        # TODO consider moving to a more general reusable location in the future (e.g. when used with `AreaProxy`)
-        # Protects BlockCaller objects from garbage collection.
-        @blockcaller ||= []
-        args << [0] if args.size == 1 # Argument types are ommited
-        blockcaller = Fiddle::Closure::BlockCaller.new(*args, &block)
-        @blockcaller << blockcaller
-        blockcaller
-      end
-      
       def next_column_index
         @next_column_index ||= -1
         @next_column_index += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.1.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-28 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/basic_area.rb
 - examples/basic_button.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
@@ -202,6 +203,7 @@ files:
 - examples/basic_table_checkbox_text.rb
 - examples/basic_table_image.rb
 - examples/basic_table_image_text.rb
+- examples/basic_table_progress_bar.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
@@ -211,6 +213,7 @@ files:
 - examples/editable_table.rb
 - examples/font_button.rb
 - examples/form.rb
+- examples/form_table.rb
 - examples/grid.rb
 - examples/meta_example.rb
 - examples/midi_player.rb
@@ -225,7 +228,9 @@ files:
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_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/area_proxy.rb
 - lib/glimmer/libui/box.rb
 - lib/glimmer/libui/button_column_proxy.rb
 - lib/glimmer/libui/button_proxy.rb
@@ -257,9 +262,12 @@ files:
 - lib/glimmer/libui/menu_proxy.rb
 - lib/glimmer/libui/multiline_entry_proxy.rb
 - lib/glimmer/libui/non_wrapping_multiline_entry_proxy.rb
+- lib/glimmer/libui/path_proxy.rb
 - lib/glimmer/libui/preferences_menu_item_proxy.rb
+- 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/separator_menu_item_proxy.rb
 - lib/glimmer/libui/tab_item_proxy.rb
 - lib/glimmer/libui/table_proxy.rb