glimmer-dsl-libui 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc7805628b0893f2d955c437f8e46932acfbac8db7576cdd28021b12cfe8d942
-  data.tar.gz: 4915a6b72d733ca9d4ba7fedf08abc66377bf9a9cd6eca288f1b1a60556951f2
+  metadata.gz: 032f3de542f72c7bec706935b9e233b59a861fc88568fef5dd1b1b788137674c
+  data.tar.gz: 9791ad59faff6d21dd4fa59668d65266b5da1ffbfa49c0bd5cfaf900ee2a2c8c
 SHA512:
-  metadata.gz: ef4ac023c7fcb8638a335fd4cf28db03b8d784cb27f63b3edb411c05c5395740d7eb0593f9716657a516314bd6d1effd581abfdbb07de6c1a18225d037344472
-  data.tar.gz: 2ee4dab775fd3ae4235b924f37879d84a61dffce138b0b25cd495464931ae20efc5f45ed34d4c6f9767dc2fc15bbb30eafb70fe37efa56de0d8505ea144be010
+  metadata.gz: 013d2d62c31f7738a06bd41aefcef7b7646a570148d7e6f413971df7f938cdb2781d050ae25143c56d8c77cc9b50537f783991415b5a5169dfab75741f9f4dd2
+  data.tar.gz: 8bd2666d00a15e966f3ea7e5c391cb88a1307249e9af63a576b2d6f29989c79a89b245bcc6fc9a36286f38aa2cc2b386586b4328eecb08b58a53119b347b8162

data/CHANGELOG.md

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

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.18
+# [<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
 ## 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.18](#-glimmer-dsl-for-libui-0018)
+- [Glimmer DSL for LibUI 0.0.19](#-glimmer-dsl-for-libui-0019)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -157,7 +157,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.18'
+gem 'glimmer-dsl-libui', '~> 0.0.19'
 ```
 
 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.
@@ -245,7 +245,7 @@ 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
+`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
 `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
@@ -1880,6 +1880,67 @@ 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
+```
+
+
 ### Basic Table Image
 
 This example has a prerequisite of installing `chunky_png` Ruby gem:
@@ -2030,8 +2091,8 @@ window('The Red Turtle', 310, 350, false) {
       
       cell_rows IMAGE_ROWS
     }
-    
   }
+    
   on_closing do
     puts 'Bye Bye'
   end

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/examples/basic_table_image.rb

@@ -35,8 +35,8 @@ window('The Red Turtle', 310, 350, false) {
       
       cell_rows IMAGE_ROWS
     }
-    
   }
+  
   on_closing do
     puts 'Bye Bye'
   end

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/column.rb

@@ -25,6 +25,9 @@ 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
@@ -37,6 +40,16 @@ module Glimmer
       def name
         @args.first
       end
+      
+      private
+      
+      def build_control
+        @appended = true
+      end
+      
+      def next_column_index
+        @parent_proxy.columns.map(&:appended?).compact.count
+      end
     end
   end
 end

data/lib/glimmer/libui/image_column_proxy.rb

@@ -33,7 +33,8 @@ module Glimmer
       private
       
       def build_control
-        @libui = @parent_proxy.append_image_column(name, @parent_proxy.columns.map(&:libui).compact.count)
+        @parent_proxy.append_image_column(name, next_column_index)
+        super
       end
     end
   end

data/lib/glimmer/libui/table_proxy.rb

@@ -68,13 +68,25 @@ module Glimmer
       alias cell_rows= cell_rows
       alias set_cell_rows cell_rows
       
+      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) do
-          # TODO support different values for different columns
+          # Note: this assumes all columns are the same type
+          # TODO support different values per different columns
           case @columns.first
           when TextColumnProxy
             0
@@ -91,6 +103,13 @@ module Glimmer
             ::LibUI.new_table_value_image((@cell_rows[row] && @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
+            @cell_rows[row] ||= []
+            @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
+          end
+        end
         
         @model = ::LibUI.new_table_model(@model_handler)
         

data/lib/glimmer/libui/text_column_proxy.rb

@@ -29,11 +29,12 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class TextColumnProxy < ControlProxy
       include Column
-    
+          
       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, next_column_index, @parent_proxy.editable? ? -2 : -1)
+        super
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Andy Maleh
@@ -203,6 +203,7 @@ files:
 - examples/color_button.rb
 - examples/control_gallery.rb
 - examples/date_time_picker.rb
+- examples/editable_table.rb
 - examples/font_button.rb
 - examples/form.rb
 - examples/grid.rb