glimmer-dsl-libui 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e29a14b4e8c65eaaa7ffa9d1ef5a7e1d13a592cf5d1090e850525b8d9188450
-  data.tar.gz: 37f077425a3627fddd8047a052fa55c43b8b907160ddb406a821757b544c5d97
+  metadata.gz: 48620214d8ee4d8658822fd623fbc35cacca3a65fdb9b50b9c0e594f37bce0ad
+  data.tar.gz: 595c65cc0ec5c8f94eea6b2aa542cd3f55870d537d3de4fa230b237e58a13835
 SHA512:
-  metadata.gz: 2447933bbdce2b03660b8d9c4eb13736b4989eb2632288951ad836b3bd25f0e8fa7075d976b42da1df8a2495540302dd18c02c162abb08ab5a9cd5fad4c1378d
-  data.tar.gz: f5018929934e70c3364f29ac124626ac1d9502e748e4b98ec1f44cdc5dae63e3baf7d856aa56dc50bb044e2909d040fff1c812ca66706bba4fa53fd92efdc97c
+  metadata.gz: 52bfdf8599bc77a418a96a3ed4e3e072c06c328a9597325d66b21419cfde80ade7475f3744870ad0413383d72154db9caea0158e5a2f82e2e7446f231b1eb800
+  data.tar.gz: b8f10cae326f757cf6fdbff6085db5d9302696109158046c19cca0d57aaad63f9d28e30509155e69fa3d26bcc48541e3276e04d21c27969425663177da32a3a5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 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`)

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.23
+# [<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.24
 ## 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.23](#-glimmer-dsl-for-libui-0023)
+- [Glimmer DSL for LibUI 0.0.24](#-glimmer-dsl-for-libui-0024)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -75,6 +75,7 @@ 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)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -162,7 +163,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.23'
+gem 'glimmer-dsl-libui', '~> 0.0.24'
 ```
 
 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 +220,9 @@ 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
 `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`
@@ -1810,7 +1813,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[checken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 
@@ -1868,7 +1871,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[chicken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 
@@ -1927,7 +1930,7 @@ data = [
   %w[cat meow],
   %w[dog woof],
   %w[chicken cock-a-doodle-doo],
-  %w[hourse neigh],
+  %w[horse neigh],
   %w[cow moo]
 ]
 
@@ -1985,7 +1988,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]
 ]
 
@@ -2281,7 +2284,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]
 ]
 
@@ -2302,6 +2305,58 @@ 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
+```
+
 ## Contributing to glimmer-dsl-libui
 
 -   Check out the latest master to make sure the feature hasn't been

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

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/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/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,8 +111,8 @@ module Glimmer
             0
           when ImageColumnProxy, ImageTextColumnProxy
             1
-#           when CheckboxColumnProxy
-#             2
+          when CheckboxColumnProxy
+            2
 #           when CheckboxTextColumnProxy
 #             2
 #           when ProgressBarColumnProxy
@@ -128,6 +127,8 @@ 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
+            ::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)))
           end
         end
         @model_handler.SetCellValue = rbcallback(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
@@ -141,6 +142,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
+            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.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-26 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
@@ -198,6 +198,7 @@ files:
 - examples/basic_entry.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
+- examples/basic_table_checkbox.rb
 - examples/basic_table_image.rb
 - examples/basic_table_image_text.rb
 - examples/basic_window.rb
@@ -228,6 +229,7 @@ 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/color_button_proxy.rb
 - lib/glimmer/libui/column.rb