glimmer-dsl-libui 0.2.6 → 0.2.10

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

@@ -0,0 +1,50 @@
+# 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/control_proxy/column'
+require 'glimmer/libui/control_proxy/triple_column'
+require 'glimmer/libui/control_proxy/editable_column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI image text color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class ImageTextColorColumnProxy < ControlProxy
+          include Column
+          include TripleColumn
+          include EditableColumn
+              
+          private
+          
+          def build_control
+            table_text_column_optional_params = ::LibUI::FFI::TableTextColumnOptionalParams.malloc
+            table_text_column_optional_params.ColorModelColumn = third_column_index
+            @parent_proxy.append_image_text_column(name, column_index, second_column_index, editable_value, table_text_column_optional_params)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# 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/control_proxy/column'
+require 'glimmer/libui/control_proxy/dual_column'
+require 'glimmer/libui/control_proxy/editable_column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI text color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class TextColorColumnProxy < ControlProxy
+          include Column
+          include DualColumn
+          include EditableColumn
+              
+          private
+          
+          def build_control
+            table_text_column_optional_params = ::LibUI::FFI::TableTextColumnOptionalParams.malloc
+            table_text_column_optional_params.ColorModelColumn = second_column_index
+            @parent_proxy.append_text_column(name, column_index, editable_value, table_text_column_optional_params)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -38,6 +38,7 @@ module Glimmer
         private
         
         def editable_value
+          # TODO consider relying on enum symbol :table_model_column
           (@parent_proxy.editable? || editable?) ? -2 : -1
         end
       end

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

@@ -69,7 +69,6 @@ module Glimmer
             @fill ||= {}
           else
             @fill = Glimmer::LibUI.interpret_color(args)
-            @fill[:a] = 1.0 if @fill.is_a?(Hash) && @fill[:a].nil?
             @parent_proxy&.queue_redraw_all
           end
           @fill.tap do
@@ -94,7 +93,6 @@ module Glimmer
             @stroke ||= {}
           else
             @stroke = Glimmer::LibUI.interpret_color(args)
-            @stroke[:a] = 1.0 if @stroke.is_a?(Hash) && @stroke[:a].nil?
             @parent_proxy&.queue_redraw_all
           end
           @stroke.tap do
@@ -149,11 +147,38 @@ module Glimmer
         end
         
         def init_draw_brush(draw_brush, draw_brush_args)
+          if draw_brush_args[:r] || draw_brush_args[:g] || draw_brush_args[:b] || draw_brush_args[:a]
+            draw_brush_args[:type] ||= :solid
+          elsif draw_brush_args[:outer_radius]
+            draw_brush_args[:type] ||= :radial_gradient
+          else
+            draw_brush_args[:type] ||= :linear_gradient
+          end
           draw_brush.Type = Glimmer::LibUI.enum_symbol_to_value(:draw_brush_type, draw_brush_args[:type])
-          draw_brush.R = (draw_brush_args[:r] || draw_brush_args[:red]).to_f / 255.0
-          draw_brush.G = (draw_brush_args[:g] || draw_brush_args[:green]).to_f / 255.0
-          draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0
-          draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha])
+          if draw_brush.Type == 0
+            draw_brush.R = (draw_brush_args[:r] || draw_brush_args[:red]).to_f / 255.0
+            draw_brush.G = (draw_brush_args[:g] || draw_brush_args[:green]).to_f / 255.0
+            draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0
+            draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha] || 1.0)
+          else
+            draw_brush.X0 = draw_brush_args[:x0].to_f
+            draw_brush.Y0 = draw_brush_args[:y0].to_f
+            draw_brush.X1 = draw_brush_args[:x1].to_f
+            draw_brush.Y1 = draw_brush_args[:y1].to_f
+            draw_brush.OuterRadius = draw_brush_args[:outer_radius].to_f if draw_brush.Type == 2
+            stop_structs = draw_brush_args[:stops].to_a.map do |stop|
+              ::LibUI::FFI::DrawBrushGradientStop.malloc.tap do |stop_struct|
+                stop_struct.Pos = stop[:pos].to_f
+                stop_color = Glimmer::LibUI.interpret_color(stop)
+                stop_struct.R = stop_color[:r].to_f / 255.0
+                stop_struct.G = stop_color[:g].to_f / 255.0
+                stop_struct.B = stop_color[:b].to_f / 255.0
+                stop_struct.A = stop_color[:a] || 1.0
+              end
+            end
+            draw_brush.NumStops = stop_structs.count
+            draw_brush.Stops = stop_structs.map(&:to_ptr).map(&:to_s).reduce(:+)
+          end
         end
       end
     end

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)
@@ -58,8 +60,16 @@ module Glimmer
         
         def post_initialize_child(child)
           @columns << child
