glimmer-dsl-libui 0.0.17 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9821169ec1b82253239d5169165c94c76e8b4efa407c27ccf4e73eae25cd68f
-  data.tar.gz: 47b312e49da5f6acf1011d1e45283d1b6d9cb2f8a03d37e218fba794e07990d9
+  metadata.gz: 3a7491ce7cea65fb7025868e9fb2db5c4e6187ba269a177879e4276e50fa3d9f
+  data.tar.gz: 9b47cab46d79af36dd06b6914570f30662540b7b8c1e634dc326ed9af32ad041
 SHA512:
-  metadata.gz: 326d75305142c5773a9dfd487fb595e7271c26a003ff1db10771a5e805e8c77eb567f6f56b54ac7ab721e2ed532f70ccdd9fa42437f6fd12c616f98d28c91f0e
-  data.tar.gz: a60432231078bf85d00e8882657eae577eeb99cf0b71a57f12c485c933577f8f4f7d98ec1cb6337f4ab4f1d02bf0c0061a618b9f998c16dc05641ad6efc8352f
+  metadata.gz: 692870dd49de81f7d2840579f0de3b7bd414bda277db56a4c28597febd012446c6b8b098bf56e5afe8c9b17f68547bb24bceaba45e15c3e4fd3ca041e5c37d2a
+  data.tar.gz: 289ede334bc53171a6a028dca1d03e794d0e81329621f2278365bfdcb2079fd200da21161d4aed6cf8486f382c4e0b04afadf3883ba0e07790878dbfd8fad334

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## 0.0.21
+
+- New examples/editable_column_table_image_text.rb
+- Support table `image_text_column`
+
+## 0.0.20
+
+- New examples/editable_column_table.rb
+- Support `editable` property for `text_column`
+
+## 0.0.19
+
+- New examples/editable_table.rb
+- Support editable `table` control
+- Fix issue with table `text_column` repeating the first column as the second
+
+## 0.0.18
+
+- Support examples/basic_table_image.rb
+- Support table `image_column`
+- Support `image` and `image_part` for building images from rgba byte arrays
+- Rename `Glimmer::LibUI::ControlProxy.all_control_proxies` to `Glimmer::LibUI::ControlProxy.control_proxies`
+- Add `Glimmer::LibUI::ControlProxy.image_proxies`
+
 ## 0.0.17
 
 - Support examples/basic_table.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.17
+# [<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.21
 ## 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.17](#-glimmer-dsl-for-libui-0017)
