glimmer-dsl-libui 0.2.3 → 0.2.7

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

@@ -0,0 +1,82 @@
+# 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 checkbox text color column objects
+        #
+        # Follows the Proxy Design Pattern
+        class CheckboxTextColorColumnProxy < ControlProxy
+          include Column
+          include TripleColumn
+          include EditableColumn
+              
+          def editable_checkbox(value = nil)
+            if value.nil?
+              @editable_checkbox = false if @editable_checkbox.nil?
+              @editable_checkbox
+            else
+              @editable_checkbox = !!value
+            end
+          end
+          alias editable_checkbox= editable_checkbox
+          alias set_editable_checkbox editable_checkbox
+          alias editable_checkbox? editable_checkbox
+    
+          def editable_text(value = nil)
+            if value.nil?
+              @editable_text = false if @editable_text.nil?
+              @editable_text
+            else
+              @editable_text = !!value
+            end
+          end
+          alias editable_text= editable_text
+          alias set_editable_text editable_text
+          alias editable_text? editable_text
+    
+          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_checkbox_text_column(name, column_index, editable_checkbox_value, second_column_index, editable_text_value, table_text_column_optional_params)
+          end
+          
+          def editable_checkbox_value
+            (@parent_proxy.editable? || editable? || editable_checkbox?) ? -2 : -1
+          end
+          
+          def editable_text_value
+            (@parent_proxy.editable? || editable? || editable_text?) ? -2 : -1
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -28,6 +28,20 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class ComboboxProxy < ControlProxy
+        def selected(value = nil)
+          if value.nil?
+            super()
+          else
+            if value.is_a?(String)
+              super(items.index(value).to_i)
+            else
+              super
+            end
+          end
+        end
+        alias selected= selected
+        alias set_selected selected
+      
         def items(*values)
           values = values.first if values.first.is_a?(Array)
           if values.empty?
@@ -39,6 +53,10 @@ module Glimmer
         end
         alias set_items items
         alias items= items
+        
+        def selected_item
+          items[selected]
+        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/open_type_features_proxy.rb

@@ -0,0 +1,53 @@
+# 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/area_proxy'
+require 'glimmer/libui/parent'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI open type features objects
+      #
+      # Follows the Proxy Design Pattern
+      class OpenTypeFeaturesProxy < ControlProxy
+        include Parent
+      
+        def destroy
+          ::LibUI.free_open_type_features(@libui)
+          @parent_proxy&.children&.delete(self)
+          ControlProxy.control_proxies.delete(self)
+        end
+        
+        def redraw
+          @parent_proxy.redraw
+        end
+        
+        private
+        
+        def build_control
+          @libui = ::LibUI.new_open_type_features
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# 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/area_proxy'
+require 'glimmer/libui/parent'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI open type tag objects
+      #
+      # Follows the Proxy Design Pattern
+      class OpenTypeTagProxy < ControlProxy
+        def destroy
+          @parent_proxy&.children&.delete(self)
+          ControlProxy.control_proxies.delete(self)
+        end
+        
+        def redraw
+          @parent_proxy.redraw
+        end
+        
+        private
+        
+        def build_control
+          tag_args = @args.dup
+          tag_args[0] = ordinalize(tag_args[0])
+          tag_args[1] = ordinalize(tag_args[1])
+          tag_args[2] = ordinalize(tag_args[2])
+          tag_args[3] = ordinalize(tag_args[3])
+          ::LibUI.open_type_features_add(@parent_proxy.libui, *tag_args)
+        end
+        
+        def ordinalize(arg)
+          arg.is_a?(String) ? arg.ord : arg
+        end
+      end
+    end
+  end
+end

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

@@ -58,8 +58,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
@@ -119,27 +127,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 +165,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
@@ -162,13 +179,16 @@ module Glimmer
           
           @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
         

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

@@ -51,10 +51,12 @@ module Glimmer
         end
         
         def draw(area_draw_params)
+          reset_attributed_string
           children.dup.each {|child| child.draw(area_draw_params)}
           build_control
           ::LibUI.draw_text(area_draw_params[:context], @libui, x, y)
           ::LibUI.draw_free_text_layout(@libui)
+          ::LibUI.free_attributed_string(@attributed_string)
         end
         
         def destroy
@@ -88,23 +90,35 @@ module Glimmer
         
         def width(value = nil)
           if value.nil?
-            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:width])
+            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:area_width])
           else
             @width = value
+            redraw
           end
         end
         alias width= width
         alias set_width width
         
         def attributed_string
-          @attributed_string ||= ::LibUI.new_attributed_string('')
+          @attributed_string ||= reset_attributed_string
+        end
+        
+        def reset_attributed_string
+          @attributed_string = ::LibUI.new_attributed_string('')
         end
         
         def default_font(value = nil)
           if value.nil?
-            @default_font ||= {}
+            @default_font ||= {
+              family: 'Helvetica',
+              size: 12.0,
+              weight: :normal,
+              italic: :normal,
+              stretch: :normal,
+            }
           else
             @default_font = value
+            redraw
           end
         end
         alias default_font= default_font
@@ -122,9 +136,10 @@ module Glimmer
         
         def align(value = nil)
           if value.nil?
-            @align ||= {}
+            @align
           else
             @align = value
+            redraw
           end
         end
         alias align= align
@@ -135,7 +150,7 @@ module Glimmer
           @draw_text_layout_params.String = attributed_string
           @draw_text_layout_params.DefaultFont = default_font_descriptor
           @draw_text_layout_params.Width = width
-          @draw_text_layout_params.Align = Glimmer::LibUI.enum_symbol_to_value(:draw_text_align, align, default_symbol: :center)
+          @draw_text_layout_params.Align = Glimmer::LibUI.enum_symbol_to_value(:draw_text_align, align, default_symbol: :left)
           @draw_text_layout_params
         end
         

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

@@ -115,7 +115,7 @@ module Glimmer
         if enum_symbol.is_a?(Integer)
           enum_symbol
         elsif enum_symbols(enum_name).include?(enum_symbol.to_s.to_sym)
-          enum_symbol_values(enum_name)[enum_symbol]
+          enum_symbol_values(enum_name)[enum_symbol.to_s.to_sym]
         elsif default_symbol
           enum_symbol_to_value(enum_name, default_symbol)
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -216,11 +216,13 @@ files:
 - examples/basic_area2.rb
 - examples/basic_button.rb
 - examples/basic_draw_text.rb
+- examples/basic_draw_text2.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
 - 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
@@ -230,6 +232,8 @@ files:
 - examples/color_button.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb
+- examples/custom_draw_text.rb
+- examples/custom_draw_text2.rb
 - examples/date_time_picker.rb
 - examples/dynamic_area.rb
 - examples/dynamic_area2.rb
@@ -246,6 +250,7 @@ files:
 - 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
@@ -270,12 +275,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
@@ -309,12 +318,15 @@ files:
 - lib/glimmer/libui/control_proxy/message_box/msg_box_proxy.rb
 - lib/glimmer/libui/control_proxy/multiline_entry_proxy.rb
 - lib/glimmer/libui/control_proxy/multiline_entry_proxy/non_wrapping_multiline_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/open_type_features_proxy.rb
+- lib/glimmer/libui/control_proxy/open_type_tag_proxy.rb
 - lib/glimmer/libui/control_proxy/path_proxy.rb
 - lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
 - lib/glimmer/libui/control_proxy/tab_item_proxy.rb
 - 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