glimmer-dsl-libui 0.4.15 → 0.4.19

data/lib/glimmer/dsl/libui/observe_expression.rb

@@ -25,7 +25,7 @@ require 'glimmer/dsl/observe_expression'
 
 module Glimmer
   module DSL
-    module SWT
+    module Libui
       class ObserveExpression < StaticExpression
         include TopLevelExpression
         include Glimmer::DSL::ObserveExpression

data/lib/glimmer/dsl/libui/operation_expression.rb

@@ -0,0 +1,47 @@
+# 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/dsl/expression'
+require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/shape'
+require 'glimmer/libui/attributed_string'
+
+module Glimmer
+  module DSL
+    module Libui
+      class OperationExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          (
+            parent.is_a?(Glimmer::LibUI::ControlProxy) or
+              parent.is_a?(Glimmer::LibUI::Shape) or
+              parent.is_a?(Glimmer::LibUI::AttributedString)
+          ) and
+            block.nil? and
+            parent.respond_to?(keyword, *args)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          parent.send(keyword, *args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/libui/property_expression.rb

@@ -35,11 +35,11 @@ module Glimmer
               parent.is_a?(Glimmer::LibUI::AttributedString)
           ) and
             block.nil? and
-            parent.respond_to?(keyword, *args)
+            parent.respond_to?("#{keyword}=", *args)
         end
   
         def interpret(parent, keyword, *args, &block)
-          parent.send(keyword, *args)
+          parent.send("#{keyword}=", *args)
         end
       end
     end

data/lib/glimmer/libui/control_proxy/column/background_color_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class BackgroundColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              :white
+            end
+          end
+          
           include Column
           
           def name

data/lib/glimmer/libui/control_proxy/column/button_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ButtonColumnProxy < ControlProxy
+          class << self
+            def default_value
+              ''
+            end
+          end
+          
           include Column
           include EnableableColumn
           

data/lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxColumnProxy < ControlProxy
+          class << self
+            def default_value
+              false
+            end
+          end
+          
           include Column
           include EditableColumn
           

data/lib/glimmer/libui/control_proxy/column/checkbox_text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxTextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [false, '', :black]
+            end
+          end
+          
           include Column
           include TripleColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxTextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [false, '']
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/image_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageColumnProxy < ControlProxy
+          class << self
+            def default_value
+              Glimmer::LibUI::ICON
+            end
+          end
+          
           include Column
         
           private

data/lib/glimmer/libui/control_proxy/column/image_text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageTextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [Glimmer::LibUI::ICON, '', :black]
+            end
+          end
+          
           include Column
           include TripleColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageTextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [Glimmer::LibUI::ICON, '']
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/progress_bar_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ProgressBarColumnProxy < ControlProxy
+          class << self
+            def default_value
+              0
+            end
+          end
+          
           include Column
               
           private

data/lib/glimmer/libui/control_proxy/column/text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class TextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              ['', :black]
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/text_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class TextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              ''
+            end
+          end
+          
           include Column
           include EditableColumn
               

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

@@ -24,6 +24,13 @@ module Glimmer
     class ControlProxy
       # Common logic for all column proxy objects
       module Column
+        class << self
+          # subclasses may override to provide a valid default value like a blank image for image columns and false for checkbox
+          def default_value
+            nil
+          end
+        end
+
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
           @parent_proxy = parent

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

@@ -52,6 +52,7 @@ module Glimmer
         
         include Parent
         prepend Transformable
+        include Equalizer.new(:options, :data)
         
         attr_reader :data, :pixels, :shapes, :options
         

data/lib/glimmer/libui/control_proxy/menu_item_proxy/quit_menu_item_proxy.rb

@@ -46,7 +46,6 @@ module Glimmer
                 if return_value.is_a?(Numeric)
                   return_value
                 else
-                  destroy
                   ControlProxy.main_window_proxy&.destroy
                   ::LibUI.quit
                   0

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

@@ -70,7 +70,8 @@ module Glimmer
           else
             new_color = Glimmer::LibUI.interpret_color(args)
             if new_color != @fill
-              @fill_observer&.unobserve(@fill) if @fill
+              # TODO consider replacing unobserve with observer_registration.deregister
+              @fill_observer&.unobserve(@fill, attribute_writer_type: [:attribute=, :set_attribute]) if @fill
               @fill = new_color
               request_auto_redraw
             end
