glimmer-dsl-libui 0.4.11 → 0.4.15

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

@@ -29,6 +29,10 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class WindowProxy < ControlProxy
+        CUSTOM_LISTENER_NAMES = ['on_destroy']
+        CUSTOM_LISTENER_NAME_ALIASES = {
+          on_destroyed: 'on_destroy',
+        }
         DEFAULT_TITLE = ''
         DEFAULT_WIDTH = 190
         DEFAULT_HEIGHT = 150
@@ -44,22 +48,20 @@ module Glimmer
         end
         
         def destroy
+          return if @destroying
+          @destroying = true
+          @on_closing_listeners&.clear
           super
           ControlProxy.image_proxies.each { |image_proxy| ::LibUI.free_image(image_proxy.libui) unless image_proxy.area_image? }
-          @on_destroy_procs&.each { |on_destroy_proc| on_destroy_proc.call(self)}
+          notify_custom_listeners('on_destroy', self)
+          deregister_custom_listeners('on_destroy')
+          @destroying = false
         end
         
-        def on_destroy(&block)
-          # TODO look into a way to generalize this logic for multiple listeners
-          @on_destroy_procs ||= []
-          if block.nil?
-            @on_destroy_procs
-          else
-            @on_destroy_procs << block
-            block
-          end
+        def destroying?
+          @destroying
         end
-      
+        
         def show
           super
           unless @shown_at_least_once
@@ -69,29 +71,29 @@ module Glimmer
           end
         end
         
-        def can_handle_listener?(listener_name)
-          listener_name == 'on_destroy' || super
-        end
-        
         def handle_listener(listener_name, &listener)
           case listener_name
-          when 'on_destroy'
-            on_destroy(&listener)
-          else
-            default_behavior_listener = nil
-            if listener_name == 'on_closing'
-              default_behavior_listener = Proc.new do
-                return_value = listener.call(self)
-                if return_value.is_a?(Numeric)
-                  return_value
-                else
-                  destroy
-                  ::LibUI.quit
-                  0
-                end
+          when 'on_closing'
+            @on_closing_listeners ||= []
+            @on_closing_listeners << listener
+            @default_behavior_listener ||= Proc.new do
+              return_value = nil
+              @on_closing_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
+                ::LibUI.quit
+                0
               end
+            end.tap do |default_behavior_listener|
+              super(listener_name, &default_behavior_listener)
             end
-            super(listener_name, &(default_behavior_listener || listener))
+          else
+            super
           end
         end
         
@@ -168,11 +170,8 @@ module Glimmer
           @height = construction_args[2]
           @libui = ControlProxy.new_control(@keyword, construction_args)
           @libui.tap do
-            handle_listener('on_closing') do
-              destroy
-              ::LibUI.quit
-              0
-            end
+            # setup default on_closing listener if no on_closing listeners are setup
+            handle_listener('on_closing') {} if @on_closing_listeners.nil? || @on_closing_listeners.empty?
           end
         end
       end

data/lib/glimmer/libui/control_proxy.rb

@@ -169,31 +169,49 @@ module Glimmer
       def handle_listener(listener_name, &listener)
         safe_listener = Proc.new { listener.call(self) }
         if ::LibUI.respond_to?("#{libui_api_keyword}_#{listener_name}")
-          ::LibUI.send("#{libui_api_keyword}_#{listener_name}", @libui, &safe_listener)
+          if listeners[listener_name].nil?
+            ::LibUI.send("#{libui_api_keyword}_#{listener_name}", @libui) do
+              listeners_for(listener_name).map { |listener| listener.call }.last
+            end
+          end
+          listeners_for(listener_name) << safe_listener
         elsif ::LibUI.respond_to?("control_#{listener_name}")
-          ::LibUI.send("control_#{listener_name}", @libui, &safe_listener)
+          if listeners[listener_name].nil?
+            ::LibUI.send("control_#{listener_name}", @libui) do
+              listeners_for(listener_name).map { |listener| listener.call }.last
+            end
+          end
+          listeners_for(listener_name) << safe_listener
         elsif has_custom_listener?(listener_name)
           handle_custom_listener(listener_name, &listener)
         end
       end
       
+      def listeners
+        @listeners ||= {}
+      end
+      
+      def listeners_for(listener_name)
+        listeners[listener_name] ||= []
+      end
+      
       def has_custom_listener?(listener_name)
         listener_name = listener_name.to_s
-        custom_listeners.include?(listener_name) || custom_listener_aliases.stringify_keys.keys.include?(listener_name)
+        custom_listener_names.include?(listener_name) || custom_listener_name_aliases.stringify_keys.keys.include?(listener_name)
       end
       
