glimmer-dsl-libui 0.0.19 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032f3de542f72c7bec706935b9e233b59a861fc88568fef5dd1b1b788137674c
-  data.tar.gz: 9791ad59faff6d21dd4fa59668d65266b5da1ffbfa49c0bd5cfaf900ee2a2c8c
+  metadata.gz: 6e29a14b4e8c65eaaa7ffa9d1ef5a7e1d13a592cf5d1090e850525b8d9188450
+  data.tar.gz: 37f077425a3627fddd8047a052fa55c43b8b907160ddb406a821757b544c5d97
 SHA512:
-  metadata.gz: 013d2d62c31f7738a06bd41aefcef7b7646a570148d7e6f413971df7f938cdb2781d050ae25143c56d8c77cc9b50537f783991415b5a5169dfab75741f9f4dd2
-  data.tar.gz: 8bd2666d00a15e966f3ea7e5c391cb88a1307249e9af63a576b2d6f29989c79a89b245bcc6fc9a36286f38aa2cc2b386586b4328eecb08b58a53119b347b8162
+  metadata.gz: 2447933bbdce2b03660b8d9c4eb13736b4989eb2632288951ad836b3bd25f0e8fa7075d976b42da1df8a2495540302dd18c02c162abb08ab5a9cd5fad4c1378d
+  data.tar.gz: f5018929934e70c3364f29ac124626ac1d9502e748e4b98ec1f44cdc5dae63e3baf7d856aa56dc50bb044e2909d040fff1c812ca66706bba4fa53fd92efdc97c

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 0.0.23
+
+- Have `image` not require `width` and `height` if it only has one `image_part` (defaults to `image_part` `width` and `height`)
+- Upgrade to LibUI version 0.0.10
+
+## 0.0.22
+
+- New examples/basic_table_button.rb
+- Support table `button_column`
+- Support table `button_column` `enabled` property
+- Support `on_clicked` listener for `button_column`
+- Support automatic table cell value reading management (table row deletion upon actual `cell_rows` deletion due to implicit data-binding)
+
+## 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

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.19
+# [<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.23
 ## 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.19](#-glimmer-dsl-for-libui-0019)
