glimmer-dsl-libui 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e2f34a434ea4036e788ae6fee9b2329220f53b002357c5447cdf6d2421959b
-  data.tar.gz: d38442e11122157bb2aa1db6a7881a3bc0e353c40842ccfdc823a357cdf9a16e
+  metadata.gz: c97e75e5d70341821d3b41fe832ae7efe1c70713ad673576a8498c4a3cd4ce70
+  data.tar.gz: 46fab85f1c845963a823a4e894987914dfbff128122db19b7ae4a82766f43044
 SHA512:
-  metadata.gz: c0c9657f2d68852873bdbf8a294816a2bc684e5ca902e8c9c1d43d43ed0e313850ef127176470b29df0c000a4fe65465cc58948c0cfcdc182eef569c978fd72a
-  data.tar.gz: b13df322764b9bd8e4fd2259992d2eff0abe2ed1f4e7e144deb8d15d56ddaccd6eaaa78fa40715eaff89dddbd201a4a9f2f6d77fd9ab8692cbf325043161510e
+  metadata.gz: 9aa8032624bfdca1b1dcdb399e16eb2246244f09d48cf476e20a35ce58b2d2b0e6bba34defb810a8265a1c838422fecffd09f568aabb797c7d5ba93c6ffed93d
+  data.tar.gz: 63206e935531bf431b417925fc4c569d685e6acbfc06e73d8231b7f53f60751bab0797ddfdd9580ca85d4cbc9d27e80b23b0bebccafa554ab988130e17478fe5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.2.8
+
+- Support `table` `on_changed` listener to report all changes (of operation type `:deleted`, `:changed`, `:inserted`)
+- Support `table` `on_edited` listener to report changes happening through direct table editing only
+- Default value of `text` `width` argument looks into x and adjusts by leaving the same space on the right side
+
 ## 0.2.7
 
 - New examples/basic_table_color.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.2.7
+# [<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.2.8
 ## 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)
@@ -197,7 +197,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.2.7](#-glimmer-dsl-for-libui-027)
+- [Glimmer DSL for LibUI 0.2.8](#-glimmer-dsl-for-libui-028)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -334,7 +334,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.2.7'
+gem 'glimmer-dsl-libui', '~> 0.2.8'
 ```
 
 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.
@@ -460,7 +460,7 @@ Control(Args) | Properties | Listeners
 `string` | `font`, `color`, `background`, `underline`, `underline_color`, `open_type_features` | None
 `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
+`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 | `on_changed {|row, type, row_data| ...}`, `on_edited {|row, row_data| ...}`
 `text(x = 0 as Numeric, y = 0 as Numeric, width = area_width as Numeric)` | `align`, `default_font` | None
 `text_column(name as String)` | `editable` (Boolean) | None
 `text_color_column(name as String)` | `editable` (Boolean) | None
@@ -2524,6 +2524,14 @@ window('Editable animal sounds', 300, 200) {
 
       cell_rows data
       editable true
+      
+      on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
+        puts "Row #{row} #{type}: #{row_data}"
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+      end
     }
   }
   
@@ -2882,6 +2890,10 @@ window('Animal sounds', 300, 200) {
       }
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show
@@ -3239,6 +3251,10 @@ window('Contacts', 600, 600) { |w|
       text_column('State')
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/examples/basic_table_button.rb

@@ -24,6 +24,10 @@ window('Animal sounds', 300, 200) {
       }
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show

data/examples/custom_draw_text.rb

@@ -69,7 +69,7 @@ class CustomDrawText
         }
         
         area {
-          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width] - 2*x)
             # align :left # default alignment
             
             @string = string {

data/examples/custom_draw_text2.rb

@@ -76,7 +76,7 @@ class CustomDrawText
         
         @area = area {
           on_draw do |area_draw_params|
-            text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width] - 2*x)
               # align :left # default alignment
                 
               string {

data/examples/editable_table.rb

@@ -20,6 +20,14 @@ window('Editable animal sounds', 300, 200) {
 
       cell_rows data
       editable true
+      
+      on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
+        puts "Row #{row} #{type}: #{row_data}"
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+      end
     }
   }
   

data/examples/form_table.rb

@@ -82,6 +82,10 @@ window('Contacts', 600, 600) { |w|
       text_column('State')
 
       cell_rows data # implicit data-binding
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
     }
   }
 }.show

data/lib/glimmer/libui/control_proxy/table_proxy.rb

@@ -35,6 +35,8 @@ module Glimmer
       class TableProxy < ControlProxy
         include Glimmer::FiddleConsumer
         
+        LISTENERS = ['on_changed', 'on_edited']
+        
         attr_reader :model_handler, :model, :table_params, :columns
       
         def initialize(keyword, parent, args, &block)
@@ -86,14 +88,19 @@ module Glimmer
                 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 |row|
                     ::LibUI.table_model_row_deleted(model, row)
+                    on_changed.each {|listener| listener.call(row, :deleted, @last_cell_rows[row])}
                   end
                 elsif @cell_rows.size > @last_cell_rows.size && @cell_rows.include_all?(*@last_cell_rows)
                   @cell_rows.array_diff_indexes(@last_cell_rows).each do |row|
                     ::LibUI.table_model_row_inserted(model, row)
+                    on_changed.each {|listener| listener.call(row, :inserted, @cell_rows[row])}
                   end
                 else
                   @cell_rows.each_with_index do |new_row_data, row|
-                    ::LibUI.table_model_row_changed(model, row) if new_row_data != @last_cell_rows[row]
+                    if new_row_data != @last_cell_rows[row]
+                      ::LibUI.table_model_row_changed(model, row)
+                      on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
+                    end
                   end
                 end
                 @last_cell_rows = @cell_rows.clone
@@ -175,6 +182,8 @@ module Glimmer
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
             end
+            on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
+            on_edited.each {|listener| listener.call(row, @cell_rows[row])}
           end
           
           @model = ::LibUI.new_table_model(@model_handler)

data/lib/glimmer/libui/control_proxy/text_proxy.rb

@@ -90,7 +90,7 @@ module Glimmer
         
         def width(value = nil)
           if value.nil?
-            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:area_width])
+            @width ||= args[2] || (AreaProxy.current_area_draw_params && (AreaProxy.current_area_draw_params[:area_width] - 2*x))
           else
             @width = value
             redraw

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Andy Maleh