@@ -79,7 +80,7 @@ module Glimmer
             @fill_observer ||= Glimmer::DataBinding::Observer.proc do
               request_auto_redraw
             end
-            @fill_observer.observe(@fill)
+            @fill_observer.observe(@fill, attribute_writer_type: [:attribute=, :set_attribute])
           end
         end
         alias fill= fill
@@ -98,7 +99,8 @@ module Glimmer
           else
             new_color = Glimmer::LibUI.interpret_color(args)
             if new_color != @stroke
-              @stroke_observer&.unobserve(@stroke) if @stroke
+              # TODO consider replacing unobserve with observer_registration.deregister
+              @stroke_observer&.unobserve(@stroke, attribute_writer_type: [:attribute=, :set_attribute]) if @stroke
               @stroke = Glimmer::LibUI.interpret_color(args)
               request_auto_redraw
             end
@@ -107,7 +109,7 @@ module Glimmer
             @stroke_observer ||= Glimmer::DataBinding::Observer.proc do
               request_auto_redraw
             end
-            @stroke_observer.observe(@stroke)
+            @stroke_observer.observe(@stroke, attribute_writer_type: [:attribute=, :set_attribute])
           end
         end
         alias stroke= stroke

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

@@ -48,6 +48,8 @@ module Glimmer
           @enabled = true
           @columns = []
           @cell_rows = []
+          @last_cell_rows = []
+          register_cell_rows_observer
           window_proxy.on_destroy do
             # the following unless condition is an exceptional condition stumbled upon that fails freeing the table model
             ::LibUI.free_table_model(@model) unless @destroyed && parent_proxy.is_a?(Box)
@@ -75,7 +77,8 @@ module Glimmer
         
         def destroy
           super
-          @cell_rows_observer&.unobserve(self, :cell_rows, recursive: true)
+          # TODO consider replacing unobserve with observer_registration.deregister
+          @cell_rows_observer&.unobserve(self, :cell_rows, recursive: true, ignore_frozen: true, attribute_writer_type: [:attribute=, :set_attribute])
           @destroyed = true
         end
         
@@ -86,31 +89,6 @@ module Glimmer
             if rows != @cell_rows
               @cell_rows = rows
               @cell_rows = @cell_rows.to_a if @cell_rows.is_a?(Enumerator)
-              @last_cell_rows ||= array_deep_clone(@cell_rows)
-              @cell_rows_observer ||= Glimmer::DataBinding::Observer.proc do |new_cell_rows|
-                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)
-                    notify_custom_listeners('on_changed', 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)
-                    notify_custom_listeners('on_changed', row, :inserted, @cell_rows[row])
-                  end
-                else
-                  @cell_rows.each_with_index do |new_row_data, row|
-                    if new_row_data != @last_cell_rows[row]
-                      ::LibUI.table_model_row_changed(model, row)
-                      notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
-                    end
-                  end
-                end
-                @last_last_cell_rows = array_deep_clone(@last_cell_rows)
-                @last_cell_rows = array_deep_clone(@cell_rows)
-              end.tap do |cell_rows_observer|
-                cell_rows_observer.observe(self, :cell_rows, recursive: true)
-              end
             end
             @cell_rows
           end
@@ -153,13 +131,13 @@ module Glimmer
             new_value = new_value.to_a if new_value.is_a?(Enumerator)
             if model_binding.binding_options[:column_attributes] || (!new_value.empty? && !new_value.first.is_a?(Array))
               @model_attribute_array_observer_registration&.deregister
-              @model_attribute_array_observer_registration = model_attribute_observer.observe(new_value, @column_attributes)
+              @model_attribute_array_observer_registration = model_attribute_observer.observe(new_value, @column_attributes, ignore_frozen: true, attribute_writer_type: [:attribute=, :set_attribute])
               model_attribute_observer.add_dependent(model_attribute_observer_registration => @model_attribute_array_observer_registration)
             end
             # TODO look if multiple notifications are happening as a result of observing array and observing model binding
             send("#{property}=", new_value) unless @last_cell_rows == new_value
           end
-          model_attribute_observer_registration = model_attribute_observer.observe(model_binding)
+          model_attribute_observer_registration = model_attribute_observer.observe(model_binding, attribute_writer_type: [:attribute=, :set_attribute])
           model_attribute_observer.call # initial update
           data_binding_model_attribute_observer_registrations << model_attribute_observer_registration
           model_attribute_observer
@@ -208,9 +186,11 @@ module Glimmer
             when Column::TextColumnProxy, Column::ButtonColumnProxy, Column::TextColorColumnProxy, :text
               ::LibUI.new_table_value_string((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_s)
             when Column::ImageColumnProxy, Column::ImageTextColumnProxy, Column::ImageTextColorColumnProxy
-              # TODO refactor to eliminate redundancy and share similar code
-              row = row - 1 if OS.windows? && row == cell_rows.count
-              img = expanded_cell_rows[row][column]
+              if OS.windows? && row == cell_rows.count
+                img = Glimmer::LibUI::ICON
+              else
+                img = expanded_cell_rows[row][column]
+              end
               img = ControlProxy::ImageProxy.create('image', nil, img) if img.is_a?(Array)
               img = ControlProxy::ImageProxy.create('image', nil, [img]) if img.is_a?(String)
               img = img.respond_to?(:libui) ? img.libui : img
@@ -308,12 +288,57 @@ module Glimmer
           @libui.tap do
             @columns.each {|column| column.respond_to?(:build_control, true) && column.send(:build_control) }
           end
+
+          if !@applied_windows_fix && OS.windows?
+            @applied_windows_fix = true
+            apply_windows_fix
+          end
         end
         
         def next_column_index
           @next_column_index ||= -1
           @next_column_index += 1
         end
+        
+        def register_cell_rows_observer
+          @cell_rows_observer = Glimmer::DataBinding::Observer.proc do |new_cell_rows|
+            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) if model && row
+                notify_custom_listeners('on_changed', 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) if model && row
+                notify_custom_listeners('on_changed', row, :inserted, @cell_rows[row])
+              end
+            else
+              @cell_rows.each_with_index do |new_row_data, row|
+                if new_row_data != @last_cell_rows[row]
+                  ::LibUI.table_model_row_changed(model, row) if model && row
+                  notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
+                end
+              end
+            end
+            @last_last_cell_rows = array_deep_clone(@last_cell_rows)
+            @last_cell_rows = array_deep_clone(@cell_rows)
+            if !@applied_windows_fix_on_first_cell_rows_update && OS.windows?
+              @applied_windows_fix_on_first_cell_rows_update = true
+              apply_windows_fix
+            end
+          end
+          @cell_rows_observer_registration = @cell_rows_observer.observe(self, :cell_rows, recursive: true, ignore_frozen: true, attribute_writer_type: [:attribute=, :set_attribute])
+        end
+
+        def apply_windows_fix
+          Glimmer::LibUI.queue_main do
+            new_row = @columns&.select {|column| column.is_a?(Column)}&.map {|column| column.class.default_value}
+            if new_row
+              @cell_rows << new_row
+              @cell_rows.pop
+            end
+          end
+        end
       end
     end
   end

data/lib/glimmer/libui/data_bindable.rb

@@ -46,7 +46,7 @@ module Glimmer
           new_value = model_binding.evaluate_property
           send("#{property}=", new_value) unless send(property) == new_value
         end
-        observer_registration = model_attribute_observer.observe(model_binding)
+        observer_registration = model_attribute_observer.observe(model_binding, attribute_writer_type: [:attribute=, :set_attribute])
         model_attribute_observer.call # initial update
         data_binding_model_attribute_observer_registrations << observer_registration
         observer_registration

data/lib/glimmer/libui/shape/bezier.rb

@@ -25,13 +25,30 @@ module Glimmer
   module LibUI
     class Shape
       class Bezier < Shape
-        parameters :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
-        parameter_defaults 0, 0, 0, 0, 0, 0
+        parameters :x, :y, :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
+        parameter_defaults nil, nil, 0, 0, 0, 0, 0, 0
+                
+        def initialize(keyword, parent, args, &block)
+          args.prepend nil until args.size == 8
+          super(keyword, parent, args, &block)
+        end
                 
         def draw(area_draw_params)
