glimmer-dsl-libui 0.2.9 → 0.2.13

data/examples/meta_example.rb

@@ -1,7 +1,6 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 require 'facets'
+require 'fileutils'
 
 class MetaExample
   include Glimmer
@@ -42,6 +41,19 @@ class MetaExample
     examples[@selected_example_index]
   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
+        $stdout.flush # for Windows
+      end
+    end
+    msg_box('Error Running Example', result) if result.downcase.include?('error')
+  end
+  
   def launch
     window('Meta-Example', 700, 500) {
       margined true
@@ -50,16 +62,16 @@ class MetaExample
         vertical_box {
           stretchy false
           
-          @rbs = radio_buttons {
+          @example_radio_buttons = radio_buttons {
             stretchy false
             items examples_with_versions
             selected @selected_example_index
             
             on_selected do
-              @selected_example_index = @rbs.selected
+              @selected_example_index = @example_radio_buttons.selected
               example = selected_example
-              @nwme.text = File.read(file_path_for(example))
-              @sb.value = 1
+              @code_entry.text = File.read(file_path_for(example))
+              @version_spinbox.value = 1
             end
           }
           
@@ -68,17 +80,17 @@ class MetaExample
               stretchy false
             }
             
-            @sb = spinbox(1, 100) {
+            @version_spinbox = spinbox(1, 100) {
               value 1
               
               on_changed do
                 example = selected_example
-                if @sb.value > version_count_for(example)
-                  @sb.value -= 1
+                if @version_spinbox.value > version_count_for(example)
+                  @version_spinbox.value -= 1
                 else
-                  version_number = @sb.value == 1 ? '' : @sb.value
+                  version_number = @version_spinbox.value == 1 ? '' : @version_spinbox.value
                   example = "#{selected_example}#{version_number}"
-                  @nwme.text = File.read(file_path_for(example))
+                  @code_entry.text = File.read(file_path_for(example))
                 end
               end
             }
@@ -90,25 +102,29 @@ class MetaExample
             button('Launch') {
               on_clicked do
                 begin
-                  meta_example_file = File.join(Dir.home, '.meta_example.rb')
-                  File.write(meta_example_file, @nwme.text)
-                  result = `ruby -r #{glimmer_dsl_libui_file} #{meta_example_file} 2>&1`
-                  msg_box('Error Running Example', result) if result.include?('error')
+                  parent_dir = File.join(Dir.home, '.glimmer-dsl-libui', 'examples')
+                  FileUtils.mkdir_p(parent_dir)
+                  example_file = File.join(parent_dir, "#{selected_example.underscore}.rb")
+                  File.write(example_file, @code_entry.text)
+                  FileUtils.cp_r(File.expand_path('../icons', __dir__), File.dirname(parent_dir))
+                  FileUtils.cp_r(File.expand_path('../sounds', __dir__), File.dirname(parent_dir))
+                  run_example(example_file)
                 rescue => e
+                  puts e.full_message
                   puts 'Unable to write code changes! Running original example...'
-                  system "ruby -r #{glimmer_dsl_libui_file} #{file_path_for(selected_example)}"
+                  run_example(file_path_for(selected_example))
                 end
               end
             }
             button('Reset') {
               on_clicked do
-                @nwme.text = File.read(file_path_for(selected_example))
+                @code_entry.text = File.read(file_path_for(selected_example))
               end
             }
           }
         }
         
-        @nwme = non_wrapping_multiline_entry {
+        @code_entry = non_wrapping_multiline_entry {
           text File.read(file_path_for(selected_example))
         }
       }

data/examples/method_based_custom_keyword.rb

@@ -0,0 +1,97 @@
+require 'glimmer-dsl-libui'
+require 'facets'
+
+include Glimmer
+
+Address = Struct.new(:street, :p_o_box, :city, :state, :zip_code)
+
+def form_field(model, property)
+  property = property.to_s
+  entry { |e|
+    label property.underscore.split('_').map(&:capitalize).join(' ')
+    text model.send(property).to_s
+
+    on_changed do
+      model.send("#{property}=", e.text)
+    end
+  }
+end
+
+def address_form(address)
+  form {
+    form_field(address, :street)
+    form_field(address, :p_o_box)
+    form_field(address, :city)
+    form_field(address, :state)
+    form_field(address, :zip_code)
+  }
+end
+
+def label_pair(model, attribute, value)
+  name_label = nil
+  value_label = nil
+  horizontal_box {
+    name_label = label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
+    value_label = label(value.to_s)
+  }
+  Glimmer::DataBinding::Observer.proc do
+    value_label.text = model.send(attribute)
+  end.observe(model, attribute)
+end
+
+def address(address)
+  vertical_box {
+    address.each_pair do |attribute, value|
+      label_pair(address, attribute, value)
+    end
+  }
+end
+
+address1 = Address.new('123 Main St', '23923', 'Denver', 'Colorado', '80014')
+address2 = Address.new('2038 Park Ave', '83272', 'Boston', 'Massachusetts', '02101')
+
+window('Method-Based Custom Keyword') {
+  margined true
+  
+  horizontal_box {
+    vertical_box {
+      label('Address 1') {
+        stretchy false
+      }
+      
+      address_form(address1)
+      
+      horizontal_separator {
+        stretchy false
+      }
+      
+      label('Address 1 (Saved)') {
+        stretchy false
+      }
+      
+      address(address1)
+    }
+    
+    vertical_separator {
+      stretchy false
+    }
+    
+    vertical_box {
+      label('Address 2') {
+        stretchy false
+      }
+      
+      address_form(address2)
+      
+      horizontal_separator {
+        stretchy false
+      }
+      
+      label('Address 2 (Saved)') {
+        stretchy false
+      }
+      
+      address(address2)
+    }
+  }
+}.show

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/path_proxy.rb

@@ -69,7 +69,6 @@ module Glimmer
             @fill ||= {}
           else
             @fill = Glimmer::LibUI.interpret_color(args)
-            @fill[:a] = 1.0 if @fill.is_a?(Hash) && @fill[:a].nil?
             @parent_proxy&.queue_redraw_all
           end
           @fill.tap do
@@ -94,7 +93,6 @@ module Glimmer
             @stroke ||= {}
           else
             @stroke = Glimmer::LibUI.interpret_color(args)
-            @stroke[:a] = 1.0 if @stroke.is_a?(Hash) && @stroke[:a].nil?
             @parent_proxy&.queue_redraw_all
           end
           @stroke.tap do
@@ -149,11 +147,38 @@ module Glimmer
         end
         
         def init_draw_brush(draw_brush, draw_brush_args)
+          if draw_brush_args[:r] || draw_brush_args[:g] || draw_brush_args[:b] || draw_brush_args[:a]
+            draw_brush_args[:type] ||= :solid
+          elsif draw_brush_args[:outer_radius]
+            draw_brush_args[:type] ||= :radial_gradient
+          else
+            draw_brush_args[:type] ||= :linear_gradient
+          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
-          draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha])
+          if draw_brush.Type == 0
+            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
+            draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha] || 1.0)
+          else
+            draw_brush.X0 = draw_brush_args[:x0].to_f
+            draw_brush.Y0 = draw_brush_args[:y0].to_f
+            draw_brush.X1 = draw_brush_args[:x1].to_f
+            draw_brush.Y1 = draw_brush_args[:y1].to_f
+            draw_brush.OuterRadius = draw_brush_args[:outer_radius].to_f if draw_brush.Type == 2
+            stop_structs = draw_brush_args[:stops].to_a.map do |stop|
+              ::LibUI::FFI::DrawBrushGradientStop.malloc.tap do |stop_struct|
+                stop_struct.Pos = stop[:pos].to_f
+                stop_color = Glimmer::LibUI.interpret_color(stop)
+                stop_struct.R = stop_color[:r].to_f / 255.0
+                stop_struct.G = stop_color[:g].to_f / 255.0
+                stop_struct.B = stop_color[:b].to_f / 255.0
+                stop_struct.A = stop_color[:a] || 1.0
+              end
+            end
+            draw_brush.NumStops = stop_structs.count
+            draw_brush.Stops = stop_structs.map(&:to_ptr).map(&:to_s).reduce(:+)
+          end
         end
       end
     end

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.rb

@@ -44,8 +44,8 @@ module Glimmer
           value = value[0...-1]
         end
         value = value.first if value.is_a?(Array) && value.size == 1
-        value = value.to_s if value.is_a?(Symbol)
         value = value[:color] if value.is_a?(Hash) && value[:color]
+        value = value.to_s if value.is_a?(Symbol)
         result = if value.is_a?(Array)
           old_value = value
           value = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.13
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-18 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
@@ -192,7 +192,10 @@ dependencies:
         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!)
+  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 control support.
 email: andy.am@gmail.com
 executables:
 - girb
@@ -230,7 +233,7 @@ files:
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
-- examples/color_the_circles.rb
+- examples/color_the_shapes.rb
 - examples/control_gallery.rb
 - examples/custom_draw_text.rb
 - examples/custom_draw_text2.rb
@@ -246,6 +249,7 @@ files:
 - examples/histogram.rb
 - examples/login.rb
 - examples/meta_example.rb
+- examples/method_based_custom_keyword.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
 - examples/timer.rb
@@ -363,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