-          # add an extra complementary nil column if it is a dual column (i.e. ImageTextColumnProxy or CheckboxTextColumnProxy
-          @columns << nil if child.is_a?(DualColumn)
+          # add extra complementary columns (:text, :color) if it is a dual/triple column (i.e. ImageTextColumnProxy or CheckboxTextColumnProxy
+          case child
+          when Column::ImageTextColumnProxy, Column::CheckboxTextColumnProxy
+            @columns << :text
+          when Column::TextColorColumnProxy
+            @columns << :color
+          when Column::CheckboxTextColorColumnProxy, Column::ImageTextColorColumnProxy
+            @columns << :text
+            @columns << :color
+          end
         end
         
         def destroy
@@ -73,22 +83,27 @@ module Glimmer
           else
             @cell_rows = rows
             @cell_rows.tap do
-              @last_cell_rows = @cell_rows.clone
+              @last_cell_rows = array_deep_clone(@cell_rows)
               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 |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
+                @last_cell_rows = array_deep_clone(@cell_rows)
               end.observe(self, :cell_rows)
             end
           end
@@ -119,27 +134,36 @@ module Glimmer
           @model_handler = ::LibUI::FFI::TableModelHandler.malloc
           @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|
+            # TODO consider refactoring to use Glimmer::LibUI.enum_symbols(:table_value_type)
             case @columns[column]
-            when Column::TextColumnProxy, Column::ButtonColumnProxy, NilClass
+            when Column::TextColumnProxy, Column::ButtonColumnProxy, Column::TextColorColumnProxy, :text
               0
-            when Column::ImageColumnProxy, Column::ImageTextColumnProxy
+            when Column::ImageColumnProxy, Column::ImageTextColumnProxy, Column::ImageTextColorColumnProxy
               1
-            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::ProgressBarColumnProxy
+            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::CheckboxTextColorColumnProxy, Column::ProgressBarColumnProxy
               2
+            when Column::BackgroundColorColumnProxy, :color
+              3
             end
           end
           @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 Column::TextColumnProxy, Column::ButtonColumnProxy, NilClass
+            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
+            when Column::ImageColumnProxy, Column::ImageTextColumnProxy, Column::ImageTextColorColumnProxy
               ::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 Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy
+            when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::CheckboxTextColorColumnProxy
               ::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)))
             when Column::ProgressBarColumnProxy
               ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column].to_i)))
+            when Column::BackgroundColorColumnProxy
+              background_color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              ::LibUI.new_table_value_color(background_color[:r] / 255.0, background_color[:g] / 255.0, background_color[:b] / 255.0, background_color[:a] || 1.0)
+            when :color
+              color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              ::LibUI.new_table_value_color(color[:r] / 255.0, color[:g] / 255.0, color[:b] / 255.0, color[:a] || 1.0)
             end
           end
           @model_handler.SetCellValue = fiddle_closure_block_caller(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
@@ -148,7 +172,7 @@ module Glimmer
               column = @columns[column].index
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
-            when NilClass
+            when :text
               column = @columns[column - 1].index
               @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
             when Column::ButtonColumnProxy
@@ -158,17 +182,22 @@ 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)
           
