glimmer-dsl-libui 0.0.22 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 974aa189dcfa34a3e96c581592d2acaa4fa1e14edeb784c3b80e47cf21b1f90d
-  data.tar.gz: 6bb99a56fe942706ec3a773cd90d0cfd88554fc03cb27465fb375538a56ac351
+  metadata.gz: 3a22a20e6928aba5a45b52a05d55c4b6fc8fe33ff4e39c71701e4f3675c8c118
+  data.tar.gz: 13549e3b443fcc717a8ebee91694568a868bb7f3a6a6028f063b063d79af2e79
 SHA512:
-  metadata.gz: '08fcb654b14c8bf9bdca6e1d3b28477cd8d1d389447d4162dabe7f8f743cd9ee68e033012e01feadc5e9ac92daeca0feb74c794d0323ad4c083dde1f0fc90125'
-  data.tar.gz: e215a320873a70904062254fd63c32296b917c661592983d89bd6fa940413a5e554b6aa42c8e637409d777c3e739c6e80d1fef8072d1c72b4f275fc8985b775e
+  metadata.gz: ce691f8f98fcae7063245d9a8cd14b61ed64f6207236a7b111de8a35c6e84225634faaf1968218567827b06cd2f4b1b20a664c013c85b1b761bcecd6fd87e095
+  data.tar.gz: 662d181cac9f3d86996b85d0aa8b725e99c154502867cdb8e1814dfc452956864772e31e6cac1127acf5966c29fd5aa017aea1cb4a3ad11c8331b7e42b49d756

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## 0.0.26
+
+- New examples/basic_table_progress_bar.rb
+- Support table `progress_bar_column`
+
+## 0.0.25
+
+- New examples/basic_table_checkbox_text.rb
+- Support table `checkbox_text_column`
+
+## 0.0.24
+
+- New examples/basic_table_checkbox.rb
+- Support table `checkbox_column`
+- Improve support for table row deletion upon actual `cell_rows` deletion by handling multiple-row deletion not just single-row deletion
+
+## 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

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.22
+# [<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.26
 ## 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.22](#-glimmer-dsl-for-libui-0022)
