glimmer-dsl-libui 0.2.11 → 0.2.15

data/examples/area_gallery3.rb

@@ -56,11 +56,9 @@ window('Area Gallery', 400, 400) {
         stroke r: 0, g: 0, b: 0, thickness: 2
       }
       text(160, 40, 100) { # x, y, width
-        string {
+        string('Area Gallery') {
           font family: 'Times', size: 14
           color :black
-          
-          'Area Gallery'
         }
       }
     end

data/examples/basic_draw_text2.rb

@@ -16,7 +16,6 @@ class BasicDrawText
       else
         color r: 0, g: 128, b: 0, a: 0.7
       end
-      
       block.call + "\n\n"
     }
   end

data/examples/basic_table_button.rb

@@ -12,7 +12,7 @@ data = [
   %w[cow moo delete]
 ]
 
-window('Animal sounds', 300, 200) {
+window('Animal sounds', 400, 200) {
   horizontal_box {
     table {
       text_column('Animal')

data/examples/basic_table_checkbox.rb

@@ -12,7 +12,7 @@ data = [
   ['cow', 'moo', true]
 ]
 
-window('Animal sounds', 300, 200) {
+window('Animal sounds', 400, 200) {
   horizontal_box {
     table {
       text_column('Animal')

data/examples/basic_table_image.rb

@@ -14,6 +14,7 @@ IMAGE_ROWS = []
 50.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
   puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
   f = URI.open(url)
   canvas = ChunkyPNG::Canvas.from_io(f)
   f.close

data/examples/basic_table_image_text.rb

@@ -14,6 +14,7 @@ IMAGE_ROWS = []
 5.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
   puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
   f = URI.open(url)
   canvas = ChunkyPNG::Canvas.from_io(f)
   f.close

data/examples/color_the_circles.rb

@@ -5,8 +5,8 @@ class ColorTheCircles
   
   WINDOW_WIDTH = 800
   WINDOW_HEIGHT = 600
-  CIRCLE_MIN_RADIUS = 15
-  CIRCLE_MAX_RADIUS = 50
+  SHAPE_MIN_SIZE = 15
+  SHAPE_MAX_SIZE = 75
   MARGIN_WIDTH = 55
   MARGIN_HEIGHT = 155
   TIME_MAX_EASY = 4
@@ -27,15 +27,17 @@ class ColorTheCircles
   
   def register_observers
     observer = Glimmer::DataBinding::Observer.proc do |new_score|
-      @score_label.text = new_score.to_s
-      if new_score == -20
-        @game_over = true
-        msg_box('You Lost!', 'Sorry! Your score reached -20')
-        restart_game
-      elsif new_score == 0
-        @game_over = true
-        msg_box('You Won!', 'Congratulations! Your score reached 0')
-        restart_game
+      Glimmer::LibUI.queue_main do
+        @score_label.text = new_score.to_s
+        if new_score == -20
+          @game_over = true
+          msg_box('You Lost!', 'Sorry! Your score reached -20')
+          restart_game
+        elsif new_score == 0
+          @game_over = true
+          msg_box('You Won!', 'Congratulations! Your score reached 0')
+          restart_game
+        end
       end
     end
     observer.observe(self, :score) # automatically enhances self to become Glimmer::DataBinding::ObservableModel and notify observer on score attribute changes
@@ -58,12 +60,12 @@ class ColorTheCircles
   end
   
   def add_circle
-    circle_x_center = rand * (WINDOW_WIDTH - MARGIN_WIDTH - CIRCLE_MAX_RADIUS) + CIRCLE_MAX_RADIUS
-    circle_y_center = rand * (WINDOW_HEIGHT - MARGIN_HEIGHT - CIRCLE_MAX_RADIUS) + CIRCLE_MAX_RADIUS
-    circle_radius = rand * (CIRCLE_MAX_RADIUS - CIRCLE_MIN_RADIUS) + CIRCLE_MIN_RADIUS
+    circle_x = rand * (WINDOW_WIDTH - MARGIN_WIDTH - SHAPE_MAX_SIZE) + SHAPE_MAX_SIZE
+    circle_y = rand * (WINDOW_HEIGHT - MARGIN_HEIGHT - SHAPE_MAX_SIZE) + SHAPE_MAX_SIZE
+    circle_size = rand * (SHAPE_MAX_SIZE - SHAPE_MIN_SIZE) + SHAPE_MIN_SIZE
     stroke_color = Glimmer::LibUI.x11_colors.sample
     @circles_data << {
-      args: [circle_x_center, circle_y_center, circle_radius],
+      args: [circle_x, circle_y, circle_size],
       fill: nil,
       stroke: stroke_color
     }
@@ -79,7 +81,7 @@ class ColorTheCircles
   
   def color_circle(x, y)
     clicked_circle_data = @circles_data.find do |circle_data|
-      circle_data[:fill].nil? && circle_data[:circle].include?(x, y)
+      circle_data[:fill].nil? && circle_data[:circle]&.include?(x, y)
     end
     if clicked_circle_data
       clicked_circle_data[:fill] = clicked_circle_data[:stroke]
@@ -95,7 +97,7 @@ class ColorTheCircles
     last_colored_circle_data_index = @circles_data.index(last_colored_circle_data) || -1
     @circles_data.insert(last_colored_circle_data_index + 1, removed_colored_circle_data)
   end
-  
+
   def launch
     menu('Actions') {
       menu_item('Restart') {
@@ -190,24 +192,24 @@ class ColorTheCircles
           vexpand true
           halign :fill
           valign :fill
-          
+
           on_draw do |area_draw_params|
             path {
               rectangle(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT)
-              
+
               fill :white
             }
-            
+
             @circles_data.each do |circle_data|
               path {
                 circle_data[:circle] = circle(*circle_data[:args])
-                
+
                 fill circle_data[:fill]
                 stroke circle_data[:stroke]
               }
             end
           end
-          
+
           on_mouse_down do |area_mouse_event|
             color_circle(area_mouse_event[:x], area_mouse_event[:y])
           end

data/examples/control_gallery.rb

@@ -9,6 +9,7 @@ menu('File') {
     on_clicked do
       file = open_file
       puts file unless file.nil?
+      $stdout.flush # for Windows
     end
   }
 
@@ -16,6 +17,7 @@ menu('File') {
     on_clicked do
       file = save_file
       puts file unless file.nil?
+      $stdout.flush # for Windows
     end
   }
   
@@ -98,6 +100,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
 
               on_changed do |s|
                 puts "New Spinbox value: #{s.value}"
+                $stdout.flush # for Windows
               end
             }
 
@@ -107,6 +110,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
               on_changed do |s|
                 v = s.value
                 puts "New Slider value: #{v}"
+                $stdout.flush # for Windows
                 @progress_bar.value = v
               end
             }
@@ -125,6 +129,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
 
               on_selected do |c|
                 puts "New combobox selection: #{c.selected}"
+                $stdout.flush # for Windows
               end
             }
 
@@ -147,6 +152,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
 
                 on_changed do |e|
                   puts "Current textbox data: '#{e.text}'"
+                  $stdout.flush # for Windows
                 end
               }
             }

data/examples/meta_example.rb

@@ -42,15 +42,20 @@ class MetaExample
   end
   
   def run_example(example)
-    command = "ruby -r #{glimmer_dsl_libui_file} #{example} 2>&1"
-    result = ''
-    IO.popen(command) do |f|
-      f.each_line do |line|
-        result << line
-        puts line
+    Thread.new do
+      command = "ruby -r #{glimmer_dsl_libui_file} #{example} 2>&1"
+      result = ''
+      IO.popen(command) do |f|
+        sleep(0.0001) # yield to main thread
+        f.each_line do |line|
+          result << line
+          puts line
+          $stdout.flush # for Windows
+          sleep(0.0001) # yield to main thread
+        end
       end
+      Glimmer::LibUI.queue_main { msg_box('Error Running Example', result) } if result.downcase.include?('error')
     end
-    msg_box('Error Running Example', result) if result.downcase.include?('error')
   end
   
   def launch

data/lib/glimmer/dsl/libui/control_expression.rb

@@ -33,6 +33,8 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
+          @@inverted_keyword_aliases = Glimmer::LibUI::ControlProxy::KEYWORD_ALIASES.invert unless defined?(@@inverted_keyword_aliases)
+          keyword = @@inverted_keyword_aliases[keyword] || keyword
           Glimmer::LibUI::ControlProxy.create(keyword, parent, args, &block)
         end
         

data/lib/glimmer/dsl/libui/string_expression.rb

@@ -32,11 +32,18 @@ module Glimmer
         
         def can_interpret?(parent, keyword, *args, &block)
           super and
-            parent.is_a?(Glimmer::LibUI::ControlProxy::TextProxy)
+            (
+              parent.is_a?(Glimmer::LibUI::ControlProxy::TextProxy) or
+              parent.is_a?(Glimmer::LibUI::AttributedString)
+            )
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::LibUI::AttributedString.new(keyword, parent, args, &block)
+          if parent.is_a?(Glimmer::LibUI::ControlProxy::TextProxy)
+            Glimmer::LibUI::AttributedString.new(keyword, parent, args, &block)
+          else
+            parent.string = args.join
+          end
         end
         
         def add_content(parent, keyword, *args, &block)

data/lib/glimmer/libui/attributed_string.rb

@@ -27,7 +27,6 @@ require 'glimmer/libui/control_proxy/transformable'
 module Glimmer
   module LibUI
     class AttributedString
-      attr_accessor :string
       attr_reader :block, :keyword, :parent_proxy, :args
     
       def initialize(keyword, parent_proxy, args, &block)
@@ -39,6 +38,17 @@ module Glimmer
         post_add_content if @block.nil?
       end
       
+      def string(value = nil)
+        if value.nil?
+          @string
+        else
+          @string = value
+          redraw
+        end
+      end
+      alias string= string
+      alias set_string string
+      
       def font(value = nil)
         if value.nil?
           @font
@@ -106,7 +116,7 @@ module Glimmer
       alias set_open_type_features open_type_features
       
       def post_add_content
-        block_result = block&.call
+        block_result = @block&.call
         @string = block_result if block_result.is_a?(String)
         @parent_proxy&.post_initialize_child(self)
       end
@@ -141,16 +151,26 @@ module Glimmer
           end
         end
         unless font.nil?
-          family_attribute = ::LibUI.new_family_attribute(font[:family])
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, family_attribute, @start, @start + @string.size)
-          size_attribute = ::LibUI.new_size_attribute(font[:size])
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, size_attribute, @start, @start + @string.size)
-          weight_attribute = ::LibUI.new_weight_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_weight, font[:weight]))
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, weight_attribute, @start, @start + @string.size)
-          italic_attribute = ::LibUI.new_italic_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_italic, font[:italic]))
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, italic_attribute, @start, @start + @string.size)
-          stretch_attribute = ::LibUI.new_stretch_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_stretch, font[:stretch]))
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, stretch_attribute, @start, @start + @string.size)
+          if font[:family]
+            family_attribute = ::LibUI.new_family_attribute(font[:family])
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, family_attribute, @start, @start + @string.size)
+          end
+          if font[:size]
+            size_attribute = ::LibUI.new_size_attribute(font[:size])
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, size_attribute, @start, @start + @string.size)
+          end
+          if font[:weight]
+            weight_attribute = ::LibUI.new_weight_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_weight, font[:weight]))
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, weight_attribute, @start, @start + @string.size)
+          end
+          if font[:italic]
+            italic_attribute = ::LibUI.new_italic_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_italic, font[:italic]))
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, italic_attribute, @start, @start + @string.size)
+          end
+          if font[:stretch]
+            stretch_attribute = ::LibUI.new_stretch_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_stretch, font[:stretch]))
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, stretch_attribute, @start, @start + @string.size)
+          end
         end
         unless open_type_features.nil?
           open_type_features_attribute = ::LibUI.new_features_attribute(open_type_features.libui)

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

