glimmer-dsl-libui 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b691a0eeec6e7d571ac6815c272e0dd5ae48c0f0302fc11876ae373cb92cba1e
-  data.tar.gz: 576d6840f47182d0dc0bd3ccccdb301b5a9efb2f7b7038efa3e5fa8d8ea30537
+  metadata.gz: 7aaaa95f0efdd3c1dd3dcc5ceb961e6f643d3df62a7145fce68da5dee977bcc6
+  data.tar.gz: 410b8273b462a9ad76dc7485d4183c0be08be62c60bd64f92a7b7aa974692e5d
 SHA512:
-  metadata.gz: d00b9ecc527e56e144d1baead2910e62a29f9f429af9fc57a1da05a4d590d9286f47c2fe8d840062c1a989f42183f9dfc717a0800db2ec6467acc434201d3707
-  data.tar.gz: 53dbe182b9b9607111915412af9d418571511af560dc5af83d792214139c62f91358aa5555147d962a040802852d74f581413b99d287827454ea2ca865ec110b
+  metadata.gz: f04981d43dc57f873da61bd77166d16b519b408a4b11b3695a1f82670e8502eab328d19c4bef60cab5549eae25b6a813ec0ca40342c65b2597c1a9b315ce3014
+  data.tar.gz: f714acf1968782069530c9ebce6c260080a12bb664d5218e84ec10f86250152e2e0abbc0b48e98c435da46e8915f858ff6e16a241009b0564cb8ebbb8f018c65

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## 0.2.9
+
+- Upgrade to glimmer 2.3.0
+- Use glimmer 2.3.0 to support automatic table row change when performing a direct deep row/column update in `cell_rows` (e.g. `data[3][0] = 'new value'`) as opposed to a general shallow row update (e.g. `data[3] = ['new value', 'other new value']` <- already supported)
+
+## 0.2.8
+
+- Support `table` `on_changed` listener to report all changes (of operation type `:deleted`, `:changed`, `:inserted`)
+- Support `table` `on_edited` listener to report changes happening through direct table editing only
+- Default value of `text` `width` argument looks into x and adjusts by leaving the same space on the right side
+
+## 0.2.7
+
+- New examples/basic_table_color.rb
+- Support `background_color_column` for `table`
+- Support `text_color_column` for `table`
+- Support `checkbox_text_color_column` for `table`
+- Support `image_text_color_column` for `table`
+
+## 0.2.6
+
+- Support `string` control property: `open_type_features`
+- Auto-free attributed string objects from memory
+
 ## 0.2.5
 
 - Support attributed `string` `underline_color` property (built-in enum symbols and custom color)
@@ -8,9 +32,9 @@
 
 - Support examples/custom_draw_text.rb
 - Support stable `text` control nestable under `area`
-- Support `string` control property `background`
-- Support `string` control property `font`
-- Support `string` control property `underline`
+- Support `string` control property: `background`
+- Support `string` control property: `font`
+- Support `string` control property: `underline`
 - Enhance `combobox` to accept `String` value for `selected` item instead of just `Integer` index
 - Add `selected_item` read-only property to `combobox` to return selected item `String` value
 - Fix `color` property support for `string` to accept 255-based rgb values
@@ -23,7 +47,7 @@
 - Support dynamic `text` control to be called in `area` `on_draw` listener
 - Support `text` control `default_font` property
 - Support `string` control nestable under `text` to represent an attributed/unattributed string (depending on nestable properties)
-- Support `string` control property `color`
+- Support `string` control property: `color`
 - Support enum symbols for `align` property of `text` control
 - Support enum symbols for `:italic` font descriptor key (in addition to numbers)
 - Support enum symbols for `:stretch` font descriptor key (in addition to numbers)

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.2.5
+# [<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.2.9
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-libui/maintainability)
@@ -61,7 +61,7 @@ window('Task Progress', 300, 200) {
       
       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
+          data[row][1] = 100 # automatically updates table due to implicit data-binding
         end
       end
     }