+- [Glimmer DSL for LibUI 0.0.26](#-glimmer-dsl-for-libui-0026)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -75,6 +75,9 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Basic Table Image](#basic-table-image)
     - [Basic Table Image Text](#basic-table-image-text)
     - [Basic Table Button](#basic-table-button)
+    - [Basic Table Checkbox](#basic-table-checkbox)
+    - [Basic Table Checkbox Text](#basic-table-checkbox-text)
+    - [Basic Table Progress Bar](#basic-table-progress-bar)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -162,7 +165,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.22'
+gem 'glimmer-dsl-libui', '~> 0.0.26'
 ```
 
 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.
@@ -219,7 +222,10 @@ Control(Args) | Properties | Listeners
 ------------- | ---------- | ---------
 `about_menu_item` | None | `on_clicked`
 `button(text as String)` | `text` (`String`) | `on_clicked`
+`button_column(name as String)` | `enabled` (Boolean) | None
 `checkbox(text as String)` | `checked` (Boolean), `text` (`String`) | `on_toggled`
+`checkbox_column(name as String)` | None | None
+`checkbox_text_column(name as String)` | `editable` (Boolean) | None
 `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`
@@ -245,6 +251,7 @@ Control(Args) | Properties | Listeners
 `non_wrapping_multiline_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
 `preferences_menu_item` | None | `on_clicked`
 `progress_bar` | `value` (`Numeric`) | None
+`progress_bar_column(name as String)` | None | None
 `quit_menu_item` | None | `on_clicked`
 `radio_buttons` | `selected` (`Integer`) | `on_selected`
 `slider(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
@@ -252,7 +259,7 @@ Control(Args) | Properties | Listeners
 `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
-`text_column(name as String)` | `editable` as Boolean | None
+`text_column(name as String)` | `editable` (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`
@@ -319,7 +326,9 @@ Control(Args) | Properties | Listeners
 - Smart defaults for `grid` child attributes are `left` (`0`), `top` (`0`), `xspan` (`1`), `yspan` (`1`), `hexpand` (`false`), `halign` (`0`), `vexpand` (`false`), and `valign` (`0`)
 - The `table` control automatically constructs required `TableModelHandler`, `TableModel`, and `TableParams`, calculating all their arguments from `cell_rows` and `editable` properties (e.g. `NumRows`) as well as nested columns (e.g. `text_column`)
 - Table model instances are automatically freed from memory after `window` is destroyed.
+- Table `cell_rows` data has implicit data-binding to table cell values. When deleting data from `cell_rows` array, then actual rows from the `table` are automatically deleted.
 - `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
 
@@ -1808,7 +1817,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[checken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 
@@ -1866,7 +1875,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[chicken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 
@@ -1925,7 +1934,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[chicken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 
@@ -1983,7 +1992,7 @@ data = [
   %w[cat calm meow],
   %w[dog loyal woof],
   %w[chicken bird cock-a-doodle-doo],
-  %w[hourse fast neigh],
+  %w[horse fast neigh],
   %w[cow slow moo]
 ]
 
@@ -2141,7 +2150,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
@@ -2219,23 +2228,19 @@ 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)
   }
   text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
-  IMAGE_ROWS << [[img, text], text, text, [img, text]]
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
 rescue StandardError => e
   warn url, e.message
 end
 
-window('The Red Turtle', 900, 350) {
+window('The Red Turtle', 670, 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
       }
@@ -2283,7 +2288,7 @@ data = [
   %w[cat meow delete],
   %w[dog woof delete],
   %w[chicken cock-a-doodle-doo delete],
-  %w[hourse neigh delete],
+  %w[horse neigh delete],
   %w[cow moo delete]
 ]
 
@@ -2304,6 +2309,161 @@ window('Animal sounds', 300, 200) {
 }.show
 ```
 
+### Basic Table Checkbox
+
+[examples/basic_table_checkbox.rb](examples/basic_table_checkbox.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_checkbox.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_checkbox'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-checkbox.png](images/glimmer-dsl-libui-mac-basic-table-checkbox.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-checkbox.png](images/glimmer-dsl-libui-linux-basic-table-checkbox.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['cat', 'meow', true],
+  ['dog', 'woof', true],
+  ['chicken', 'cock-a-doodle-doo', false],
+  ['horse', 'neigh', true],
+  ['cow', 'moo', true]
+]
+
+window('Animal sounds', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+      checkbox_column('Mammal')
+
+      cell_rows data
+    }
+  }
+}.show
+```
+
+### Basic Table Checkbox Text
+
+[examples/basic_table_checkbox_text.rb](examples/basic_table_checkbox_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_checkbox_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_checkbox_text'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-checkbox-text.png](images/glimmer-dsl-libui-mac-basic-table-checkbox-text.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-checkbox-text.png](images/glimmer-dsl-libui-linux-basic-table-checkbox-text.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['cat', 'meow', [true, 'mammal']],
+  ['dog', 'woof', [true, 'mammal']],
+  ['chicken', 'cock-a-doodle-doo', [false, 'mammal']],
+  ['horse', 'neigh', [true, 'mammal']],
+  ['cow', 'moo', [true, 'mammal']]
+]
+
+window('Animal sounds', 400, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Sound')
+      checkbox_text_column('Description')
+
+      cell_rows data
+    }
+  }
+}.show
+```
+
+### Basic Table Progress Bar
+
+[examples/basic_table_progress_bar.rb](examples/basic_table_progress_bar.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/basic_table_progress_bar.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/basic_table_progress_bar'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-table-progress-bar.png](images/glimmer-dsl-libui-mac-basic-table-progress-bar.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-table-progress-bar.png](images/glimmer-dsl-libui-linux-basic-table-progress-bar.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['task 1', 0],
+  ['task 2', 15],
+  ['task 3', 100],
+  ['task 4', 75],
+  ['task 5', -1],
+]
+
+window('Task progress', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Task')
+      progress_bar_column('Progress')
+
+      cell_rows data
+    }
+  }
+}.show
+```
+
 ## Contributing to glimmer-dsl-libui
 
 -   Check out the latest master to make sure the feature hasn't been

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.26

data/examples/basic_table.rb

@@ -8,7 +8,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[chicken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 

data/examples/basic_table_button.rb

@@ -8,7 +8,7 @@ data = [
   %w[cat meow delete],
   %w[dog woof delete],
   %w[chicken cock-a-doodle-doo delete],
-  %w[hourse neigh delete],
+  %w[horse neigh delete],
   %w[cow moo delete]
 ]
 
@@ -26,8 +26,4 @@ window('Animal sounds', 300, 200) {
       cell_rows data # implicit data-binding
     }
   }
-  
-  on_closing do
-    puts 'Bye Bye'
-  end
 }.show

data/examples/basic_table_checkbox.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['cat', 'meow', true],
+  ['dog', 'woof', true],
+  ['chicken', 'cock-a-doodle-doo', false],
+  ['horse', 'neigh', true],
+  ['cow', 'moo', true]
+]
+
+window('Animal sounds', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Description')
+      checkbox_column('Mammal')
+
+      cell_rows data
+    }
+  }
+}.show

data/examples/basic_table_checkbox_text.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['cat', 'meow', [true, 'mammal']],
+  ['dog', 'woof', [true, 'mammal']],
+  ['chicken', 'cock-a-doodle-doo', [false, 'mammal']],
+  ['horse', 'neigh', [true, 'mammal']],
+  ['cow', 'moo', [true, 'mammal']]
+]
+
+window('Animal sounds', 400, 200) {
+  horizontal_box {
+    table {
+      text_column('Animal')
+      text_column('Sound')
+      checkbox_text_column('Description') {
+        editable true
+      }
+
+      cell_rows data
+    }
+  }
+}.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

@@ -20,23 +20,19 @@ 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)
   }
   text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
-  IMAGE_ROWS << [[img, text], text, text, [img, text]]
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
 rescue StandardError => e
   warn url, e.message
 end
 