-      def custom_listeners
-        self.class.constants.include?(:LISTENERS) ? self.class::LISTENERS : []
+      def custom_listener_names
+        self.class.constants.include?(:CUSTOM_LISTENER_NAMES) ? self.class::CUSTOM_LISTENER_NAMES : []
       end
       
-      def custom_listener_aliases
-        self.class.constants.include?(:LISTENER_ALIASES) ? self.class::LISTENER_ALIASES : {}
+      def custom_listener_name_aliases
+        self.class.constants.include?(:CUSTOM_LISTENER_NAME_ALIASES) ? self.class::CUSTOM_LISTENER_NAME_ALIASES : {}
       end
       
       def handle_custom_listener(listener_name, &listener)
         listener_name = listener_name.to_s
-        listener_name = custom_listener_aliases.stringify_keys[listener_name] || listener_name
-        instance_variable_name = "@#{listener_name}_procs"
+        listener_name = custom_listener_name_aliases.stringify_keys[listener_name] || listener_name
+        instance_variable_name = "@#{listener_name}_procs" # TODO ensure clearing custom listeners on destroy of a control
         instance_variable_set(instance_variable_name, []) if instance_variable_get(instance_variable_name).nil?
         if listener.nil?
           instance_variable_get(instance_variable_name)
@@ -203,6 +221,21 @@ module Glimmer
         end
       end
       
+      def notify_custom_listeners(listener_name, *args)
+        handle_custom_listener(listener_name).each do |listener|
+          listener.call(*args)
+        end
+      end
+      
+      def deregister_custom_listeners(listener_name)
+        handle_custom_listener(listener_name).clear
+      end
+      
+      # deregisters all custom listeners except on_destroy, which can only be deregistered after destruction of a control, using deregister_custom_listeners
+      def deregister_all_custom_listeners
+        (custom_listener_names - ['on_destroy']).each { |listener_name| deregister_custom_listeners(listener_name) }
+      end
+      
       def respond_to?(method_name, *args, &block)
         respond_to_libui?(method_name, *args, &block) ||
           (
@@ -289,6 +322,8 @@ module Glimmer
       end
       
       def destroy
+        # TODO exclude menus from this initial return
+        return if !is_a?(ControlProxy::WindowProxy) && ControlProxy.main_window_proxy&.destroying?
         data_binding_model_attribute_observer_registrations.each(&:deregister)
         if parent_proxy.nil?
           default_destroy
@@ -302,6 +337,7 @@ module Glimmer
       end
       
       def default_destroy
+        deregister_all_custom_listeners
         send_to_libui('destroy')
         ControlProxy.control_proxies.delete(self)
       end

data/lib/glimmer/libui/shape.rb

@@ -116,6 +116,7 @@ module Glimmer
       end
       
       def destroy
+        return if ControlProxy.main_window_proxy&.destroying?
         @parent.children.delete(self)
       end
       

data/lib/glimmer/libui.rb

@@ -63,7 +63,7 @@ module Glimmer
           value[:b] = value.delete(:blue) if value[:blue]
           value[:a] = value.delete(:alpha) if value[:alpha]
           value
-        elsif value.is_a?(String) && !value.start_with?('0x') && !value.downcase.match(/^((([1-9a-f]){6})|(([1-9a-f]){3}))$/)
+        elsif value.is_a?(String) && !value.start_with?('0x') && !value.start_with?('#') && !value.downcase.match(/^((([1-9a-f]){6})|(([1-9a-f]){3}))$/)
           color = Color::RGB.extract_colors(value).first
           color.nil? ? {} : {
             r: color.red,
@@ -79,11 +79,11 @@ module Glimmer
     
       def hex_to_rgb(value)
         if value.is_a?(String)
+          value = "0x#{value[1..-1]}" if value.start_with?('#')
           if !value.start_with?('0x')
             value = value.chars.map {|char| [char, char]}.flatten.join if value.length == 3
             value = "0x#{value}"
           end
-          value = "0x#{value[1..-1]}" if value.start_with?('#')
           value = value.to_i(16)
         end
         if value.is_a?(Integer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.15
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -237,10 +237,13 @@ files:
 - examples/basic_table_checkbox_text.rb
 - examples/basic_table_color.rb
 - examples/basic_table_color2.rb
+- examples/basic_table_color3.rb
 - examples/basic_table_image.rb
 - examples/basic_table_image2.rb
+- examples/basic_table_image3.rb
 - examples/basic_table_image_text.rb
 - examples/basic_table_image_text2.rb
+- examples/basic_table_image_text3.rb
 - examples/basic_table_progress_bar.rb
 - examples/basic_transform.rb
 - examples/basic_transform2.rb