@@ -37,6 +37,7 @@ module Glimmer
         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']
+        
         LISTENER_ALIASES = {
           on_drawn: 'on_draw',
           on_mouse_moved: 'on_mouse_move',
@@ -49,6 +50,30 @@ module Glimmer
           on_drag_break: 'on_drag_broken',
         }
         
+        SHIFTED_KEY_CODE_CHARS = {
+          '`' => '~',
+          '1' => '!',
+          '2' => '@',
+          '3' => '#',
+          '4' => '$',
+          '5' => '%',
+          '6' => '^',
+          '7' => '&',
+          '8' => '*',
+          '9' => '(',
+          '10' => ')',
+          '-' => '_',
+          '=' => '+',
+          ',' => '<',
+          '.' => '>',
+          '/' => '?',
+          ';' => ':',
+          "'" => '"',
+          '[' => '{',
+          ']' => '}',
+          "\\" => '|',
+        }
+
         include Glimmer::FiddleConsumer
         include Parent
         prepend Transformable
@@ -164,19 +189,27 @@ module Glimmer
         end
         
         def area_key_event_hash(area_key_event)
+          modifiers = modifiers_to_symbols(area_key_event.Modifiers)
           {
-            key: key_to_char(area_key_event.Key),
+            key: key_to_char(area_key_event.Key, modifiers),
             key_value: area_key_event.Key,
             ext_key: ext_key_to_symbol(area_key_event.ExtKey),
             ext_key_value: area_key_event.ExtKey,
             modifier: modifiers_to_symbols(area_key_event.Modifier).first,
-            modifiers: modifiers_to_symbols(area_key_event.Modifiers),
+            modifiers: modifiers,
             up: Glimmer::LibUI.integer_to_boolean(area_key_event.Up),
           }
         end
         
