glimmer-dsl-libui 0.0.27 → 0.1.2

data/lib/glimmer/libui/table_proxy.rb

@@ -21,6 +21,7 @@
 
 require 'glimmer/libui/control_proxy'
 require 'glimmer/data_binding/observer'
+require 'glimmer/fiddle_consumer'
 
 using ArrayIncludeMethods
 
@@ -30,6 +31,8 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TableProxy < ControlProxy
+      include Glimmer::FiddleConsumer
+      
       attr_reader :model_handler, :model, :table_params, :columns
     
       def initialize(keyword, parent, args, &block)
@@ -71,12 +74,16 @@ module Glimmer
             @last_cell_rows = @cell_rows.clone
             Glimmer::DataBinding::Observer.proc do
               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)
+                @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |row|
+                  ::LibUI.table_model_row_deleted(model, 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 |index|
-                  ::LibUI.table_model_row_inserted(model, index)
+                @cell_rows.array_diff_indexes(@last_cell_rows).each do |row|
+                  ::LibUI.table_model_row_inserted(model, 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]
                 end
               end
               @last_cell_rows = @cell_rows.clone
@@ -108,8 +115,8 @@ module Glimmer
       
       def build_control
         @model_handler = ::LibUI::FFI::TableModelHandler.malloc
-        @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|
+        @model_handler.NumColumns   = fiddle_closure_block_caller(4) { @columns.map {|c| c.is_a?(DualColumn) ? 2 : 1}.sum }
+        @model_handler.ColumnType   = fiddle_closure_block_caller(4, [1, 1, 4]) do |_, _, column|
           case @columns[column]
           when TextColumnProxy, ButtonColumnProxy, NilClass
             0
@@ -119,8 +126,8 @@ module Glimmer
             2
           end
         end
-        @model_handler.NumRows      = rbcallback(4) { cell_rows.count }
-        @model_handler.CellValue    = rbcallback(1, [1, 1, 4, 4]) do |_, _, row, column|
+        @model_handler.NumRows      = fiddle_closure_block_caller(4) { cell_rows.count }
+        @model_handler.CellValue    = fiddle_closure_block_caller(1, [1, 1, 4, 4]) do |_, _, row, column|
           the_cell_rows = expanded_cell_rows
           case @columns[column]
           when TextColumnProxy, ButtonColumnProxy, NilClass
@@ -133,7 +140,7 @@ module Glimmer
             ::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|
+        @model_handler.SetCellValue = fiddle_closure_block_caller(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
           case @columns[column]
           when TextColumnProxy
             column = @columns[column].index
@@ -163,16 +170,6 @@ module Glimmer
         end
       end
       
-      def rbcallback(*args, &block)
-        # TODO consider moving to a more general reusable location in the future (e.g. when used with `AreaProxy`)
-        # Protects BlockCaller objects from garbage collection.
-        @blockcaller ||= []
-        args << [0] if args.size == 1 # Argument types are ommited
-        blockcaller = Fiddle::Closure::BlockCaller.new(*args, &block)
-        @blockcaller << blockcaller
-        blockcaller
-      end
-      
       def next_column_index
         @next_column_index ||= -1
         @next_column_index += 1

data/lib/glimmer/libui/window_proxy.rb

@@ -48,8 +48,14 @@ module Glimmer
       end
       
       def on_destroy(&block)
+        # TODO look into a way to generalize this logic for multiple listeners
         @on_destroy_procs ||= []
-        @on_destroy_procs << block
+        if block.nil?
+          @on_destroy_procs
+        else
+          @on_destroy_procs << block
+          block
+        end
       end
     
       def show

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.1.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-28 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.5
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +194,8 @@ files:
 - VERSION
 - bin/girb
 - bin/girb_runner.rb
+- examples/basic_area.rb
+- examples/basic_area2.rb
 - examples/basic_button.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
@@ -208,6 +210,8 @@ files:
 - examples/color_button.rb
 - examples/control_gallery.rb
 - examples/date_time_picker.rb
+- examples/dynamic_area.rb
+- examples/dynamic_area2.rb
 - examples/editable_column_table.rb
 - examples/editable_table.rb
 - examples/font_button.rb
@@ -227,7 +231,9 @@ files:
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
 - lib/glimmer/dsl/libui/tab_item_expression.rb
+- lib/glimmer/fiddle_consumer.rb
 - lib/glimmer/libui/about_menu_item_proxy.rb
+- lib/glimmer/libui/area_proxy.rb
 - lib/glimmer/libui/box.rb
 - lib/glimmer/libui/button_column_proxy.rb
 - lib/glimmer/libui/button_proxy.rb
@@ -259,10 +265,12 @@ files:
 - lib/glimmer/libui/menu_proxy.rb
 - lib/glimmer/libui/multiline_entry_proxy.rb
 - lib/glimmer/libui/non_wrapping_multiline_entry_proxy.rb
+- lib/glimmer/libui/path_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/rectangle_proxy.rb
 - lib/glimmer/libui/separator_menu_item_proxy.rb
 - lib/glimmer/libui/tab_item_proxy.rb
 - lib/glimmer/libui/table_proxy.rb