+          # figure out and reserve column indices for columns
+          @columns.each { |column| column.respond_to?(:column_index) && column.column_index }
+          
           @table_params = ::LibUI::FFI::TableParams.malloc
           @table_params.Model = @model
-          @table_params.RowBackgroundColorModelColumn = -1
+          @table_params.RowBackgroundColorModelColumn = @columns.find {|column| column.is_a?(Column::BackgroundColorColumnProxy)}&.column_index || -1
           
           @libui = ControlProxy.new_control(@keyword, [@table_params])
           @libui.tap do
-            @columns.each {|column| column&.send(:build_control) }
+            @columns.each {|column| column.respond_to?(:build_control, true) && column.send(:build_control) }
           end
         end
         
@@ -176,6 +205,16 @@ module Glimmer
           @next_column_index ||= -1
           @next_column_index += 1
         end
+        
+        def array_deep_clone(array_or_object)
+          if array_or_object.is_a?(Array)
+            array_or_object.map do |element|
+              array_deep_clone(element)
+            end
+          else
+            array_or_object.clone
+          end
+        end
       end
     end
   end

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

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

@@ -0,0 +1,45 @@
+# 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.
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # A dual column is one that represents two values (e.g. image and text or checkbox and text)
+      # It is meant to be included in a column proxy class that already includes Column
+      module TripleColumn
+        def second_column_index
+          column_index + 1
+        end
+        
+        def third_column_index
+          column_index + 2
+        end
+        
+        def column_index
+          @column_index ||= @parent_proxy.send(:next_column_index).tap do
+            @parent_proxy.send(:next_column_index)
+            @parent_proxy.send(:next_column_index)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui.rb

@@ -44,8 +44,8 @@ module Glimmer
           value = value[0...-1]
         end
         value = value.first if value.is_a?(Array) && value.size == 1
-        value = value.to_s if value.is_a?(Symbol)
         value = value[:color] if value.is_a?(Hash) && value[:color]
+        value = value.to_s if value.is_a?(Symbol)
         result = if value.is_a?(Array)
           old_value = value
           value = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.10
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - examples/basic_table_button.rb
 - examples/basic_table_checkbox.rb
 - examples/basic_table_checkbox_text.rb
+- examples/basic_table_color.rb
 - examples/basic_table_image.rb
 - examples/basic_table_image_text.rb
 - examples/basic_table_progress_bar.rb
@@ -245,10 +246,12 @@ files:
 - examples/histogram.rb
 - examples/login.rb
 - examples/meta_example.rb
+- examples/method_based_custom_keyword.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
 - examples/timer.rb
 - glimmer-dsl-libui.gemspec
+- icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
 - lib/glimmer/dsl/libui/control_expression.rb
 - lib/glimmer/dsl/libui/dsl.rb
@@ -273,12 +276,16 @@ files:
 - lib/glimmer/libui/control_proxy/checkbox_proxy.rb
 - lib/glimmer/libui/control_proxy/color_button_proxy.rb
 - lib/glimmer/libui/control_proxy/column.rb
+- lib/glimmer/libui/control_proxy/column/background_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/button_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/checkbox_text_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/image_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/image_text_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/progress_bar_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/text_color_column_proxy.rb
 - lib/glimmer/libui/control_proxy/column/text_column_proxy.rb
 - lib/glimmer/libui/control_proxy/combobox_proxy.rb
 - lib/glimmer/libui/control_proxy/date_time_picker_proxy.rb
@@ -320,6 +327,7 @@ files:
 - lib/glimmer/libui/control_proxy/table_proxy.rb
 - lib/glimmer/libui/control_proxy/text_proxy.rb
 - lib/glimmer/libui/control_proxy/transformable.rb
+- lib/glimmer/libui/control_proxy/triple_column.rb
 - lib/glimmer/libui/control_proxy/window_proxy.rb
 - lib/glimmer/libui/parent.rb
 - lib/glimmer/libui/shape.rb