-        def key_to_char(key)
-          key.chr if key > 0
+        def key_to_char(key, modifiers = [])
+          if key > 0
+            char = key.chr
+            if modifiers == [:shift]
+              SHIFTED_KEY_CODE_CHARS[char]
+            else
+              char
+            end
+          end
         end
         
         def ext_key_to_symbol(ext_key_value)

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

@@ -84,7 +84,7 @@ module Glimmer
             @cell_rows = rows
             @cell_rows.tap do
               @last_cell_rows = array_deep_clone(@cell_rows)
-              Glimmer::DataBinding::Observer.proc do
+              Glimmer::DataBinding::Observer.proc do |new_cell_rows|
                 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)
@@ -103,8 +103,9 @@ module Glimmer
                     end
                   end
                 end
+                @last_last_cell_rows = array_deep_clone(@last_cell_rows)
                 @last_cell_rows = array_deep_clone(@cell_rows)
-              end.observe(self, :cell_rows)
+              end.observe(self, :cell_rows, recursive: true)
             end
           end
         end
@@ -112,7 +113,11 @@ module Glimmer
         alias set_cell_rows cell_rows
         
         def expanded_cell_rows
-          cell_rows.map do |row|
+          expand(cell_rows)
+        end
+        
+        def expand(cell_rows)
+          cell_rows.to_a.map do |row|
             row.flatten(1)
           end
         end
