glimmer-dsl-libui 0.2.10 → 0.2.14

data/lib/glimmer/libui/control_proxy.rb

@@ -37,7 +37,6 @@ module Glimmer
         end
         
         def widget_proxy_class(keyword)
-          class_name = constant_symbol(keyword)
           descendant_keyword_constant_map[keyword] || ControlProxy
         end
         
@@ -72,7 +71,7 @@ module Glimmer
         end
         
         def descendant_keyword_constant_map
-          @descendant_keyword_constant_map ||= map_descendant_keyword_constants_for(self)
+          @descendant_keyword_constant_map ||= add_aliases_to_keyword_constant_map(map_descendant_keyword_constants_for(self))
         end
         
         def reset_descendant_keyword_constant_map
@@ -91,8 +90,22 @@ module Glimmer
           end
           accumulator
         end
+        
+        private
+        
+        def add_aliases_to_keyword_constant_map(keyword_constant_map)
+          KEYWORD_ALIASES.each do |keyword, alias_keyword|
+            keyword_constant_map[alias_keyword] = keyword_constant_map[keyword]
+          end
+          keyword_constant_map
+        end
       end
       
+      KEYWORD_ALIASES = {
+        'msg_box'       => 'message_box',
+        'msg_box_error' => 'message_box_error',
+      }
+      
       BOOLEAN_PROPERTIES = %w[
         padded
         checked
@@ -223,6 +236,7 @@ module Glimmer
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}") && !args.empty?
           property = method_name.to_s.sub(/=$/, '')
           args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
+          args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
           if property.to_s == 'checked'
             current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui))
             new_value = Glimmer::LibUI.integer_to_boolean(args[0])
@@ -239,6 +253,7 @@ module Glimmer
         elsif ::LibUI.respond_to?("control_set_#{method_name.to_s.sub(/=$/, '')}")
           property = method_name.to_s.sub(/=$/, '')
           args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
+          args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
           ::LibUI.send("control_set_#{method_name.to_s.sub(/=$/, '')}", @libui, *args)
         elsif ::LibUI.respond_to?("control_#{method_name}") && !args.empty?
           ::LibUI.send("control_#{method_name}", @libui, *args)

data/lib/glimmer/libui/shape/arc.rb

@@ -36,7 +36,11 @@ module Glimmer
           if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
             ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
           else
-            ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+            if OS.windows? && parent.children.find {|child| child.is_a?(Arc)} == self
+              ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
+            else
+              ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+            end
           end
           super
         end

data/lib/glimmer/libui/shape/circle.rb

@@ -36,7 +36,11 @@ module Glimmer
           if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
             ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
           else
-            ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+            if OS.windows? && parent.children.find {|child| child.is_a?(Circle)} == self
+              ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
+            else
+              ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+            end
           end
           super
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.14
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -190,9 +190,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: Glimmer DSL for LibUI - Prerequisite-Free Ruby Desktop Development GUI
-  Library (No need to pre-install any prerequisites. Just install the gem and have
-  platform-independent native GUI that just works!)
+description: Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI
+  Library) - No need to pre-install any prerequisites. Just install the gem and have
+  platform-independent native GUI that just works! Glimmer DSL for LibUI aims to provide
+  declarative DSL syntax that visually maps to GUI control hierarchy, convention over
+  configuration via smart defaults, automation of low-level details, requiring the
+  least amount of syntax possible to build GUI, and custom keyword support.
 email: andy.am@gmail.com
 executables:
 - girb
@@ -364,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI