glimmer-dsl-libui 0.4.11 → 0.4.15

data/examples/meta_example.rb

@@ -180,7 +180,9 @@ class MetaExample
             }
             button('Reset') {
               on_clicked do
-                self.code_text = File.read(file_path_for(selected_example))
+                version_number = @version_spinbox.value == 1 ? '' : @version_spinbox.value
+                example = "#{selected_example}#{version_number}"
+                self.code_text = File.read(file_path_for(example))
               end
             }
           }

data/lib/glimmer/libui/attributed_string.rb

@@ -22,7 +22,6 @@
 require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/parent'
-require 'glimmer/libui/control_proxy/transformable'
 require 'glimmer/libui/data_bindable'
 
 module Glimmer
@@ -48,7 +47,7 @@ module Glimmer
           @string
         else
           @string = value
-          redraw
+          request_auto_redraw
         end
       end
       alias string= string
@@ -59,7 +58,7 @@ module Glimmer
           @font
         else
           @font = value
-          redraw
+          request_auto_redraw
         end
       end
       alias font= font
@@ -70,7 +69,7 @@ module Glimmer
           @color
         else
           @color = Glimmer::LibUI.interpret_color(value)
-          redraw
+          request_auto_redraw
         end
       end
       alias color= color
@@ -81,7 +80,7 @@ module Glimmer
           @background
         else
           @background = Glimmer::LibUI.interpret_color(value)
-          redraw
+          request_auto_redraw
         end
       end
       alias background= background
@@ -92,7 +91,7 @@ module Glimmer
           @underline
         else
           @underline = value
-          redraw
+          request_auto_redraw
         end
       end
       alias underline= underline
@@ -103,7 +102,7 @@ module Glimmer
           @underline_color
         else
           @underline_color = value
-          redraw
+          request_auto_redraw
         end
       end
       alias underline_color= underline_color
@@ -114,12 +113,21 @@ module Glimmer
           @open_type_features
         else
           @open_type_features = value
-          redraw
+          request_auto_redraw
         end
       end
       alias open_type_features= open_type_features
       alias set_open_type_features open_type_features
       
+      def remove_open_type_features
+        return if @removing_open_type_features
+        @removing_open_type_features = true
+        @open_type_features&.destroy
+        @open_type_features = nil
+        request_auto_redraw
+        @removing_open_type_features = false
+      end
+      
       def post_add_content(block = nil)
         block ||= @block
         block_result = block&.call
@@ -189,6 +197,7 @@ module Glimmer
       end
       
       def destroy
+        return if ControlProxy.main_window_proxy&.destroying?
         open_type_features.destroy unless open_type_features.nil?
         @parent_proxy&.children&.delete(self)
       end

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

@@ -36,9 +36,9 @@ module Glimmer
           attr_accessor :current_area_draw_params
         end
         
-        LISTENERS = ['on_draw', 'on_mouse_event', 'on_mouse_move', 'on_mouse_down', 'on_mouse_up', 'on_mouse_drag_start', 'on_mouse_drag', 'on_mouse_drop', 'on_mouse_crossed', 'on_mouse_enter', 'on_mouse_exit', 'on_drag_broken', 'on_key_event', 'on_key_down', 'on_key_up']
+        CUSTOM_LISTENER_NAMES = ['on_draw', 'on_mouse_event', 'on_mouse_move', 'on_mouse_down', 'on_mouse_up', 'on_mouse_drag_start', 'on_mouse_drag', 'on_mouse_drop', 'on_mouse_crossed', 'on_mouse_enter', 'on_mouse_exit', 'on_drag_broken', 'on_key_event', 'on_key_down', 'on_key_up']
         