@@ -197,7 +197,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.2.5](#-glimmer-dsl-for-libui-025)
+- [Glimmer DSL for LibUI 0.2.9](#-glimmer-dsl-for-libui-029)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -235,6 +235,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Basic Table Checkbox](#basic-table-checkbox)
     - [Basic Table Checkbox Text](#basic-table-checkbox-text)
     - [Basic Table Progress Bar](#basic-table-progress-bar)
+    - [Basic Table Color](#basic-table-color)
     - [Form Table](#form-table)
     - [Basic Area](#basic-area)
     - [Dynamic Area](#dynamic-area)
@@ -333,7 +334,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.2.5'
+gem 'glimmer-dsl-libui', '~> 0.2.9'
 ```
 
 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.
@@ -409,12 +410,14 @@ Control(Args) | Properties | Listeners
 `about_menu_item` | None | `on_clicked`
 `area` | None | `on_draw(area_draw_params)`, `on_mouse_event(area_mouse_event)`, `on_mouse_down(area_mouse_event)`, `on_mouse_up(area_mouse_event)`, `on_mouse_drag_started(area_mouse_event)`, `on_mouse_dragged(area_mouse_event)`, `on_mouse_dropped(area_mouse_event)`, `on_mouse_entered`, `on_mouse_exited`, `on_key_event(area_key_event)`, `on_key_down(area_key_event)`, `on_key_up(area_key_event)`
 `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
+`background_color_column(name as String)` | None | 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`
 `checkbox_column(name as String)` | `editable` (Boolean) | None
 `checkbox_text_column(name as String)` | `editable` (Boolean), `editable_checkbox` (Boolean), `editable_text` (Boolean) | None
+`checkbox_text_color_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`
@@ -432,6 +435,7 @@ Control(Args) | Properties | Listeners
 `image_part(pixels as String [encoded image rgba byte array], width as Numeric, height as Numeric, byte_stride as Numeric [usually width*4])` | None | None
 `image_column(name as String)` | None | None
 `image_text_column(name as String)` | None | None
+`image_text_color_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
 `matrix(m11 = nil as Numeric, m12 = nil as Numeric, m21 = nil as Numeric, m22 = nil as Numeric, m31 = nil as Numeric, m32 = nil as Numeric)` | `m11` (`Numeric`), `m12` (`Numeric`), `m21` (`Numeric`), `m22` (`Numeric`), `m31` (`Numeric`), `m32` (`Numeric`) | None
@@ -453,10 +457,13 @@ Control(Args) | Properties | Listeners
 `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
+`string` | `font`, `color`, `background`, `underline`, `underline_color`, `open_type_features` | 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
+`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 | `on_changed {|row, type, row_data| ...}`, `on_edited {|row, row_data| ...}`
+`text(x = 0 as Numeric, y = 0 as Numeric, width = area_width as Numeric)` | `align`, `default_font` | None
 `text_column(name as String)` | `editable` (Boolean) | None
+`text_color_column(name as String)` | `editable` (Boolean) | None
 `time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`) | `on_changed`
 `vertical_box` | `padded` (Boolean) | None
 `vertical_separator` | None | None
@@ -510,12 +517,16 @@ All operations that could normally be called on `LibUI` can also be called on `G
 ### Table API
 
 The `table` control must first declare its columns via one of these column keywords (mentioned in [Supported Controls](#supported-controls)):
+  - `background_color_column`: expects color cell values
   - `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
+  - `checkbox_text_color_column`: expects triple-element `Array` of Boolean, `String`, and color 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
+  - `image_text_color_column`: expects triple-element `Array` of `image`, `String`, and color cell values
   - `text_column`: expects `String` cell values
+  - `text_color_column`: expects dual-element `Array` of `String` and color 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.
@@ -790,6 +801,50 @@ Check [Basic Transform](#basic-transform) example for use of [X11](https://en.wi
 
 Check [Histogram](#histogram) example for use of hex colors.
 
+To draw `text` in an `area`, you simply nest a `text(x, y, width)` control directly under `area` or inside a `on_draw` listener, and then nest attributed `string {string_value}` controls underneath it returning an actual `String` (think of them as the `<span>` element in html, which contains a string of text).
+
+`text` control can have the following properties:
+- `default_font`:
+- `align`: `:left` (default), `:center`, or `:right` (`align` currently seems not to work on the Mac)
+
+`string` can have the following properties:
+- `font`: font descriptor hash consisting of `:family`, `:size`, `:weight` (`[:minimum, :thin, :ultra_light, :light, :book, :normal, :medium, :semi_bold, :bold, :ultra_bold, :heavy, :ultra_heavy, :maximum]`), `:italic` (`[:normal, :oblique, :italic]`), and `:stretch` (`[:ultra_condensed, :extra_condensed, :condensed, :semi_condensed, :normal, :semi_expanded, :expanded, :extra_expanded, :ultra_expanded]`) key values
+- `color`: rgba, hex, or [X11](https://en.wikipedia.org/wiki/X11_color_names) color
+- `background`: rgba, hex, or [X11](https://en.wikipedia.org/wiki/X11_color_names) color
+- `underline`: one of `:none`, `:single`, `:double`, `:suggestion`, `:color_custom`, `:color_spelling`, `:color_grammar`, `:color_auxiliary`
+- `underline_color`: one of `:spelling`, `:grammar`, `:auxiliary`, rgba, hex, or [X11](https://en.wikipedia.org/wiki/X11_color_names) color
+- `open_type_features`: it must have a block containing `open_type_tag` occurrances, which take the a, b, c, d arguments plus a number at the end.
+
+Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
+
+```ruby
+window('area text drawing') {
+  area {
+    text {
+      default_font family: 'Helvetica', size: 12, weight: :normal, italic: :normal, stretch: :normal
+        
+      string {
+        font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
+        color r: 230, g: 100, b: 50, a: 0.5
+        background r: 230, g: 200, b: 250, a: 0.8
+        underline :single
+        underline_color :spelling
+        open_type_features {
+          open_type_tag 'l', 'i', 'g', 'a', 0
+          open_type_tag 'l', 'i', 'g', 'a', 1
+        }
+        
+        "This is a test\n\n"
+      }
+      
+      string {
+        'This is another test'
+      }
+    }
+  }
+}.show
+```
+
 ### 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
@@ -831,7 +886,7 @@ Check [Histogram](#histogram) example for use of hex colors.
 
 - 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.
+- `text` `align` property seems not to work on the Mac ([libui](https://github.com/andlabs/libui) has an [issue](https://github.com/andlabs/libui/pull/407) about it)
 
 ### Original API
 
@@ -2469,6 +2524,14 @@ window('Editable animal sounds', 300, 200) {
 
       cell_rows data
       editable true
+      
+      on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
+        puts "Row #{row} #{type}: #{row_data}"
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+      end
     }
   }
   
@@ -2540,7 +2603,7 @@ window('Editable column animal sounds', 400, 200) {
 
 ### Basic Table Image
 
-This example has a prerequisite of installing `chunky_png` Ruby gem:
+This example requires pre-installing `chunky_png` Ruby gem:
 
 ```
 gem install chunky_png -v1.4.0
@@ -2827,6 +2890,10 @@ window('Animal sounds', 300, 200) {
       }
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show
@@ -2989,7 +3056,7 @@ window('Task Progress', 300, 200) {
       
       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
+          data[row][1] = 100 # automatically updates table due to implicit data-binding
         end
       end
     }
@@ -2997,6 +3064,78 @@ window('Task Progress', 300, 200) {
 }.show
 ```
 
+### Basic Table Color
+
+This example requires pre-installing `chunky_png` Ruby gem:
+
+```
+gem install chunky_png -v1.4.0
+```
+
+[examples/basic_table_color.rb](examples/basic_table_color.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_color.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_color'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-color.png](images/glimmer-dsl-libui-mac-basic-table-color.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-color.png](images/glimmer-dsl-libui-linux-basic-table-color.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+
+include Glimmer
+
+f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
+canvas = ChunkyPNG::Canvas.from_io(f)
+f.close
+canvas.resample_nearest_neighbor!(24, 24)
+data = canvas.to_rgba_stream
+width = canvas.width
+height = canvas.height
+img = image {
+  image_part(data, width, height, width * 4)
+}
+
+data = [
+  [['cat', :red]      , ['meow', :blue]                  , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], {r: 255, g: 120, b: 0, a: 0.5}],
+  [['dog', :yellow]   , ['woof', {r: 240, g: 32, b: 32}] , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], :skyblue],
+  [['chicken', :beige], ['cock-a-doodle-doo', :blue]     , [false, 'mammal', :red] , [img, 'Glimmer', :beige], {r: 5, g: 120, b: 110}],
+  [['horse', :purple] , ['neigh', {r: 240, g: 32, b: 32}], [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], '13a1fb'],
+  [['cow', :gray]     , ['moo', :blue]                   , [true, 'mammal', :green], [img, 'Glimmer', :brown], 0x12ff02]
+]
+
+window('Animals', 500, 200) {
+  horizontal_box {
+    table {
+      text_color_column('Animal')
+      text_color_column('Sound')
+      checkbox_text_color_column('Description')
+      image_text_color_column('GUI')
+      background_color_column('Mammal')
+
+      cell_rows data
+    }
+  }
+}.show
+```
+
 ### Form Table
 
 [examples/form_table.rb](examples/form_table.rb)
@@ -3112,6 +3251,10 @@ window('Contacts', 600, 600) { |w|
       text_column('State')
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show
@@ -5397,11 +5540,11 @@ class CustomDrawText
             text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
               # align :left # default alignment
                 
-              @string = string {
-                font @font unless @font.nil?
-                color @color unless @color.nil?
-                background @background unless @background.nil?
-                underline @underline unless @underline.nil?
+              string {
+                font @font
+                color @color
+                background @background
+                underline @underline
                 
                 '  At last Ygramul sensed that something was coming toward ' \
                 'her. With the speed of lightning, she turned about, confronting ' \

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.9

data/examples/basic_table_button.rb

@@ -24,6 +24,10 @@ window('Animal sounds', 300, 200) {
       }
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show

data/examples/basic_table_color.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+
+include Glimmer
+
+f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
+canvas = ChunkyPNG::Canvas.from_io(f)
+f.close
+canvas.resample_nearest_neighbor!(24, 24)
+data = canvas.to_rgba_stream
+width = canvas.width
+height = canvas.height
+img = image {
+  image_part(data, width, height, width * 4)
+}
+
+data = [
+  [['cat', :red]      , ['meow', :blue]                  , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], {r: 255, g: 120, b: 0, a: 0.5}],
+  [['dog', :yellow]   , ['woof', {r: 240, g: 32, b: 32}] , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], :skyblue],
+  [['chicken', :beige], ['cock-a-doodle-doo', :blue]     , [false, 'mammal', :red] , [img, 'Glimmer', :beige], {r: 5, g: 120, b: 110}],
+  [['horse', :purple] , ['neigh', {r: 240, g: 32, b: 32}], [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], '13a1fb'],
+  [['cow', :gray]     , ['moo', :blue]                   , [true, 'mammal', :green], [img, 'Glimmer', :brown], 0x12ff02]
+]
+
+window('Animals', 500, 200) {
+  horizontal_box {
+    table {
+      text_color_column('Animal')
+      text_color_column('Sound')
+      checkbox_text_color_column('Description')
+      image_text_color_column('GUI')
+      background_color_column('Mammal')
+
+      cell_rows data
+    }
+  }
+}.show

data/examples/basic_table_progress_bar.rb

@@ -26,7 +26,7 @@ window('Task Progress', 300, 200) {
       
       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
+          data[row][1] = 100 # automatically updates table due to implicit data-binding
         end
       end
     }

data/examples/custom_draw_text.rb

@@ -69,9 +69,9 @@ class CustomDrawText
         }
         
         area {
-          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width] - 2*x)
             # align :left # default alignment
-              
+            
             @string = string {
               '  At last Ygramul sensed that something was coming toward ' \
               'her. With the speed of lightning, she turned about, confronting ' \

data/examples/custom_draw_text2.rb

@@ -76,10 +76,10 @@ class CustomDrawText
         
         @area = area {
           on_draw do |area_draw_params|
-            text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width] - 2*x)
               # align :left # default alignment
                 
-              @string = string {
+              string {
                 font @font
                 color @color
                 background @background

data/examples/editable_table.rb

@@ -20,6 +20,14 @@ window('Editable animal sounds', 300, 200) {
 
       cell_rows data
       editable true
+      
+      on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
+        puts "Row #{row} #{type}: #{row_data}"
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+      end
     }
   }
   

data/examples/form_table.rb

@@ -82,6 +82,10 @@ window('Contacts', 600, 600) { |w|
       text_column('State')
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show

data/lib/glimmer/libui/attributed_string.rb

@@ -94,12 +94,27 @@ module Glimmer
       alias underline_color= underline_color
       alias set_underline_color underline_color
       
+      def open_type_features(value = nil)
+        if value.nil?
+          @open_type_features
+        else
+          @open_type_features = value
+          redraw
+        end
+      end
+      alias open_type_features= open_type_features
+      alias set_open_type_features open_type_features
+      
       def post_add_content
         block_result = block&.call
         @string = block_result if block_result.is_a?(String)
         @parent_proxy&.post_initialize_child(self)
       end
       
+      def post_initialize_child(child)
+        self.open_type_features = child if child.is_a?(Glimmer::LibUI::ControlProxy::OpenTypeFeaturesProxy)
+      end
+      
       def draw(area_draw_params)
         @start = ::LibUI.attributed_string_len(@parent_proxy.attributed_string)
         ::LibUI.attributed_string_append_unattributed(@parent_proxy.attributed_string, @string)
@@ -137,10 +152,15 @@ module Glimmer
           stretch_attribute = ::LibUI.new_stretch_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_stretch, font[:stretch]))
           ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, stretch_attribute, @start, @start + @string.size)
         end
+        unless open_type_features.nil?
+          open_type_features_attribute = ::LibUI.new_features_attribute(open_type_features.libui)
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, open_type_features_attribute, @start, @start + @string.size)
+        end
         destroy if area_proxy.nil?
       end
       
       def destroy
+        open_type_features.destroy unless open_type_features.nil?
         @parent_proxy&.children&.delete(self)
       end
       

data/lib/glimmer/libui/control_proxy/column/background_color_column_proxy.rb

@@ -0,0 +1,38 @@
+# 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/control_proxy/column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI background color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class BackgroundColorColumnProxy < ControlProxy
+          include Column
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/column/checkbox_text_color_column_proxy.rb

@@ -0,0 +1,82 @@
+# 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/control_proxy/column'
+require 'glimmer/libui/control_proxy/triple_column'
+require 'glimmer/libui/control_proxy/editable_column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI checkbox text color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class CheckboxTextColorColumnProxy < ControlProxy
+          include Column
+          include TripleColumn
+          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
+            table_text_column_optional_params = ::LibUI::FFI::TableTextColumnOptionalParams.malloc
+            table_text_column_optional_params.ColorModelColumn = third_column_index
+            @parent_proxy.append_checkbox_text_column(name, column_index, editable_checkbox_value, second_column_index, editable_text_value, table_text_column_optional_params)
+          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
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/column/image_text_color_column_proxy.rb

@@ -0,0 +1,50 @@
+# 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/control_proxy/column'
+require 'glimmer/libui/control_proxy/triple_column'
+require 'glimmer/libui/control_proxy/editable_column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI image text color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class ImageTextColorColumnProxy < ControlProxy
+          include Column
+          include TripleColumn
+          include EditableColumn
+              
+          private
+          
+          def build_control
+            table_text_column_optional_params = ::LibUI::FFI::TableTextColumnOptionalParams.malloc
+            table_text_column_optional_params.ColorModelColumn = third_column_index
+            @parent_proxy.append_image_text_column(name, column_index, second_column_index, editable_value, table_text_column_optional_params)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/column/text_color_column_proxy.rb

@@ -0,0 +1,50 @@
+# 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/control_proxy/column'
+require 'glimmer/libui/control_proxy/dual_column'
+require 'glimmer/libui/control_proxy/editable_column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI text color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class TextColorColumnProxy < ControlProxy
+          include Column
+          include DualColumn
+          include EditableColumn
+              
+          private
+          
+          def build_control
+            table_text_column_optional_params = ::LibUI::FFI::TableTextColumnOptionalParams.malloc
+            table_text_column_optional_params.ColorModelColumn = second_column_index
+            @parent_proxy.append_text_column(name, column_index, editable_value, table_text_column_optional_params)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -38,6 +38,7 @@ module Glimmer
         private
         
         def editable_value
+          # TODO consider relying on enum symbol :table_model_column
           (@parent_proxy.editable? || editable?) ? -2 : -1
         end
       end

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

@@ -0,0 +1,53 @@
+# 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/control_proxy/area_proxy'
+require 'glimmer/libui/parent'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI open type features objects
+      #
+      # Follows the Proxy Design Pattern
+      class OpenTypeFeaturesProxy < ControlProxy
+        include Parent
+      
+        def destroy
+          ::LibUI.free_open_type_features(@libui)
+          @parent_proxy&.children&.delete(self)
+          ControlProxy.control_proxies.delete(self)
+        end
+        
+        def redraw
+          @parent_proxy.redraw
+        end
+        
+        private
+        
+        def build_control
+          @libui = ::LibUI.new_open_type_features
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# 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/control_proxy/area_proxy'
+require 'glimmer/libui/parent'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI open type tag objects
+      #
+      # Follows the Proxy Design Pattern
+      class OpenTypeTagProxy < ControlProxy
+        def destroy
+          @parent_proxy&.children&.delete(self)
+          ControlProxy.control_proxies.delete(self)
+        end
+        
+        def redraw
+          @parent_proxy.redraw
+        end
+        
+        private
+        
+        def build_control
+          tag_args = @args.dup
+          tag_args[0] = ordinalize(tag_args[0])
+          tag_args[1] = ordinalize(tag_args[1])
+          tag_args[2] = ordinalize(tag_args[2])
+          tag_args[3] = ordinalize(tag_args[3])
+          ::LibUI.open_type_features_add(@parent_proxy.libui, *tag_args)
+        end
+        
+        def ordinalize(arg)
+          arg.is_a?(String) ? arg.ord : arg
+        end
+      end
+    end
+  end
+end

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

@@ -35,6 +35,8 @@ module Glimmer
       class TableProxy < ControlProxy
         include Glimmer::FiddleConsumer
         
+        LISTENERS = ['on_changed', 'on_edited']
+        
         attr_reader :model_handler, :model, :table_params, :columns
       
         def initialize(keyword, parent, args, &block)
@@ -58,8 +60,16 @@ module Glimmer
         
         def post_initialize_child(child)
           @columns << child
-          # add an extra complementary nil column if it is a dual column (i.e. ImageTextColumnProxy or CheckboxTextColumnProxy
-          @columns << nil if child.is_a?(DualColumn)
+          # add extra complementary columns (:text, :color) if it is a dual/triple column (i.e. ImageTextColumnProxy or CheckboxTextColumnProxy
+          case child
+          when Column::ImageTextColumnProxy, Column::CheckboxTextColumnProxy
+            @columns << :text
+          when Column::TextColorColumnProxy
+            @columns << :color
+          when Column::CheckboxTextColorColumnProxy, Column::ImageTextColorColumnProxy
+            @columns << :text
+            @columns << :color
+          end
         end
         
         def destroy
@@ -73,22 +83,27 @@ module Glimmer
           else
             @cell_rows = rows
             @cell_rows.tap do
-              @last_cell_rows = @cell_rows.clone
+              @last_cell_rows = array_deep_clone(@cell_rows)
               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 |row|
                     ::LibUI.table_model_row_deleted(model, row)
+                    on_changed.each {|listener| listener.call(row, :deleted, @last_cell_rows[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)
+                    on_changed.each {|listener| listener.call(row, :inserted, @cell_rows[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]
+                    if new_row_data != @last_cell_rows[row]
+                      ::LibUI.table_model_row_changed(model, row)
+                      on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
+                    end
                   end
                 end
-                @last_cell_rows = @cell_rows.clone
+                @last_cell_rows = array_deep_clone(@cell_rows)
               end.observe(self, :cell_rows)
             end
           end
@@ -119,27 +134,36 @@ module Glimmer
           @model_handler = ::LibUI::FFI::TableModelHandler.malloc
           @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|
+            # TODO consider refactoring to use Glimmer::LibUI.enum_symbols(:table_value_type)
             case @columns[column]
-            when Column::TextColumnProxy, Column::ButtonColumnProxy, NilClass
+            when Column::TextColumnProxy, Column::ButtonColumnProxy, Column::TextColorColumnProxy, :text
               0
-            when Column::ImageColumnProxy, Column::ImageTextColumnProxy
+            when Column::ImageColumnProxy, Column::ImageTextColumnProxy, Column::ImageTextColorColumnProxy
               1
-            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::ProgressBarColumnProxy
+            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::CheckboxTextColorColumnProxy, Column::ProgressBarColumnProxy
               2
+            when Column::BackgroundColorColumnProxy, :color
+              3
             end
           end
           @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 Column::TextColumnProxy, Column::ButtonColumnProxy, NilClass
+            when Column::TextColumnProxy, Column::ButtonColumnProxy, Column::TextColorColumnProxy, :text
               ::LibUI.new_table_value_string((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_s)
-            when Column::ImageColumnProxy, Column::ImageTextColumnProxy
+            when Column::ImageColumnProxy, Column::ImageTextColumnProxy, Column::ImageTextColorColumnProxy
               ::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 Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy
+            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::CheckboxTextColorColumnProxy
               ::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 Column::ProgressBarColumnProxy
               ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column].to_i)))
+            when Column::BackgroundColorColumnProxy
+              background_color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              ::LibUI.new_table_value_color(background_color[:r] / 255.0, background_color[:g] / 255.0, background_color[:b] / 255.0, background_color[:a] || 1.0)
+            when :color
+              color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              ::LibUI.new_table_value_color(color[:r] / 255.0, color[:g] / 255.0, color[:b] / 255.0, color[:a] || 1.0)
             end
           end
           @model_handler.SetCellValue = fiddle_closure_block_caller(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
@@ -148,7 +172,7 @@ module Glimmer
               column = @columns[column].index
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
-            when NilClass
+            when :text
               column = @columns[column - 1].index
               @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
             when Column::ButtonColumnProxy
@@ -158,17 +182,22 @@ module Glimmer
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
             end
+            on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
+            on_edited.each {|listener| listener.call(row, @cell_rows[row])}
           end
           
           @model = ::LibUI.new_table_model(@model_handler)
           
+          # figure out and reserve column indices for columns
+          @columns.each { |column| column.respond_to?(:column_index) && column.column_index }
+          
           @table_params = ::LibUI::FFI::TableParams.malloc
           @table_params.Model = @model
-          @table_params.RowBackgroundColorModelColumn = -1
+          @table_params.RowBackgroundColorModelColumn = @columns.find {|column| column.is_a?(Column::BackgroundColorColumnProxy)}&.column_index || -1
           
           @libui = ControlProxy.new_control(@keyword, [@table_params])
           @libui.tap do
-            @columns.each {|column| column&.send(:build_control) }
+            @columns.each {|column| column.respond_to?(:build_control, true) && column.send(:build_control) }
           end
         end
         
@@ -176,6 +205,16 @@ module Glimmer
           @next_column_index ||= -1
           @next_column_index += 1
         end
+        
+        def array_deep_clone(array_or_object)
+          if array_or_object.is_a?(Array)
+            array_or_object.map do |element|
+              array_deep_clone(element)
+            end
+          else
+            array_or_object.clone
+          end
+        end
       end
     end
   end

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

@@ -56,6 +56,7 @@ module Glimmer
           build_control
           ::LibUI.draw_text(area_draw_params[:context], @libui, x, y)
           ::LibUI.draw_free_text_layout(@libui)
+          ::LibUI.free_attributed_string(@attributed_string)
         end
         
         def destroy
@@ -89,7 +90,7 @@ module Glimmer
         
         def width(value = nil)
           if value.nil?
-            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:area_width])
+            @width ||= args[2] || (AreaProxy.current_area_draw_params && (AreaProxy.current_area_draw_params[:area_width] - 2*x))
           else
             @width = value
             redraw

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

@@ -0,0 +1,45 @@
+# 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
+    class ControlProxy
+      # A dual column is one that represents two values (e.g. image and text or checkbox and text)
+      # It is meant to be included in a column proxy class that already includes Column
+      module TripleColumn
+        def second_column_index
+          column_index + 1
+        end
+        
+        def third_column_index
+          column_index + 2
+        end
+        
+        def column_index
+          @column_index ||= @parent_proxy.send(:next_column_index).tap do
+            @parent_proxy.send(:next_column_index)
+            @parent_proxy.send(:next_column_index)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - examples/basic_table_button.rb
 - examples/basic_table_checkbox.rb
 - examples/basic_table_checkbox_text.rb
+- examples/basic_table_color.rb
 - examples/basic_table_image.rb
 - examples/basic_table_image_text.rb
 - examples/basic_table_progress_bar.rb
@@ -249,6 +250,7 @@ files:
 - examples/simple_notepad.rb
 - examples/timer.rb
 - glimmer-dsl-libui.gemspec
+- icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
 - lib/glimmer/dsl/libui/control_expression.rb
 - lib/glimmer/dsl/libui/dsl.rb
@@ -273,12 +275,16 @@ files:
 - lib/glimmer/libui/control_proxy/checkbox_proxy.rb
 - lib/glimmer/libui/control_proxy/color_button_proxy.rb
 - lib/glimmer/libui/control_proxy/column.rb
+- lib/glimmer/libui/control_proxy/column/background_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/button_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/checkbox_text_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/image_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/image_text_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/progress_bar_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/text_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/text_column_proxy.rb
 - lib/glimmer/libui/control_proxy/combobox_proxy.rb
 - lib/glimmer/libui/control_proxy/date_time_picker_proxy.rb
@@ -312,12 +318,15 @@ files:
 - lib/glimmer/libui/control_proxy/message_box/msg_box_proxy.rb
 - lib/glimmer/libui/control_proxy/multiline_entry_proxy.rb
 - lib/glimmer/libui/control_proxy/multiline_entry_proxy/non_wrapping_multiline_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/open_type_features_proxy.rb
+- lib/glimmer/libui/control_proxy/open_type_tag_proxy.rb
 - lib/glimmer/libui/control_proxy/path_proxy.rb
 - lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
 - lib/glimmer/libui/control_proxy/tab_item_proxy.rb
 - lib/glimmer/libui/control_proxy/table_proxy.rb
 - lib/glimmer/libui/control_proxy/text_proxy.rb
 - lib/glimmer/libui/control_proxy/transformable.rb
+- lib/glimmer/libui/control_proxy/triple_column.rb
 - lib/glimmer/libui/control_proxy/window_proxy.rb
 - lib/glimmer/libui/parent.rb
 - lib/glimmer/libui/shape.rb