-          ::LibUI.draw_path_bezier_to(path_proxy.libui, *@args)
+          if !parent.is_a?(Figure)
+            if include_start_point?
+              ::LibUI.draw_path_new_figure(path_proxy.libui, x, y)
+            else
+              ::LibUI.draw_path_new_figure(path_proxy.libui, 0, 0)
+            end
+          end
+          ::LibUI.draw_path_bezier_to(path_proxy.libui, c1_x, c1_y, c2_x, c2_y, end_x, end_y)
           super
         end
+        
+        # Indicates if bezier is not part of a figure and yet it includes the start point in addition to other points
+        def include_start_point?
+          x && y
+        end
       end
     end
   end

data/lib/glimmer/libui/shape/line.rb

@@ -24,14 +24,34 @@ require 'glimmer/libui/shape'
 module Glimmer
   module LibUI
     class Shape
+      # Line to use as part of a figure (when having 2 args)
+      # or independently (when having 4 args representing start point x/y and end point x/y)
       class Line < Shape
-        parameters :x, :y
-        parameter_defaults 0, 0
+        parameters :x, :y, :end_x, :end_y
+        parameter_defaults 0, 0, nil, nil
   
         def draw(area_draw_params)
-          ::LibUI.draw_path_line_to(path_proxy.libui, *@args)
+          if parent.is_a?(Figure)
+            ::LibUI.draw_path_line_to(path_proxy.libui, x, y)
+          else
+            if include_start_point?
+              ::LibUI.draw_path_new_figure(path_proxy.libui, x, y)
+              ::LibUI.draw_path_line_to(path_proxy.libui, end_x, end_y)
+            else
+              ::LibUI.draw_path_new_figure(path_proxy.libui, 0, 0)
+              ::LibUI.draw_path_line_to(path_proxy.libui, x, y)
+            end
+          end
           super
         end
+        
+        # Indicates if line is not part of a figure and yet it includes the start point in addition to end point
+        def include_start_point?
+          # if the last 2 args are available, it means that the first 2 args represent the start point
+          # if line is part of a figure, then the last 2 args are ignored and it is never assumed to include
+          # start point
+          !parent.is_a?(Figure) && end_x && end_y
+        end
       end
     end
   end

data/lib/glimmer/libui.rb

@@ -23,6 +23,7 @@ require 'glimmer/fiddle_consumer'
 
 module Glimmer
   module LibUI
+    ICON = File.expand_path('../../icons/blank.png', __dir__)
     class << self
       include Glimmer::FiddleConsumer
       

data/lib/glimmer-dsl-libui.rb

@@ -28,6 +28,7 @@ require 'glimmer'
 # require 'super_module'
 require 'color'
 require 'os'
+require 'equalizer'
 require 'array_include_methods'
 require 'facets/hash/stringify_keys'
 require 'facets/string/underscore'
@@ -46,3 +47,8 @@ Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
 end
 
 ::LibUI.init
+# begin
+#   PutsDebuggerer.printer = lambda { |m| puts m; $stdout.flush}
+# rescue
+  ##### No Op if puts_debuggerer is not loaded
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.19
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +209,8 @@ description: Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development G
   platform-independent native GUI that just works! Glimmer DSL for LibUI aims to provide
   declarative DSL syntax that visually maps to GUI control hierarchy, convention over
   configuration via smart defaults, automation of low-level details, requiring the
-  least amount of syntax possible to build GUI, and custom keyword support.
+  least amount of syntax possible to build GUI, bidirectional data-binding, and custom
+  keyword support.
 email: andy.am@gmail.com
 executables:
 - girb
@@ -309,6 +324,7 @@ files:
 - examples/timer.rb
 - examples/timer2.rb
 - glimmer-dsl-libui.gemspec
+- icons/blank.png
 - icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
 - lib/glimmer/dsl/libui/bind_expression.rb
@@ -319,6 +335,7 @@ files:
 - lib/glimmer/dsl/libui/listener_expression.rb
 - lib/glimmer/dsl/libui/observe_expression.rb
 - lib/glimmer/dsl/libui/open_file_expression.rb
+- lib/glimmer/dsl/libui/operation_expression.rb
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
 - lib/glimmer/dsl/libui/shape_expression.rb