@@ -146,23 +151,39 @@ module Glimmer
               3
             end
           end
-          @model_handler.NumRows      = fiddle_closure_block_caller(4) { cell_rows.count }
+          @model_handler.NumRows      = fiddle_closure_block_caller(4) do
+            # Note: there is a double-delete bug in Windows when performing table_model_row_deleted, which requires pre-adding and extra empty row
+            cell_rows.count + (OS.windows? ? 1 : 0)
+          end
           @model_handler.CellValue    = fiddle_closure_block_caller(1, [1, 1, 4, 4]) do |_, _, row, column|
             the_cell_rows = expanded_cell_rows
             case @columns[column]
             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
-              ::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])))
+              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
             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)))
+              ::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
-              ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column].to_i)))
+              value = (expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_i
+              expanded_last_last_cell_rows = expand(@last_last_cell_rows)
+              old_value = (expanded_last_last_cell_rows[row] && expanded_last_last_cell_rows[row][column]).to_i
+              if OS.windows? && old_value == -1 && value >= 0
+                Glimmer::Config.logger.error('Switching a progress bar value from -1 to a positive value is not supported on Windows')
+                cell_rows[row][column] = -1
+                ::LibUI.new_table_value_int(old_value)
+              else
+                ::LibUI.new_table_value_int((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_i)
+              end
             when Column::BackgroundColorColumnProxy
-              background_color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              background_color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column]) || {r: 255, g: 255, b: 255}
               ::LibUI.new_table_value_color(background_color[:r] / 255.0, background_color[:g] / 255.0, background_color[:b] / 255.0, background_color[:a] || 1.0)
             when :color
-              color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column]) || {r: 0, g: 0, b: 0}
               ::LibUI.new_table_value_color(color[:r] / 255.0, color[:g] / 255.0, color[:b] / 255.0, color[:a] || 1.0)
             end
           end
@@ -182,7 +203,6 @@ module Glimmer
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
             end
-            on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
             on_edited.each {|listener| listener.call(row, @cell_rows[row])}
           end
           

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

data/lib/glimmer/libui.rb

@@ -27,11 +27,11 @@ module Glimmer
       include Glimmer::FiddleConsumer
       
       def integer_to_boolean(int, allow_nil: true)
-        int.nil? ? (allow_nil ? nil : false) : ((int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : int == 1)
+        int.nil? ? (allow_nil ? nil : false) : ((int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : (int.is_a?(Integer) ? int == 1 : (allow_nil ? nil : false)))
       end
       
       def boolean_to_integer(bool, allow_nil: true)
-        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool == true ? 1 : 0))
+        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool.is_a?(TrueClass) || bool.is_a?(FalseClass) ? (bool == true ? 1 : 0) : (allow_nil ? nil : 0)))
       end
       
       def degrees_to_radians(degrees)