-window('The Red Turtle', 900, 350) {
+window('The Red Turtle', 670, 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
       }

data/examples/basic_table_progress_bar.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['task 1', 0],
+  ['task 2', 15],
+  ['task 3', 100],
+  ['task 4', 75],
+  ['task 5', -1],
+]
+
+window('Task progress', 300, 200) {
+  horizontal_box {
+    table {
+      text_column('Task')
+      progress_bar_column('Progress')
+
+      cell_rows data
+    }
+  }
+}.show

data/examples/editable_column_table.rb

@@ -8,7 +8,7 @@ data = [
   %w[cat calm meow],
   %w[dog loyal woof],
   %w[chicken bird cock-a-doodle-doo],
-  %w[hourse fast neigh],
+  %w[horse fast neigh],
   %w[cow slow moo]
 ]
 

data/examples/editable_table.rb

@@ -8,7 +8,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[chicken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 

data/lib/glimmer/libui/checkbox_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'
+require 'glimmer/libui/editable_column'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI checkbox column objects
+    #
+    # Follows the Proxy Design Pattern
+    class CheckboxColumnProxy < ControlProxy
+      include Column
+#       include EditableColumn # TODO enable this once checkbox column becomes editable on macosx in C libui (currently has a bug)
+      
+      private
+      
+      def build_control
+        @parent_proxy.append_checkbox_column(name, column_index, -1)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/checkbox_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 checkbox text column objects
+    #
+    # Follows the Proxy Design Pattern
+    class CheckboxTextColumnProxy < ControlProxy
+      include Column
+      include DualColumn
+      include EditableColumn # TODO split into editable_checkbox and editable_text properties in the future given that checkbox and text can be edited separately
+      
+      private
+      
+      def build_control
+        @parent_proxy.append_checkbox_text_column(name, column_index, -1, second_column_index, editable_value)
+      end
+    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/progress_bar_column_proxy.rb

@@ -0,0 +1,40 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/column'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI progress bar column objects
+    #
+    # Follows the Proxy Design Pattern
+    class ProgressBarColumnProxy < ControlProxy
+      include Column
+          
+      private
+      
+      def build_control
+        @parent_proxy.append_progress_bar_column(name, column_index)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/table_proxy.rb

@@ -70,11 +70,10 @@ module Glimmer
           @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)
+              if @cell_rows.size < @last_cell_rows.size && @last_cell_rows.include_all?(*@cell_rows)
+                @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |index|
+                  ::LibUI.table_model_row_deleted(model, index)
                 end
-                ::LibUI.table_model_row_deleted(model, row)
               end
               @last_cell_rows = @cell_rows.clone
             end.observe(self, :cell_rows)
@@ -112,12 +111,8 @@ module Glimmer
             0
           when ImageColumnProxy, ImageTextColumnProxy
             1
-#           when CheckboxColumnProxy
-#             2
-#           when CheckboxTextColumnProxy
-#             2
-#           when ProgressBarColumnProxy
-#             2
+          when CheckboxColumnProxy, CheckboxTextColumnProxy, ProgressBarColumnProxy
+            2
           end
         end
         @model_handler.NumRows      = rbcallback(4) { cell_rows.count }
@@ -128,6 +123,10 @@ module Glimmer
             ::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])))
+          when CheckboxColumnProxy, CheckboxTextColumnProxy
+            ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column] == 1 || expanded_cell_rows[row][column].to_s.strip.downcase == 'true' ? 1 : 0)))
+          when ProgressBarColumnProxy
+            ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column].to_i)))
           end
         end
         @model_handler.SetCellValue = rbcallback(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
@@ -141,6 +140,10 @@ module Glimmer
             @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
           when ButtonColumnProxy
             @columns[column].notify_listeners(:on_clicked, row)
+          when CheckboxColumnProxy, CheckboxTextColumnProxy
+            column = @columns[column].index
+            @cell_rows[row] ||= []
+            @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
           end
         end
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.26
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-09-27 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.4
+        version: 2.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
 - !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
@@ -198,8 +198,11 @@ files:
 - examples/basic_entry.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
+- examples/basic_table_checkbox.rb
+- examples/basic_table_checkbox_text.rb
 - examples/basic_table_image.rb
 - examples/basic_table_image_text.rb
+- examples/basic_table_progress_bar.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
@@ -228,7 +231,9 @@ files:
 - 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_column_proxy.rb
 - lib/glimmer/libui/checkbox_proxy.rb
+- lib/glimmer/libui/checkbox_text_column_proxy.rb
 - lib/glimmer/libui/color_button_proxy.rb
 - lib/glimmer/libui/column.rb
 - lib/glimmer/libui/combobox_proxy.rb
@@ -246,6 +251,7 @@ 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
@@ -253,6 +259,7 @@ files:
 - lib/glimmer/libui/multiline_entry_proxy.rb
 - lib/glimmer/libui/non_wrapping_multiline_entry_proxy.rb
 - lib/glimmer/libui/preferences_menu_item_proxy.rb
+- lib/glimmer/libui/progress_bar_column_proxy.rb
 - lib/glimmer/libui/quit_menu_item_proxy.rb
 - lib/glimmer/libui/radio_buttons_proxy.rb
 - lib/glimmer/libui/separator_menu_item_proxy.rb