+- [Glimmer DSL for LibUI 0.0.23](#-glimmer-dsl-for-libui-0023)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -70,6 +70,11 @@ 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)
+    - [Basic Table Button](#basic-table-button)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -157,7 +162,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.19'
+gem 'glimmer-dsl-libui', '~> 0.0.23'
 ```
 
 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.
@@ -230,6 +235,7 @@ Control(Args) | Properties | Listeners
 `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`
@@ -245,8 +251,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)), `editable` as Boolean | 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`
@@ -311,9 +317,11 @@ 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.
+- Table `cell_rows` data has implicit data-binding to table cell values. When deleting data from `cell_rows` array, then actual rows from the `table` are automatically deleted.
 - `image` instances are automatically freed from memory after `window` is destroyed.
+- `image` `width` and `height` can be left off if it has one `image_part` only as they default to the same `width` and `height` of the `image_part`
 
 ### API Gotchas
 
@@ -1940,6 +1948,65 @@ window('Editable animal sounds', 300, 200) {
 }.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
 
@@ -2076,7 +2143,7 @@ IMAGE_ROWS = []
   data = canvas.to_rgba_stream
   width = canvas.width
   height = canvas.height
-  img = image(width, height) {
+  img = image {
     image_part(data, width, height, width * 4)
   }
   IMAGE_ROWS << [img] # array of one column cell
@@ -2099,6 +2166,142 @@ window('The Red Turtle', 310, 350, false) {
 }.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 {
+    image_part(data, width, height, width * 4)
+  }
+  text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 670, 350) {
+  horizontal_box {
+    table {
+      image_text_column('image/number')
+      image_text_column('image/number (editable)') {
+        editable true
+      }
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+}.show
+```
+
+### Basic Table Button
+
+[examples/basic_table_button.rb](examples/basic_table_button.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_button.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_button'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-button.png](images/glimmer-dsl-libui-mac-basic-table-button.png)
+![glimmer-dsl-libui-mac-basic-table-button-deleted.png](images/glimmer-dsl-libui-mac-basic-table-button-deleted.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-button.png](images/glimmer-dsl-libui-linux-basic-table-button.png)
+![glimmer-dsl-libui-linux-basic-table-button-deleted.png](images/glimmer-dsl-libui-linux-basic-table-button-deleted.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 delete],
+  %w[dog woof delete],
+  %w[chicken cock-a-doodle-doo delete],
+  %w[hourse neigh delete],
+  %w[cow moo delete]
+]
+
+window('Animal sounds', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+      button_column('Action') {
+        on_clicked do |row|
+          data.delete_at(row) # automatically deletes actual table row due to implicit data-binding
+        end
+      }
+
+      cell_rows data # implicit data-binding
+    }
+  }
+}.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.19
+0.0.23

data/examples/basic_table_button.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  %w[cat meow delete],
+  %w[dog woof delete],
+  %w[chicken cock-a-doodle-doo delete],
+  %w[hourse neigh delete],
+  %w[cow moo delete]
+]
+
+window('Animal sounds', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+      button_column('Action') {
+        on_clicked do |row|
+          data.delete_at(row) # automatically deletes actual table row due to implicit data-binding
+        end
+      }
+
+      cell_rows data # implicit data-binding
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/basic_table_image.rb

@@ -20,7 +20,7 @@ IMAGE_ROWS = []
   data = canvas.to_rgba_stream
   width = canvas.width
   height = canvas.height
-  img = image(width, height) {
+  img = image {
     image_part(data, width, height, width * 4)
   }
   IMAGE_ROWS << [img] # array of one column cell

data/examples/basic_table_image_text.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 = []
+
+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 {
+    image_part(data, width, height, width * 4)
+  }
+  text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 670, 350) {
+  horizontal_box {
+    table {
+      image_text_column('image/number')
+      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/lib/glimmer/dsl/libui/dsl.rb

@@ -35,10 +35,6 @@ module Glimmer
     module Libui
       Engine.add_dynamic_expressions(
         Libui,
-#           list_selection_data_binding
-#           data_binding
-#           block_attribute
-#           attribute
         %w[
           listener
           property

data/lib/glimmer/libui/button_column_proxy.rb

@@ -0,0 +1,67 @@
+# 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'
+require 'glimmer/libui/enableable_column'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI button column objects
+    #
+    # Follows the Proxy Design Pattern
+    class ButtonColumnProxy < ControlProxy
+      include Column
+      include EnableableColumn
+      
+      def on_clicked(&block)
+        # TODO consider generalizing into custom listeners and moving to ControlProxy
+        @on_clicked_procs ||= []
+        @on_clicked_procs << block
+      end
+      
+      def can_handle_listener?(listener_name)
+        listener_name == 'on_clicked' || super
+      end
+      
+      def handle_listener(listener_name, &listener)
+        case listener_name
+        when 'on_clicked'
+          on_clicked(&listener)
+        else
+          super
+        end
+      end
+      
+      def notify_listeners(listener_name, *args)
+        @on_clicked_procs&.each do |on_clicked_proc|
+          on_clicked_proc.call(*args)
+        end
+      end
+          
+      private
+      
+      def build_control
+        @parent_proxy.append_button_column(name, column_index, enabled_value)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/column.rb

@@ -19,15 +19,10 @@
 # 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
-      attr_reader :appended
-      alias appended? appended
-    
       def initialize(keyword, parent, args, &block)
         @keyword = keyword
         @parent_proxy = parent
@@ -41,14 +36,15 @@ module Glimmer
         @args.first
       end
       
-      private
-      
-      def build_control
-        @appended = true
+      # 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
       
-      def next_column_index
-        @parent_proxy.columns.map(&:appended?).compact.count
+      # actual index within table columns (disregarding nil fillings that account for DualColumn instances)
+      def index
+        @parent_proxy.columns.compact.index(self)
       end
     end
   end

data/lib/glimmer/libui/dual_column.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.
+
+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,44 @@
+# 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
+    module EditableColumn
+      def editable(value = nil)
+        if value.nil?
+          @editable = false if @editable.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/enableable_column.rb

@@ -0,0 +1,44 @@
+# 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
+    module EnableableColumn
+      def enabled(value = nil)
+        if value.nil?
+          @enabled = true if @enabled.nil?
+          @enabled
+        else
+          @enabled = !!value
+        end
+      end
+      alias enabled= enabled
+      alias set_enabled enabled
+      alias enabled? enabled
+
+      private
+      
+      def enabled_value
+        enabled? ? -2 : -1
+      end
+    end
+  end
+end

data/lib/glimmer/libui/image_column_proxy.rb

@@ -33,8 +33,7 @@ module Glimmer
       private
       
       def build_control
-        @parent_proxy.append_image_column(name, next_column_index)
-        super
+        @parent_proxy.append_image_column(name, column_index)
       end
     end
   end

data/lib/glimmer/libui/image_part_proxy.rb

@@ -27,6 +27,16 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ImagePartProxy < ControlProxy
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent
+        @args = args
+        @block = block
+        @enabled = true
+        @children = []
+        post_add_content if @block.nil?
+      end
+      
       private
       
       def build_control

data/lib/glimmer/libui/image_proxy.rb

@@ -0,0 +1,63 @@
+# 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/data_binding/observer'
+
+using ArrayIncludeMethods
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI image objects
+    #
+    # Follows the Proxy Design Pattern
+    class ImageProxy < ControlProxy
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent
+        @args = args
+        @block = block
+        @enabled = true
+        @children = []
+        post_add_content if @block.nil?
+      end
+      
+      def post_add_content
+        build_control
+        super
+      end
+ 
+      def post_initialize_child(child)
+        @children << child
+      end
+      
+      private
+      
+      def build_control
+        @args = [@children.first.args[1], @children.first.args[2]] if @children.size == 1 && (@args[0].nil? || @args[1].nil?)
+        super
+        @libui.tap do
+          @children.each {|child| child&.send(:build_control) }
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/image_text_column_proxy.rb

@@ -0,0 +1,44 @@
+# 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'
+require 'glimmer/libui/dual_column'
+require 'glimmer/libui/editable_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

@@ -20,6 +20,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/data_binding/observer'
+
+using ArrayIncludeMethods
 
 module Glimmer
   module LibUI
@@ -50,6 +53,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,13 +66,30 @@ module Glimmer
         if rows.nil?
           @cell_rows
         else
-          rows = rows.map {|row| row.map {|cell| cell.respond_to?(:libui) ? cell.libui : cell }}
           @cell_rows = rows
+          @cell_rows.tap do
+            @last_cell_rows = @cell_rows.clone
+            Glimmer::DataBinding::Observer.proc do
+              if (@cell_rows.size == @last_cell_rows.size - 1) && @last_cell_rows & @cell_rows == @cell_rows
+                _, row = @last_cell_rows.each_with_index.find do |row_data, row|
+                  !@cell_rows.include?(row_data)
+                end
+                ::LibUI.table_model_row_deleted(model, row)
+              end
+              @last_cell_rows = @cell_rows.clone
+            end.observe(self, :cell_rows)
+          end
         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
@@ -83,31 +105,42 @@ module Glimmer
       
       def build_control
         @model_handler = ::LibUI::FFI::TableModelHandler.malloc
-        @model_handler.NumColumns   = rbcallback(4) { @columns.count }
-        @model_handler.ColumnType   = rbcallback(4) do
-          # Note: this assumes all columns are the same type
-          # TODO support different values per different columns
-          case @columns.first
-          when TextColumnProxy
+        @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, ButtonColumnProxy, NilClass
             0
-          when ImageColumnProxy
+          when ImageColumnProxy, ImageTextColumnProxy
             1
+#           when CheckboxColumnProxy
+#             2
+#           when CheckboxTextColumnProxy
+#             2
+#           when ProgressBarColumnProxy
+#             2
           end
         end
         @model_handler.NumRows      = rbcallback(4) { cell_rows.count }
         @model_handler.CellValue    = rbcallback(1, [1, 1, 4, 4]) do |_, _, row, column|
+          the_cell_rows = expanded_cell_rows
           case @columns[column]
-          when TextColumnProxy
-            ::LibUI.new_table_value_string((@cell_rows[row] && @cell_rows[row][column]).to_s)
-          when ImageColumnProxy
-            ::LibUI.new_table_value_image((@cell_rows[row] && @cell_rows[row][column]))
+          when TextColumnProxy, ButtonColumnProxy, 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].respond_to?(:libui) ? expanded_cell_rows[row][column].libui : 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
+            column = @columns[column - 1].index
+            @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
+          when ButtonColumnProxy
+            @columns[column].notify_listeners(:on_clicked, row)
           end
         end
         
@@ -119,7 +152,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
       
@@ -133,6 +166,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

@@ -21,6 +21,7 @@
 
 require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/column'
+require 'glimmer/libui/editable_column'
 
 module Glimmer
   module LibUI
@@ -29,12 +30,12 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class TextColumnProxy < ControlProxy
       include Column
+      include EditableColumn
           
       private
       
       def build_control
-        @parent_proxy.append_text_column(name, next_column_index, @parent_proxy.editable? ? -2 : -1)
-        super
+        @parent_proxy.append_text_column(name, column_index, editable_value)
       end
     end
   end

data/lib/glimmer/libui/window_proxy.rb

@@ -61,20 +61,29 @@ module Glimmer
         end
       end
       
+      def can_handle_listener?(listener_name)
+        listener_name == 'on_destroy' || super
+      end
+      
       def handle_listener(listener_name, &listener)
-        if listener_name == 'on_closing'
-          default_behavior_listener = Proc.new do
-            return_value = listener.call(self)
-            if return_value.is_a?(Numeric)
-              return_value
-            else
-              destroy
-              ::LibUI.quit
-              0
+        case listener_name
+        when 'on_destroy'
+          on_destroy(&listener)
+        else
+          if listener_name == 'on_closing'
+            default_behavior_listener = Proc.new do
+              return_value = listener.call(self)
+              if return_value.is_a?(Numeric)
+                return_value
+              else
+                destroy
+                ::LibUI.quit
+                0
+              end
             end
           end
+          super(listener_name, &default_behavior_listener)
         end
-        super(listener_name, &default_behavior_listener)
       end
     
       private

data/lib/glimmer-dsl-libui.rb

@@ -27,6 +27,7 @@ require 'glimmer'
 # require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 # require 'super_module'
 require 'os'
+require 'array_include_methods'
 require 'libui'
 
 # Internal requires

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.23
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +177,7 @@ dependencies:
       - !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:
@@ -197,12 +197,15 @@ files:
 - examples/basic_button.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
+- examples/basic_table_button.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
@@ -222,6 +225,7 @@ files:
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/libui/about_menu_item_proxy.rb
 - lib/glimmer/libui/box.rb
+- lib/glimmer/libui/button_column_proxy.rb
 - lib/glimmer/libui/button_proxy.rb
 - lib/glimmer/libui/check_menu_item_proxy.rb
 - lib/glimmer/libui/checkbox_proxy.rb
@@ -231,7 +235,10 @@ files:
 - 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/enableable_column.rb
 - lib/glimmer/libui/font_button_proxy.rb
 - lib/glimmer/libui/form_proxy.rb
 - lib/glimmer/libui/grid_proxy.rb
@@ -239,6 +246,8 @@ files:
 - 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_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