glimmer-dsl-libui 0.1.1 → 0.1.5

data/lib/glimmer/libui/parent.rb

@@ -0,0 +1,36 @@
+# 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
+    # Parent controls and shapes who have children and add child post_initialize_child
+    module Parent
+      # Subclasses can override and must call super (passing add_child: false to cancel adding child to children)
+      def post_initialize_child(child, add_child: true)
+        children << child if add_child
+      end
+      
+      def children
+        @children ||= []
+      end
+    end
+  end
+end

data/lib/glimmer/libui/path_proxy.rb

@@ -20,6 +20,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/area_proxy'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/transformable'
 
 module Glimmer
   module LibUI
@@ -27,6 +30,9 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class PathProxy < ControlProxy
+      include Parent
+      prepend Transformable
+    
       # TODO support mode without parent proxy
       def initialize(keyword, parent, args, &block)
         @keyword = keyword
@@ -37,23 +43,17 @@ module Glimmer
         post_add_content if @block.nil?
       end
     
-      def post_initialize_child(child)
-        super
-        children << child
-      end
-      
       def post_add_content
         super
-        draw(area_draw_params) if @parent_proxy.nil?
-      end
-      
-      def children
-        @children ||= []
+        if @parent_proxy.nil? && AreaProxy.current_area_draw_params
+          draw(AreaProxy.current_area_draw_params)
+          destroy
+        end
       end
       
       def draw(area_draw_params)
         build_control
-        children.each {|child| child.draw(area_draw_params)}
+        children.dup.each {|child| child.draw(area_draw_params)}
         ::LibUI.draw_path_end(@libui)
         ::LibUI.draw_fill(area_draw_params[:context], @libui, fill_draw_brush.to_ptr) unless fill.empty?
         ::LibUI.draw_stroke(area_draw_params[:context], @libui, stroke_draw_brush, draw_stroke_params) unless stroke.empty?
@@ -69,6 +69,14 @@ module Glimmer
           @fill ||= {}
         else
           @fill = args
+          @fill[:a] = 1.0 if @fill[:a].nil?
+          @parent_proxy&.queue_redraw_all
+        end
+        @fill.tap do
+          @fill_observer ||= Glimmer::DataBinding::Observer.proc do
+            @parent_proxy&.queue_redraw_all
+          end
+          @fill_observer.observe(@fill)
         end
       end
       alias fill= fill
@@ -85,6 +93,14 @@ module Glimmer
           @stroke ||= {}
         else
           @stroke = args
+          @stroke[:a] = 1.0 if @stroke[:a].nil?
+          @parent_proxy&.queue_redraw_all
+        end
+        @stroke.tap do
+          @stroke_observer ||= Glimmer::DataBinding::Observer.proc do
+            @parent_proxy&.queue_redraw_all
+          end
+          @stroke_observer.observe(@stroke)
         end
       end
       alias stroke= stroke
@@ -109,15 +125,15 @@ module Glimmer
         @draw_stroke_params
       end
       
-      # returns area_draw_params if built inside on_draw listener (not needed if declared outside)
-      def area_draw_params
-        @args[0] if @parent_proxy.nil?
-      end
-    
       def destroy
-        @parent_proxy.children.delete(self) unless @parent_proxy.nil?
+        @parent_proxy&.children&.delete(self)
+        ControlProxy.control_proxies.delete(self)
       end
-    
+      
+      def redraw
+        @parent_proxy&.queue_redraw_all
+      end
+      
       private
       
       def build_control
@@ -139,6 +155,7 @@ module Glimmer
         else
           draw_brush.Type = 0
         end
+        draw_brush_args = draw_brush_args.merge(Glimmer::LibUI.hex_to_rgb(draw_brush_args[:color])) if draw_brush_args[:color]
         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

data/lib/glimmer/libui/rectangle.rb

@@ -0,0 +1,36 @@
+# 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/shape'
+
+module Glimmer
+  module LibUI
+    class Rectangle < Shape
+      parameters :x, :y, :width, :height
+      parameter_defaults 0, 0, 0, 0
+    
+      def draw(area_draw_params)
+        ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args)
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape.rb

