glimmer-dsl-libui 0.1.7 → 0.1.11

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

@@ -36,7 +36,18 @@ module Glimmer
           child.halign = 0 if child.halign.nil?
           child.vexpand = false if child.vexpand.nil?
           child.valign = 0 if child.valign.nil?
-          ::LibUI.grid_append(@libui, child.libui, child.left, child.top, child.xspan, child.yspan, Glimmer::LibUI.boolean_to_integer(child.hexpand), child.halign, Glimmer::LibUI.boolean_to_integer(child.vexpand), child.valign)
+          ::LibUI.grid_append(
+            @libui,
+            child.libui,
+            child.left,
+            child.top,
+            child.xspan,
+            child.yspan,
+            Glimmer::LibUI.boolean_to_integer(child.hexpand),
+            Glimmer::LibUI.enum_symbol_to_value(:align, child.halign),
+            Glimmer::LibUI.boolean_to_integer(child.vexpand),
+            Glimmer::LibUI.enum_symbol_to_value(:align, child.valign)
+          )
           children << child
         end
         

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

@@ -128,25 +128,11 @@ module Glimmer
         end
         
         def draw_line_cap
-          case @stroke && @stroke[:cap].to_s
-          when 'round'
-            1
-          when 'square'
-            2
-          else # 'flat'
-            0
-          end
+          Glimmer::LibUI.enum_symbol_to_value(:draw_line_cap, @stroke && @stroke[:cap])
         end
         
         def draw_line_join
-          case @stroke && @stroke[:join].to_s
-          when 'round'
-            1
-          when 'bevel'
-            2
-          else # 'miter'
-            0
-          end
+          Glimmer::LibUI.enum_symbol_to_value(:draw_line_join, @stroke && @stroke[:join])
         end
         
         def destroy
@@ -165,20 +151,7 @@ module Glimmer
         end
         
         def init_draw_brush(draw_brush, draw_brush_args)
-          case draw_brush_args[:type]
-          when Integer
-            draw_brush.Type = draw_brush_args[:type]
-          when :solid, 'solid'
-            draw_brush.Type = 0
-          when :linear_gradient, 'linear_gradient'
-            draw_brush.Type = 1
-          when :radial_gradient, 'radial_gradient'
-            draw_brush.Type = 2
-          when :image, 'image'
-            draw_brush.Type = 3
-          else
-            draw_brush.Type = 0
-          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

data/lib/glimmer/libui/control_proxy.rb

@@ -141,7 +141,8 @@ module Glimmer
 
       def can_handle_listener?(listener_name)
         ::LibUI.respond_to?("#{libui_api_keyword}_#{listener_name}") ||
-          ::LibUI.respond_to?("control_#{listener_name}")
+          ::LibUI.respond_to?("control_#{listener_name}") ||
+          has_custom_listener?(listener_name)
       end
       
       def handle_listener(listener_name, &listener)
@@ -150,6 +151,34 @@ module Glimmer
           ::LibUI.send("#{libui_api_keyword}_#{listener_name}", @libui, &safe_listener)
         elsif ::LibUI.respond_to?("control_#{listener_name}")
           ::LibUI.send("control_#{listener_name}", @libui, &safe_listener)
+        elsif has_custom_listener?(listener_name)
+          handle_custom_listener(listener_name, &listener)
+        end
+      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)
+      end
+      
+      def custom_listeners
+        self.class.constants.include?(:LISTENERS) ? self.class::LISTENERS : []
+      end
+      
+      def custom_listener_aliases
+        self.class.constants.include?(:LISTENER_ALIASES) ? self.class::LISTENER_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"
+        instance_variable_set(instance_variable_name, []) if instance_variable_get(instance_variable_name).nil?
+        if listener.nil?
+          instance_variable_get(instance_variable_name)
+        else
+          instance_variable_get(instance_variable_name) << listener
+          listener
         end
       end
       
@@ -160,6 +189,7 @@ module Glimmer
             (append_properties.include?(method_name.to_s.sub(/\?$/, '')) && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, ''))) ||
             append_properties.include?(method_name.to_s.sub(/=$/, ''))
           ) ||
+          can_handle_listener?(method_name.to_s) ||
           super(method_name, true)
       end
       
@@ -178,6 +208,8 @@ module Glimmer
         elsif append_properties.include?(method_name.to_s) ||
             append_properties.include?(method_name.to_s.sub(/(=|\?)$/, ''))
           append_property(method_name, *args)
+        elsif can_handle_listener?(method_name.to_s)
+          handle_listener(method_name.to_s, &block)
         else
           super
         end
@@ -248,6 +280,7 @@ module Glimmer
         if value.nil?
           @enabled
         elsif value != @enabled
+          @enabled = value == 1 || value
           if value == 1 || value
             send_to_libui('enable')
           else

data/lib/glimmer/libui.rb

@@ -87,6 +87,23 @@ module Glimmer
         end
         value
       end
+      
+      # Returns ruby underscored symbols for enum values starting with enum name (camelcase, e.g. 'ext_key')
+      def enum_symbols(enum_name)
+        enum_name = enum_name.to_s.underscore.to_sym
+        @enum_symbols ||= {}
+        @enum_symbols[enum_name] ||= ::LibUI.constants.select { |c| c.to_s.start_with?(enum_name.to_s.camelcase(:upper)) }.map { |c| c.to_s.underscore.sub("#{enum_name}_", '').to_sym }
+      end
+      
+      def enum_symbol_to_value(enum_name, enum_symbol, default_index: 0)
+        if enum_symbol.is_a?(Integer)
+          enum_symbol
+        elsif enum_symbols(enum_name).include?(enum_symbol.to_s.to_sym)
+          ::LibUI.const_get("#{enum_name}_#{enum_symbol}".camelcase(:upper))
+        else
+          enum_symbol_to_value(enum_name, enum_symbols(enum_name)[default_index])
+        end
+      end
     end
   end
 end

data/lib/glimmer-dsl-libui.rb

@@ -29,6 +29,7 @@ require 'glimmer'
 require 'color'
 require 'os'
 require 'array_include_methods'
+require 'facets/hash/stringify_keys'
 require 'libui'
 
 # Internal requires

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.11
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-03 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.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +238,7 @@ files:
 - examples/form_table.rb
 - examples/grid.rb
 - examples/histogram.rb
+- examples/login.rb
 - examples/meta_example.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
@@ -256,6 +257,7 @@ files:
 - lib/glimmer/libui.rb
 - lib/glimmer/libui/control_proxy.rb
 - lib/glimmer/libui/control_proxy/area_proxy.rb
+- lib/glimmer/libui/control_proxy/area_proxy/scrolling_area_proxy.rb
 - lib/glimmer/libui/control_proxy/box.rb
 - lib/glimmer/libui/control_proxy/box/horizontal_box_proxy.rb
 - lib/glimmer/libui/control_proxy/box/vertical_box_proxy.rb
@@ -278,6 +280,9 @@ files:
 - lib/glimmer/libui/control_proxy/editable_column.rb
 - lib/glimmer/libui/control_proxy/editable_combobox_proxy.rb
 - lib/glimmer/libui/control_proxy/enableable_column.rb
+- lib/glimmer/libui/control_proxy/entry_proxy.rb
+- lib/glimmer/libui/control_proxy/entry_proxy/password_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/entry_proxy/search_entry_proxy.rb
 - lib/glimmer/libui/control_proxy/font_button_proxy.rb
 - lib/glimmer/libui/control_proxy/form_proxy.rb
 - lib/glimmer/libui/control_proxy/grid_proxy.rb