-        LISTENER_ALIASES = {
+        CUSTOM_LISTENER_NAME_ALIASES = {
           on_drawn: 'on_draw',
           on_mouse_moved: 'on_mouse_move',
           on_mouse_drag_started: 'on_mouse_drag_start',
@@ -105,7 +105,7 @@ module Glimmer
         
         def draw(area_draw_params)
           children.dup.each {|child| child.draw(area_draw_params)}
-          on_draw.each {|listener| listener.call(area_draw_params)}
+          notify_custom_listeners('on_draw', area_draw_params)
         end
         
         def redraw
@@ -156,37 +156,37 @@ module Glimmer
             @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
               area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
               area_mouse_event = area_mouse_event_hash(area_mouse_event)
-              on_mouse_event.each { |listener| listener.call(area_mouse_event)}
-              on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
+              notify_custom_listeners('on_mouse_event', area_mouse_event)
+              notify_custom_listeners('on_mouse_move', area_mouse_event) if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
               unless @last_area_mouse_event.nil?
-                on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
-                on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
-                on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
-                on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
-                on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+                notify_custom_listeners('on_mouse_down', area_mouse_event) if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
+                notify_custom_listeners('on_mouse_up', area_mouse_event) if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
+                notify_custom_listeners('on_mouse_drag_start', area_mouse_event) if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
+                notify_custom_listeners('on_mouse_drag', area_mouse_event) if area_mouse_event[:held] > 0
+                notify_custom_listeners('on_mouse_drop', area_mouse_event) if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
               end
               @last_area_mouse_event = area_mouse_event
             end
             @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
               left = Glimmer::LibUI.integer_to_boolean(left)
-              on_mouse_crossed.each { |listener| listener.call(left) }
+              notify_custom_listeners('on_mouse_crossed', left)
               if left
-                on_mouse_exit.each { |listener| listener.call(left) }
+                notify_custom_listeners('on_mouse_exit', left)
               else
-                on_mouse_enter.each { |listener| listener.call(left) }
+                notify_custom_listeners('on_mouse_enter', left)
               end
             end
             @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
-              on_drag_broken.each { |listener| listener.call }
+              notify_custom_listeners('on_drag_broken')
             end
             @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
               area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
               area_key_event = area_key_event_hash(area_key_event)
-              on_key_event.each { |listener| listener.call(area_key_event) }
+              notify_custom_listeners('on_key_event', area_key_event)
               if area_key_event[:up]
-                on_key_up.each { |listener| listener.call(area_key_event) }
+                notify_custom_listeners('on_key_up', area_key_event)
               else
-                on_key_down.each { |listener| listener.call(area_key_event) }
+                notify_custom_listeners('on_key_down', area_key_event)
               end
             end
             @listeners_installed = true

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

@@ -42,6 +42,7 @@ module Glimmer
         end
         
         def destroy_child(child)
+          child.deregister_all_custom_listeners
           ::LibUI.send("box_delete", @libui, children.index(child))
           ControlProxy.control_proxies.delete(child)
         end

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

@@ -31,6 +31,10 @@ module Glimmer
         # Follows the Proxy Design Pattern
         class BackgroundColorColumnProxy < ControlProxy
           include Column
+          
+          def name
+            'Background Color'
+          end
         end
       end
     end

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

@@ -34,36 +34,8 @@ module Glimmer
           include Column
           include EnableableColumn
           
-          def on_clicked(&block)
-            # TODO consider generalizing into custom listeners and moving to ControlProxy
-            @on_clicked_procs ||= []
-            if block.nil?
-              @on_clicked_procs
-            else
-              @on_clicked_procs << block
-              block
-            end
-          end
-          
-          def can_handle_listener?(listener_name)
-            listener_name == 'on_clicked' || super
-          end
+          CUSTOM_LISTENER_NAMES = ['on_clicked']
           
-          def handle_listener(listener_name, &listener)
-            case listener_name
-            when 'on_clicked'
-              on_clicked(&listener)
-            else
-              super
-            end
-          end
-          
-          def notify_listeners(listener_name, *args)
-            @on_clicked_procs&.each do |on_clicked_proc|
-              on_clicked_proc.call(*args)
-            end
-          end
-              
           private
           
           def build_control

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

@@ -39,6 +39,7 @@ module Glimmer
         end
         
         def destroy_child(child)
+          child.deregister_all_custom_listeners
           ::LibUI.send("form_delete", @libui, children.index(child))
           ControlProxy.control_proxies.delete(child)
         end

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

@@ -34,14 +34,31 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class ImageProxy < ControlProxy
+        class << self
+          # creates or returns existing instance for passed in arguments if parent is nil and block is nil
+          def create(keyword, parent, args, &block)
+            if parent.nil? && block.nil?
+              instances[args] ||= new(keyword, parent, args.dup, &block)
+            else
+              new(keyword, parent, args, &block)
+            end
+          end
+          
+          def instances
+            @@instances = {} unless defined? @@instances
+            @@instances
+          end
+        end
+        
         include Parent
         prepend Transformable
         
-        attr_reader :data, :pixels, :shapes
+        attr_reader :data, :pixels, :shapes, :options
         
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
           @parent_proxy = parent
+          @options = args.last.is_a?(Hash) ? args.pop : {}
           @args = args
           @block = block
           @enabled = true
@@ -76,11 +93,47 @@ module Glimmer
         alias file= file
         alias set_file file
       
+        def x(value = nil)
+          if value.nil?
+            @args.size > 3 ? @args[1] : (@options[:x] || 0)
+          else
+            if @args.size > 3
+              @args[1] = value
+            else
+              @options[:x] = value
+            end
+            if area_image? && @content_added
+              post_add_content
+              request_auto_redraw
+            end
+          end
+        end
+        alias x= x
+        alias set_x x
+      
+        def y(value = nil)
+          if value.nil?
+            @args.size > 3 ? @args[2] : (@options[:y] || 0)
+          else
+            if @args.size > 3
+              @args[2] = value
+            else
+              @options[:y] = value
+            end
+            if area_image? && @content_added
+              post_add_content
+              request_auto_redraw
+            end
+          end
+        end
+        alias y= y
+        alias set_y y
+        
         def width(value = nil)
           if value.nil?
-            @args[1]
+            @args.size > 3 ? @args[3] : (@options[:width] || @args[1])
           else
-            @args[1] = value
+            set_width_variable(value)
             if area_image? && @content_added
               post_add_content
               request_auto_redraw
@@ -92,9 +145,9 @@ module Glimmer
       
         def height(value = nil)
           if value.nil?
-            @args[2]
+            @args.size > 3 ? @args[4] : (@options[:height] || @args[2])
           else
-            @args[2] = value
+            set_height_variable(value)
             if area_image? && @content_added
               post_add_content
               request_auto_redraw
@@ -126,12 +179,34 @@ module Glimmer
         end
         
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end
         
         private
         
+        def set_width_variable(value)
+          if @args.size > 3
+            @args[3] = value
+          elsif @options[:width]
+            @options[:width] = value
+          else
+            @args[1] = value
+          end
+        end
+        
+        def set_height_variable(value)
+          if @args.size > 3
+            @args[4] = value
+          elsif @options[:height]
+            @options[:height] = value
+          else
+            @args[2] = value
+          end
+        end
+        
         def build_control
           unless area_image? # image object
             if file
@@ -164,10 +239,15 @@ module Glimmer
             canvas = ChunkyPNG::Canvas.from_io(f)
             f.close
           end
-          canvas.resample_nearest_neighbor!(width, height) if width && height
+          original_width = canvas.width
+          original_height = canvas.height
+          require 'bigdecimal'
+          calculated_width = ((BigDecimal(height)/BigDecimal(original_height))*original_width).to_i if height && !width
+          calculated_height = ((BigDecimal(width)/BigDecimal(original_width))*original_height).to_i if width && !height
+          canvas.resample_nearest_neighbor!(calculated_width || width, calculated_height || height) if width || height
           @data = canvas.to_rgba_stream
-          @args[1] = canvas.width
-          @args[2] = canvas.height
+          set_width_variable(canvas.width) unless width
+          set_height_variable(canvas.height) unless height
           [@data, width, height]
         end
         
@@ -187,6 +267,8 @@ module Glimmer
           @shapes = []
           original_pixels = @pixels.dup
           indexed_original_pixels = Hash[original_pixels.each_with_index.to_a]
+          x_offset = x
+          y_offset = y
           @pixels.each do |pixel|
             index = indexed_original_pixels[pixel]
             @rectangle_start_x ||= pixel[:x]
@@ -195,9 +277,9 @@ module Glimmer
               @rectangle_width += 1
             else
               if pixel[:x] > 0 && pixel[:color] == original_pixels[index - 1][:color]
-                @shapes << {x: @rectangle_start_x, y: pixel[:y], width: @rectangle_width, height: 1, color: pixel[:color]}
+                @shapes << {x: x_offset + @rectangle_start_x, y: y_offset + pixel[:y], width: @rectangle_width, height: 1, color: pixel[:color]}
               else
-                @shapes << {x: pixel[:x], y: pixel[:y], width: 1, height: 1, color: pixel[:color]}
+                @shapes << {x: x_offset + pixel[:x], y: y_offset + pixel[:y], width: 1, height: 1, color: pixel[:color]}
               end
               @rectangle_width = 1
               @rectangle_start_x = pixel[:x] == width - 1 ? 0 : pixel[:x] + 1

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

@@ -35,29 +35,39 @@ module Glimmer
         
           def handle_listener(listener_name, &listener)
             if listener_name == 'on_clicked'
-              @default_behavior_listener = Proc.new do
-                return_value = listener.call(self)
+              @on_clicked_listeners ||= []
+              @on_clicked_listeners << listener
+              @default_behavior_listener ||= Proc.new do
+                return_value = nil
+                @on_clicked_listeners.each do |l|
+                  return_value = l.call(self)
+                  break if return_value.is_a?(Numeric)
+                end
                 if return_value.is_a?(Numeric)
                   return_value
                 else
                   destroy
+                  ControlProxy.main_window_proxy&.destroy
                   ::LibUI.quit
                   0
                 end
+              end.tap do |default_behavior_listener|
+                ::LibUI.on_should_quit(&default_behavior_listener)
               end
-              ::LibUI.on_should_quit(&@default_behavior_listener)
             end
           end
+          
+          def destroy
+            @on_clicked_listeners&.clear
+            super
+          end
         
           private
           
           def build_control
             @libui = @parent_proxy.append_quit_item(*@args)
-            handle_listener('on_clicked') do
-              ControlProxy.main_window_proxy&.destroy
-              ::LibUI.quit
-              0
-            end
+            # setup default on_clicked listener if no on_clicked listeners are setup
+            handle_listener('on_clicked') {} if @on_clicked_listeners.nil? || @on_clicked_listeners.empty?
           end
         end
       end

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

@@ -33,15 +33,24 @@ module Glimmer
         include Parent
       
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          return if @destroying
+          @destroying = true
+          deregister_all_custom_listeners
           ::LibUI.free_open_type_features(@libui)
-          @parent_proxy&.children&.delete(self)
+          @parent_proxy&.remove_open_type_features
           ControlProxy.control_proxies.delete(self)
+          @destroying = false
         end
         
         def redraw
-          @parent_proxy.redraw
+          @parent_proxy&.redraw
         end
         
+        def request_auto_redraw
+          @parent_proxy&.request_auto_redraw
+        end
+                        
         private
         
         def build_control

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

@@ -31,6 +31,8 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class OpenTypeTagProxy < ControlProxy
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end

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

@@ -140,6 +140,8 @@ module Glimmer
         end
         
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end

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

@@ -36,7 +36,7 @@ module Glimmer
       class TableProxy < ControlProxy
         include Glimmer::FiddleConsumer
         
-        LISTENERS = ['on_changed', 'on_edited']
+        CUSTOM_LISTENER_NAMES = ['on_changed', 'on_edited']
         
         attr_reader :model_handler, :model, :table_params, :columns, :column_attributes
       
@@ -91,18 +91,18 @@ module Glimmer
                 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])}