@@ -0,0 +1,143 @@
+# 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/parent'
+
+module Glimmer
+  module LibUI
+    # Represents LibUI lightweight shape objects nested under path (e.g. line, rectangle, arc, bezier)
+    class Shape
+      class << self
+        def exists?(keyword)
+          Glimmer::LibUI.constants.include?(constant_symbol(keyword)) and
+            shape_class(keyword).respond_to?(:ancestors) and
+            shape_class(keyword).ancestors.include?(Shape)
+        end
+        
+        def create(keyword, parent, args, &block)
+          shape_class(keyword).new(keyword, parent, args, &block)
+        end
+        
+        def shape_class(keyword)
+          Glimmer::LibUI.const_get(constant_symbol(keyword))
+        end
+        
+        def parameters(*params)
+          if params.empty?
+            @parameters
+          else
+            @parameters = params
+          end
+        end
+        
+        def parameter_defaults(*defaults)
+          if defaults.empty?
+            @parameter_defaults
+          else
+            @parameter_defaults = defaults
+          end
+        end
+        
+        private
+        
+        def constant_symbol(keyword)
+          "#{keyword.camelcase(:upper)}".to_sym
+        end
+      end
+      
+      include Parent
+      
+      attr_reader :parent, :args, :keyword, :block
+      
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent = parent
+        @args = args
+        @block = block
+        set_parameter_defaults
+        post_add_content if @block.nil?
+      end
+      
+      # Subclasses may override to perform post add_content work (normally must call super)
+      def post_add_content
+        @parent&.post_initialize_child(self)
+      end
+      
+      # Subclasses must override to perform draw work and call super afterwards to ensure calling destroy when semi-declarative in an on_draw method
+      def draw(area_draw_params)
+        destroy if area_proxy.nil?
+      end
+      
+      def redraw
+        area_proxy&.queue_redraw_all
+      end
+      
+      def destroy
+        @parent.children.delete(self)
+      end
+      
+      def area_proxy
+        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(AreaProxy) }
+      end
+      
+      def path_proxy
+        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(PathProxy) }
+      end
+      
+      def respond_to?(method_name, *args, &block)
+        self.class.parameters.include?(method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym) or
+          super(method_name, true)
+      end
+      
+      def method_missing(method_name, *args, &block)
+        method_name_parameter = method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym
+        if self.class.parameters.include?(method_name_parameter)
+          method_name = method_name.to_s
+          parameter_index = self.class.parameters.index(method_name_parameter)
+          if method_name.start_with?('set_') || method_name.end_with?('=') || !args.empty?
+            @args[parameter_index] = args.first
+            area_proxy&.queue_redraw_all
+          else
+            @args[parameter_index]
+          end
+        else
+          super
+        end
+      end
+      
+      private
+      
+      def set_parameter_defaults
+        self.class.parameter_defaults.each_with_index do |default, i|
+          @args[i] ||= default
+        end
+      end
+      
+      def find_parent_in_ancestors(&condition)
+        found = self
+        until condition.call(found)
+          found = found.respond_to?(:parent_proxy) ? found.parent_proxy : found.parent
+        end
+        found
+      end
+    end
+  end
+end

data/lib/glimmer/libui/square.rb

@@ -0,0 +1,36 @@
+# 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/shape'
+
+module Glimmer
+  module LibUI
+    class Square < Shape
+      parameters :x, :y, :length
+      parameter_defaults 0, 0, 0
+    
+      def draw(area_draw_params)
+        ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/transformable.rb

@@ -0,0 +1,72 @@
+# 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
+    # This is meant to be prepended (not included) because it changes behavior of instance draw method
+    # Adds transform property to controls/shapes
+    # Automatically applies transform property at the beginning of draw operation and undoes it at the end
+    # Stacks up with Parent module (must include Parent beforehand)
+    # Expects transformable to implement redraw method
+    module Transformable
+      def post_initialize_child(child, add_child: true)
+        if child.is_a?(MatrixProxy)
+          super(child, add_child: false)
+          self.transform = child if child.keyword == 'transform'
+        else
+          super(child, add_child: add_child)
+        end
+      end
+    
+      # Returns transform or sets it. Expects transformable to implement redraw method (delegating work to area).
+      def transform(matrix = nil)
+        if matrix.nil?
+          @transform
+        else
+          @transform = matrix
+          redraw
+        end
+      end
+      alias transform= transform
+      alias set_transform transform
+      
+      # Apply transform matrix to coordinate system
+      def apply_transform(area_draw_params)
+        ::LibUI.draw_transform(area_draw_params[:context], @transform.libui) unless @transform.nil?
+      end
+      
+      # Inverse of apply_transform (applies inverse transformation to undo initial transformation)
+      def undo_transform(area_draw_params)
+        unless @transform.nil?
+          inverse_transform = @transform.clone
+          inverse_transform.invert
+          ::LibUI.draw_transform(area_draw_params[:context], inverse_transform.libui)
+        end
+      end
+      
+      def draw(area_draw_params)
+        apply_transform(area_draw_params)
+        super(area_draw_params)
+        undo_transform(area_draw_params)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/window_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/area_proxy'
 
 module Glimmer
   module LibUI
@@ -33,6 +34,12 @@ module Glimmer
       DEFAULT_HAS_MENUBAR = 1
       
       def post_initialize_child(child)
+        if child.is_a?(AreaProxy)
+          vertical_box_parent = ControlProxy.create('vertical_box', self, [])
+          child.instance_variable_set(:@parent_proxy, vertical_box_parent)
+          vertical_box_parent.post_initialize_child(child)
+          child = vertical_box_parent
+        end
         ::LibUI.window_set_child(@libui, child.libui)
       end
       