+- [Glimmer DSL for LibUI 0.0.21](#-glimmer-dsl-for-libui-0021)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -70,6 +70,10 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Grid](#grid)
     - [Form](#form)
     - [Basic Table](#basic-table)
+    - [Editable Table](#editable-table)
+    - [Editable Column Table](#editable-column-table)
+    - [Basic Table Image](#basic-table-image)
+    - [Basic Table Image Text](#basic-table-image-text)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -157,7 +161,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.17'
+gem 'glimmer-dsl-libui', '~> 0.0.21'
 ```
 
 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.
@@ -227,6 +231,10 @@ Control(Args) | Properties | Listeners
 `group(text as String)` | `margined` (Boolean), `title` (`String`) | None
 `horizontal_box` | `padded` (Boolean) | None
 `horizontal_separator` | None | None
+`image(width as Numeric, height as Numeric)` | None | None
+`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
 `label(text as String)` | `text` (`String`) | None
 `menu(text as String)` | None | None
 `menu_item(text as String)` | `checked` (Boolean) | `on_clicked`
@@ -242,8 +250,8 @@ Control(Args) | Properties | Listeners
 `spinbox(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `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)) | None
-`text_column(name as String)` | None | 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
+`text_column(name as String)` | `editable` as Boolean | None
 `time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
 `vertical_box` | `padded` (Boolean) | None
 `window(title as String, width as Integer, height as Integer, has_menubar as Boolean)` | `borderless` (Boolean), `content_size` (width `Numeric`, height `Numeric`), `fullscreen` (Boolean), `margined` (Boolean), `title` (`String`) | `on_closing`, `on_content_size_changed`, `on_destroy`
@@ -279,7 +287,9 @@ Control(Args) | Properties | Listeners
 
 ### Extra Operations
 
-- `ControlProxy::all_control_proxies`: returns all instantiated control proxies in the application
+- `ControlProxy::control_proxies`: returns all instantiated control proxies in the application
+- `ControlProxy::menu_proxies`: returns all instantiated `menu` proxies in the application
+- `ControlProxy::image_proxies`: returns all instantiated `image` proxies in the application
 - `ControlProxy::main_window_proxy`: returns the first window proxy instantiated in the application
 - `ControlProxy#window_proxy`: returns the window proxy parent for a control
 
@@ -306,7 +316,9 @@ Control(Args) | Properties | Listeners
 - When destroying a control nested under a `window` or `group`, it is automatically unset as their child to allow successful destruction
 - For `date_time_picker`, `date_picker`, and `time_picker`, make sure `time` hash values for `mon`, `wday`, and `yday` are 1-based instead of [libui](https://github.com/andlabs/libui) original 0-based values, and return `dst` as Boolean instead of `isdst` as `1`/`0`
 - 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` property (e.g. `NumRows`)
+- 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.
+- `image` instances are automatically freed from memory after `window` is destroyed.
 
 ### API Gotchas
 
@@ -500,6 +512,23 @@ window('hello world', 300, 200, true) {
 }.show
 ```
 
+[Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 2:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window { # first 3 args can be set via properties with 4th arg has_menubar=true by default
+  title 'hello world'
+  content_size 300, 200
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show
+```
+
 ### Basic Button
 
 [examples/basic_button.rb](examples/basic_button.rb)
@@ -564,7 +593,7 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('hello world', 300, 200, true) { |w|
+window('hello world', 300, 200) { |w|
   button('Button') {
     on_clicked do
       msg_box(w, 'Information', 'You clicked the button')
@@ -577,23 +606,6 @@ window('hello world', 300, 200, true) { |w|
 }.show
 ```
 
-[Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 2:
-
-```ruby
-require 'glimmer-dsl-libui'
-
-include Glimmer
-
-window { # first 3 args can be set via properties with 4th arg has_menubar=true by default
-  title 'hello world'
-  content_size 300, 200
-  
-  on_closing do
-    puts 'Bye Bye'
-  end
-}.show
-```
-
 ### Basic Entry
 
 [examples/basic_entry.rb](examples/basic_entry.rb)
@@ -1873,6 +1885,366 @@ window('Animal sounds', 300, 200) {
 }.show
 ```
 
+### Editable Table
+
+[examples/editable_table.rb](examples/editable_table.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/editable_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/editable_table'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-editable-table.png](images/glimmer-dsl-libui-mac-editable-table.png)
+![glimmer-dsl-libui-mac-editable-table-editing.png](images/glimmer-dsl-libui-mac-editable-table-editing.png)
+![glimmer-dsl-libui-mac-editable-table-edited.png](images/glimmer-dsl-libui-mac-editable-table-edited.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-editable-table.png](images/glimmer-dsl-libui-linux-editable-table.png)
+![glimmer-dsl-libui-linux-editable-table-editing.png](images/glimmer-dsl-libui-linux-editable-table-editing.png)
+![glimmer-dsl-libui-linux-editable-table-edited.png](images/glimmer-dsl-libui-linux-editable-table-edited.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  %w[cat meow],
+  %w[dog woof],
+  %w[chicken cock-a-doodle-doo],
+  %w[hourse neigh],
+  %w[cow moo]
+]
+
+window('Editable animal sounds', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+
+      cell_rows data
+      editable true
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show
+```
+
+### Editable Column Table
+
+[examples/editable_column_table.rb](examples/editable_column_table.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/editable_column_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/editable_column_table'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-editable-column-table-editing.png](images/glimmer-dsl-libui-mac-editable-column-table-editing.png)
+![glimmer-dsl-libui-mac-editable-column-table-edited.png](images/glimmer-dsl-libui-mac-editable-column-table-edited.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-editable-column-table-editing.png](images/glimmer-dsl-libui-linux-editable-column-table-editing.png)
+![glimmer-dsl-libui-linux-editable-column-table-edited.png](images/glimmer-dsl-libui-linux-editable-column-table-edited.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  %w[cat calm meow],
+  %w[dog loyal woof],
+  %w[chicken bird cock-a-doodle-doo],
+  %w[hourse fast neigh],
+  %w[cow slow moo]
+]
+
+window('Editable column animal sounds', 400, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+      text_column('Sound (Editable)') {
+        editable true
+      }
+
+      cell_rows data
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show
+```
+
+### Basic Table Image
+
+This example has a prerequisite of installing `chunky_png` Ruby gem:
+
+```
+gem install chunky_png -v1.4.0
+```
+
+Also, note that behavior varies per platform (i.e. how `table` chooses to size images by default).
+
+[examples/basic_table_image.rb](examples/basic_table_image.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_image.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_image'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-image.png](images/glimmer-dsl-libui-mac-basic-table-image.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-image.png](images/glimmer-dsl-libui-linux-basic-table-image.png)
+
+[LibUI](https://github.com/kojix2/LibUI) Original Version:
+
+```ruby
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'libui'
+require 'chunky_png'
+require 'open-uri'
+
+UI = LibUI
+
+UI.init
+
+main_window = UI.new_window('The Red Turtle', 310, 350, 0)
+
+hbox = UI.new_horizontal_box
+UI.window_set_child(main_window, hbox)
+
+IMAGES = []
+
+50.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  image = UI.new_image(width, height)
+  UI.image_append(image, data, width, height, width * 4)
+  IMAGES << image
+rescue StandardError => e
+  warn url, e.message
+end
+
+# Protects BlockCaller objects from garbage collection.
+@blockcaller = []
+def rbcallback(*args, &block)
+  args << [0] if args.size == 1 # Argument types are ommited
+  blockcaller = Fiddle::Closure::BlockCaller.new(*args, &block)
+  @blockcaller << blockcaller
+  blockcaller
+end
+
+model_handler = UI::FFI::TableModelHandler.malloc
+model_handler.NumColumns   = rbcallback(4) { 1 }
+model_handler.ColumnType   = rbcallback(4) { 1 } # Image
+model_handler.NumRows      = rbcallback(4) { IMAGES.size }
+model_handler.CellValue    = rbcallback(1, [1, 1, 4, 4]) do |_, _, row, _column|
+  UI.new_table_value_image(IMAGES[row])
+end
+model_handler.SetCellValue = rbcallback(0, [0]) {}
+
+model = UI.new_table_model(model_handler)
+
+table_params = UI::FFI::TableParams.malloc
+table_params.Model = model
+table_params.RowBackgroundColorModelColumn = -1
+
+table = UI.new_table(table_params)
+UI.table_append_image_column(table, 'www.ghibli.jp/works/red-turtle', 0)
+
+UI.box_append(hbox, table, 1)
+UI.control_show(main_window)
+
+UI.window_on_closing(main_window) do
+  puts 'Bye Bye'
+  UI.control_destroy(main_window)
+  UI.free_table_model(model)
+  IMAGES.each { |i| UI.free_image(i) }
+  UI.quit
+  0
+end
+
+UI.main
+UI.quit
+```
+
+[Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+50.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image(width, height) {
+    image_part(data, width, height, width * 4)
+  }
+  IMAGE_ROWS << [img] # array of one column cell
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 310, 350, false) {
+  horizontal_box {
+    table {
+      image_column('www.ghibli.jp/works/red-turtle', 0)
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+    
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show
+```
+
+### Basic Table Image Text
+
+This example has a prerequisite of installing `chunky_png` Ruby gem:
+
+```
+gem install chunky_png -v1.4.0
+```
+
+Also, note that behavior varies per platform (i.e. how `table` chooses to size images by default).
+
+[examples/basic_table_image_text.rb](examples/basic_table_image_text.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_image_text.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_image_text'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-image-text.png](images/glimmer-dsl-libui-mac-basic-table-image-text.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-image-text.png](images/glimmer-dsl-libui-linux-basic-table-image-text.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+5.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image(width, height) {
+    image_part(data, width, height, width * 4)
+  }
+  text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  IMAGE_ROWS << [[img, text], text, text, [img, text]]
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 900, 350) {
+  horizontal_box {
+    table {
+      image_text_column('image/number')
+      text_column('number')
+      text_column('number (editable)') {
+        editable true
+      }
+      image_text_column('image/number (editable)') {
+        editable true
+      }
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+}.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.17
+0.0.21

data/examples/basic_table_image.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+50.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image(width, height) {
+    image_part(data, width, height, width * 4)
+  }
+  IMAGE_ROWS << [img] # array of one column cell
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 310, 350, false) {
+  horizontal_box {
+    table {
+      image_column('www.ghibli.jp/works/red-turtle')
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/basic_table_image_text.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+5.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image(width, height) {
+    image_part(data, width, height, width * 4)
+  }
+  text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  IMAGE_ROWS << [[img, text], text, text, [img, text]]
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 900, 350) {
+  horizontal_box {
+    table {
+      image_text_column('image/number')
+      text_column('number')
+      text_column('number (editable)') {
+        editable true
+      }
+      image_text_column('image/number (editable)') {
+        editable true
+      }
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+}.show

data/examples/editable_column_table.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  %w[cat calm meow],
+  %w[dog loyal woof],
+  %w[chicken bird cock-a-doodle-doo],
+  %w[hourse fast neigh],
+  %w[cow slow moo]
+]
+
+window('Editable column animal sounds', 400, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+      text_column('Sound (Editable)') {
+        editable true
+      }
+
+      cell_rows data
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/editable_table.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  %w[cat meow],
+  %w[dog woof],
+  %w[chicken cock-a-doodle-doo],
+  %w[hourse neigh],
+  %w[cow moo]
+]
+
+window('Editable animal sounds', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+
+      cell_rows data
+      editable true
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/lib/glimmer/libui/box.rb

@@ -42,7 +42,7 @@ module Glimmer
       
       def destroy_child(child)
         ::LibUI.send("box_delete", @libui, children.index(child))
-        ControlProxy.all_control_proxies.delete(child)
+        ControlProxy.control_proxies.delete(child)
       end
       
       private

data/lib/glimmer/libui/column.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'
+
+module Glimmer
+  module LibUI
+    # Common logic for all column proxy objects
+    module Column
+      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 name
+        @args.first
+      end
+      
+      # column index used in table append column API call
+      # expanded to ensure DualColumn index accounts for two columns acting as one
+      def column_index
+        @column_index ||= @parent_proxy.send(:next_column_index)
+      end
+      
+      # actual index within table columns (disregarding nil fillings that account for DualColumn instances)
+      def index
+        @parent_proxy.columns.compact.index(self)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy.rb

@@ -33,7 +33,7 @@ module Glimmer
         end
         
         def create(keyword, parent, args, &block)
-          widget_proxy_class(keyword).new(keyword, parent, args, &block).tap {|c| all_control_proxies << c}
+          widget_proxy_class(keyword).new(keyword, parent, args, &block).tap {|c| control_proxies << c}
         end
         
         def widget_proxy_class(keyword)
@@ -46,13 +46,13 @@ module Glimmer
         end
         
         # autosave all controls in this array to avoid garbage collection
-        def all_control_proxies
-          @@all_control_proxies = [] unless defined?(@@all_control_proxies)
-          @@all_control_proxies
+        def control_proxies
+          @@control_proxies = [] unless defined?(@@control_proxies)
+          @@control_proxies
         end
         
         def main_window_proxy
-          all_control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
+          control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
         end
         
         def integer_to_boolean(int)
@@ -64,7 +64,11 @@ module Glimmer
         end
         
         def menu_proxies
-          all_control_proxies.select {|c| c.keyword == 'menu' }
+          control_proxies.select {|c| c.keyword == 'menu' }
+        end
+        
+        def image_proxies
+          control_proxies.select {|c| c.keyword == 'image' }
         end
         
         def new_control(keyword, args)
@@ -220,7 +224,7 @@ module Glimmer
       
       def default_destroy
         send_to_libui('destroy')
-        ControlProxy.all_control_proxies.delete(self)
+        ControlProxy.control_proxies.delete(self)
       end
             
       def enabled(value = nil)

data/lib/glimmer/libui/dual_column.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'
+
+module Glimmer
+  module LibUI
+    # 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 DualColumn
+      def second_column_index
+        column_index + 1
+      end
+      
+      def column_index
+        @column_index ||= @parent_proxy.send(:next_column_index).tap do
+          @parent_proxy.send(:next_column_index)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/editable_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.
+
+require 'glimmer/libui/control_proxy'
+
+module Glimmer
+  module LibUI
+    module EditableColumn
+      def editable(value = nil)
+        if value.nil?
+          @editable
+        else
+          @editable = !!value
+        end
+      end
+      alias editable= editable
+      alias set_editable editable
+      alias editable? editable
+
+      private
+      
+      def editable_value
+        (@parent_proxy.editable? || editable?) ? -2 : -1
+      end
+    end
+  end
+end

data/lib/glimmer/libui/form_proxy.rb

@@ -39,7 +39,7 @@ module Glimmer
       
       def destroy_child(child)
         ::LibUI.send("form_delete", @libui, children.index(child))
-        ControlProxy.all_control_proxies.delete(child)
+        ControlProxy.control_proxies.delete(child)
       end
       
       private

data/lib/glimmer/libui/image_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 image column objects
+    #
+    # Follows the Proxy Design Pattern
+    class ImageColumnProxy < ControlProxy
+      include Column
+    
+      private
+      
+      def build_control
+        @parent_proxy.append_image_column(name, column_index)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/image_part_proxy.rb

@@ -0,0 +1,37 @@
+# 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 image part objects
+    #
+    # Follows the Proxy Design Pattern
+    class ImagePartProxy < ControlProxy
+      private
+      
+      def build_control
+        @libui = @parent_proxy.append(*@args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/image_text_column_proxy.rb

@@ -0,0 +1,42 @@
+# 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 image text column objects
+    #
+    # Follows the Proxy Design Pattern
+    class ImageTextColumnProxy < ControlProxy
+      include Column
+      include DualColumn
+      include EditableColumn
+    
+      private
+      
+      def build_control
+        @parent_proxy.append_image_text_column(name, column_index, second_column_index, editable_value)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/table_proxy.rb

@@ -50,6 +50,8 @@ 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)
       end
       
       def destroy
@@ -61,21 +63,82 @@ module Glimmer
         if rows.nil?
           @cell_rows
         else
+          rows = rows.map do |row|
+            row.map do |cell|
+              if cell.respond_to?(:libui)
+                cell.libui
+              elsif cell.is_a?(Array)
+                cell.map { |inner_cell| inner_cell.respond_to?(:libui) ? inner_cell.libui : inner_cell }
+              else
+                cell
+              end
+            end
+          end
           @cell_rows = rows
         end
       end
       alias cell_rows= cell_rows
       alias set_cell_rows cell_rows
       
+      def expanded_cell_rows
+        cell_rows.map do |row|
+          row.flatten(1)
+        end
+      end
+      
+      def editable(value = nil)
+        if value.nil?
+          @editable
+        else
+          @editable = !!value
+        end
+      end
+      alias editable= editable
+      alias set_editable editable
+      alias editable? editable
+      
       private
       
       def build_control
         @model_handler = ::LibUI::FFI::TableModelHandler.malloc
-        @model_handler.NumColumns   = rbcallback(4) { @columns.count }
-        @model_handler.ColumnType   = rbcallback(4) { 0 } # TODO derive from @columns when supporting multiple column types in the future
+        @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|
+          case @columns[column]
+          when TextColumnProxy, NilClass
+            0
+          when ImageColumnProxy, ImageTextColumnProxy
+            1
+#           when CheckboxColumnProxy
+#             2
+#           when CheckboxTextColumnProxy
+#             2
+#           when ProgressBarColumnProxy
+#             2
+#           when ButtonColumnProxy
+#             0
+          end
+        end
         @model_handler.NumRows      = rbcallback(4) { cell_rows.count }
         @model_handler.CellValue    = rbcallback(1, [1, 1, 4, 4]) do |_, _, row, column|
-          ::LibUI.new_table_value_string((@cell_rows[row] && @cell_rows[row][column]).to_s)
+          the_cell_rows = expanded_cell_rows
+          case @columns[column]
+          when TextColumnProxy, NilClass
+            ::LibUI.new_table_value_string((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_s)
+          when ImageColumnProxy, ImageTextColumnProxy
+            ::LibUI.new_table_value_image((expanded_cell_rows[row] && expanded_cell_rows[row][column]))
+          end
+        end
+        @model_handler.SetCellValue = rbcallback(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
+          case @columns[column]
+          when TextColumnProxy
+            column = @columns[column].index
+            @cell_rows[row] ||= []
+            @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
+          when NilClass
+            # TODO ensure this works for editable table
+            column = @columns[column - 1].index
+            @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
+          end
         end
         
         @model = ::LibUI.new_table_model(@model_handler)
@@ -86,7 +149,7 @@ module Glimmer
         
         @libui = ControlProxy.new_control(@keyword, [@table_params])
         @libui.tap do
-          @columns.each {|column| column.send(:build_control) }
+          @columns.each {|column| column&.send(:build_control) }
         end
       end
       
@@ -100,6 +163,11 @@ module Glimmer
         blockcaller
       end
       
+      def next_column_index
+        @next_column_index ||= -1
+        @next_column_index += 1
+      end
+      
     end
   end
 end

data/lib/glimmer/libui/text_column_proxy.rb

@@ -20,6 +20,7 @@
 # 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
@@ -27,24 +28,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TextColumnProxy < ControlProxy
-      def initialize(keyword, parent, args, &block)
-        # TODO eventually move this to a supermodule ColumnProxy
-        @keyword = keyword
-        @parent_proxy = parent
-        @args = args
-        @block = block
-        @enabled = true
-        post_add_content if @block.nil?
-      end
-    
-      def name
-        @args.first
-      end
-      
+      include Column
+      include EditableColumn
+          
       private
       
       def build_control
-        @libui = @parent_proxy.append_text_column(name, @parent_proxy.columns.map(&:libui).compact.count, -1) # -1 for non-editable for now until editing is supported
+        @parent_proxy.append_text_column(name, column_index, editable_value)
       end
     end
   end

data/lib/glimmer/libui/window_proxy.rb

@@ -43,6 +43,7 @@ module Glimmer
       
       def destroy
         super
+        ControlProxy.image_proxies.each { |image_proxy| ::LibUI.free_image(image_proxy.libui) }
         @on_destroy_procs&.each { |on_destroy_proc| on_destroy_proc.call(self)}
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.21
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -162,8 +162,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: Glimmer DSL for LibUI - Prerequisite-Free Ruby Desktop Development GUI
-  Library (no need to pre-install any prerequisites. Just install the gem and have
+  Library (No need to pre-install any prerequisites. Just install the gem and have
   platform-independent native GUI that just works!)
 email: andy.am@gmail.com
 executables:
@@ -183,11 +197,15 @@ files:
 - examples/basic_button.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
+- examples/basic_table_image.rb
+- examples/basic_table_image_text.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
 - examples/control_gallery.rb
 - examples/date_time_picker.rb
+- examples/editable_column_table.rb
+- examples/editable_table.rb
 - examples/font_button.rb
 - examples/form.rb
 - examples/grid.rb
@@ -210,16 +228,22 @@ files:
 - lib/glimmer/libui/check_menu_item_proxy.rb
 - lib/glimmer/libui/checkbox_proxy.rb
 - lib/glimmer/libui/color_button_proxy.rb
+- lib/glimmer/libui/column.rb
 - lib/glimmer/libui/combobox_proxy.rb
 - lib/glimmer/libui/control_proxy.rb
 - lib/glimmer/libui/date_picker_proxy.rb
 - lib/glimmer/libui/date_time_picker_proxy.rb
+- lib/glimmer/libui/dual_column.rb
+- lib/glimmer/libui/editable_column.rb
 - lib/glimmer/libui/editable_combobox_proxy.rb
 - lib/glimmer/libui/font_button_proxy.rb
 - lib/glimmer/libui/form_proxy.rb
 - lib/glimmer/libui/grid_proxy.rb
 - lib/glimmer/libui/group_proxy.rb
 - lib/glimmer/libui/horizontal_box_proxy.rb
+- lib/glimmer/libui/image_column_proxy.rb
+- lib/glimmer/libui/image_part_proxy.rb
+- lib/glimmer/libui/image_text_column_proxy.rb
 - lib/glimmer/libui/label_proxy.rb
 - lib/glimmer/libui/menu_item_proxy.rb
 - lib/glimmer/libui/menu_proxy.rb