+                    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)
-                    on_changed.each {|listener| listener.call(row, :inserted, @cell_rows[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)
-                      on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
+                      notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
                     end
                   end
                 end
@@ -145,7 +145,7 @@ module Glimmer
             @column_attributes = model_binding.binding_options[:column_attributes]
           else
             column_attribute_mapping = model_binding.binding_options[:column_attributes].is_a?(Hash) ? model_binding.binding_options[:column_attributes] : {}
-            @column_attributes = columns.map(&:name).map {|column_name| column_attribute_mapping[column_name] || column_name.underscore}
+            @column_attributes = columns.select {|column| column.is_a?(Column)}.map(&:name).map {|column_name| column_attribute_mapping[column_name] || column_name.underscore}
           end
           model_attribute_observer = model_attribute_observer_registration = nil
           model_attribute_observer = Glimmer::DataBinding::Observer.proc do
@@ -208,11 +208,13 @@ 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
-              if OS.windows? && row == cell_rows.count
-                ::LibUI.new_table_value_image((expanded_cell_rows[row - 1] && (expanded_cell_rows[row - 1][column].respond_to?(:libui) ? expanded_cell_rows[row - 1][column].libui : expanded_cell_rows[row - 1][column])))
-              else
-                ::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])))
-              end
+              # 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]
+              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
+              ::LibUI.new_table_value_image(img)
             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))) || 0)
             when Column::ProgressBarColumnProxy
@@ -268,7 +270,7 @@ module Glimmer
                 @cell_rows[row].send(attribute)[1] = ::LibUI.table_value_string(val).to_s
               end
             when Column::ButtonColumnProxy
-              @columns[column].notify_listeners(:on_clicked, row)
+              @columns[column].notify_custom_listeners('on_clicked', row)
             when Column::CheckboxColumnProxy
               column = @columns[column].index
               @cell_rows[row] ||= []
@@ -290,7 +292,7 @@ module Glimmer
                 @cell_rows[row].send(attribute)[0] = ::LibUI.table_value_int(val).to_i == 1
               end
             end
-            on_edited.each {|listener| listener.call(row, @cell_rows[row])}
+            notify_custom_listeners('on_edited', row, @cell_rows[row])
           end
           
           @model = ::LibUI.new_table_model(@model_handler)

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

@@ -60,6 +60,8 @@ module Glimmer
         end
         
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end