@@ -104,7 +111,7 @@ module Glimmer
         construction_args[1] = DEFAULT_WIDTH if construction_args.size == 1
         construction_args[2] = DEFAULT_HEIGHT if construction_args.size == 2
         construction_args[3] = DEFAULT_HAS_MENUBAR if construction_args.size == 3
-        construction_args[3] = ControlProxy.boolean_to_integer(construction_args[3]) if construction_args.size == 4 && (construction_args[3].is_a?(TrueClass) || construction_args[3].is_a?(FalseClass))
+        construction_args[3] = Glimmer::LibUI.boolean_to_integer(construction_args[3]) if construction_args.size == 4 && (construction_args[3].is_a?(TrueClass) || construction_args[3].is_a?(FalseClass))
         @libui = ControlProxy.new_control(@keyword, construction_args)
         @libui.tap do
           handle_listener('on_closing') do

data/lib/glimmer/libui.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.
+
+module Glimmer
+  module LibUI
+    class << self
+      def integer_to_boolean(int, allow_nil: true)
+        int.nil? ? (allow_nil ? nil : false) : int == 1
+      end
+      
+      def boolean_to_integer(bool, allow_nil: true)
+        bool.nil? ? (allow_nil ? nil : 0) : (bool ? 1 : 0)
+      end
+    
+      def hex_to_rgb(value)
+        if value.is_a?(String)
+          value = "0x#{value}" if !value.start_with?('0x')
+          value = value.to_i(16)
+        end
+        if value.is_a?(Integer)
+          hex_value = value
+          value = {
+            r: ((hex_value >> 16) & 0xFF),
+            g: ((hex_value >> 8) & 0xFF),
+            b: (hex_value & 0xFF),
+          }
+        end
+        value
+      end
+    end
+  end
+end

data/lib/glimmer-dsl-libui.rb

@@ -34,6 +34,7 @@ require 'libui'
 # require 'ext/glimmer/config'
 # require 'ext/glimmer'
 require 'glimmer/dsl/libui/dsl'
+require 'glimmer/libui'
 Glimmer::Config.loop_max_count = -1
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-09-30 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,10 @@ files:
 - VERSION
 - bin/girb
 - bin/girb_runner.rb
+- examples/area_gallery.rb
+- examples/area_gallery2.rb
+- examples/area_gallery3.rb
+- examples/area_gallery4.rb
 - examples/basic_area.rb
 - examples/basic_area2.rb
 - examples/basic_button.rb
@@ -205,18 +209,21 @@ files:
 - examples/basic_table_image.rb
 - examples/basic_table_image_text.rb
 - examples/basic_table_progress_bar.rb
+- examples/basic_transform.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - 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
 - examples/form.rb
 - examples/form_table.rb
 - examples/grid.rb
+- examples/histogram.rb
 - examples/meta_example.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
@@ -229,10 +236,14 @@ files:
 - lib/glimmer/dsl/libui/open_file_expression.rb
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
+- lib/glimmer/dsl/libui/shape_expression.rb
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/fiddle_consumer.rb
+- lib/glimmer/libui.rb
 - lib/glimmer/libui/about_menu_item_proxy.rb
+- lib/glimmer/libui/arc.rb
 - lib/glimmer/libui/area_proxy.rb
+- lib/glimmer/libui/bezier.rb
 - lib/glimmer/libui/box.rb
 - lib/glimmer/libui/button_column_proxy.rb
 - lib/glimmer/libui/button_proxy.rb
@@ -250,6 +261,7 @@ files:
 - lib/glimmer/libui/editable_column.rb
 - lib/glimmer/libui/editable_combobox_proxy.rb
 - lib/glimmer/libui/enableable_column.rb
+- lib/glimmer/libui/figure.rb
 - lib/glimmer/libui/font_button_proxy.rb
 - lib/glimmer/libui/form_proxy.rb
 - lib/glimmer/libui/grid_proxy.rb
@@ -260,21 +272,27 @@ files:
 - lib/glimmer/libui/image_proxy.rb
 - lib/glimmer/libui/image_text_column_proxy.rb
 - lib/glimmer/libui/label_proxy.rb
+- lib/glimmer/libui/line.rb
+- lib/glimmer/libui/matrix_proxy.rb
 - lib/glimmer/libui/menu_item_proxy.rb
 - 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/parent.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/rectangle.rb
 - lib/glimmer/libui/separator_menu_item_proxy.rb
+- lib/glimmer/libui/shape.rb
+- lib/glimmer/libui/square.rb
 - lib/glimmer/libui/tab_item_proxy.rb
 - lib/glimmer/libui/table_proxy.rb
 - lib/glimmer/libui/text_column_proxy.rb
 - lib/glimmer/libui/time_picker_proxy.rb
+- lib/glimmer/libui/transformable.rb
 - lib/glimmer/libui/vertical_box_proxy.rb
 - lib/glimmer/libui/window_proxy.rb
 homepage: http://github.com/AndyObtiva/glimmer-dsl-libui