glimmer-dsl-libui 0.3.2 → 0.3.3

data/examples/dynamic_area2.rb

@@ -54,7 +54,7 @@ window('Dynamic Area', 240, 600) {
         value 102
         
         on_changed do
-          @path.fill[:r] = @red_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+          @rectangle.fill[:r] = @red_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
         end
       }
       
@@ -63,7 +63,7 @@ window('Dynamic Area', 240, 600) {
         value 102
         
         on_changed do
-          @path.fill[:g] = @green_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+          @rectangle.fill[:g] = @green_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
         end
       }
       
@@ -72,7 +72,7 @@ window('Dynamic Area', 240, 600) {
         value 204
         
         on_changed do
-          @path.fill[:b] = @blue_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+          @rectangle.fill[:b] = @blue_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
         end
       }
       
@@ -81,15 +81,13 @@ window('Dynamic Area', 240, 600) {
         value 100
         
         on_changed do
-          @path.fill[:a] = @alpha_spinbox.value / 100.0 # updating hash properties automatically triggers area.queue_redraw_all
+          @rectangle.fill[:a] = @alpha_spinbox.value / 100.0 # updating hash properties automatically triggers area.queue_redraw_all
         end
       }
     }
     
     area {
-      @path = path { # stable path
-        @rectangle = rectangle(@x_spinbox.value, @y_spinbox.value, @width_spinbox.value, @height_spinbox.value)
-        
+      @rectangle = rectangle(@x_spinbox.value, @y_spinbox.value, @width_spinbox.value, @height_spinbox.value) { # stable path
         fill r: @red_spinbox.value, g: @green_spinbox.value, b: @blue_spinbox.value, a: @alpha_spinbox.value / 100.0
       }
     }

data/examples/form_table.rb

@@ -22,15 +22,19 @@ window('Contacts', 600, 600) { |w|
       @name_entry = entry {
         label 'Name'
       }
+      
       @email_entry = entry {
         label 'Email'
       }
+      
       @phone_entry = entry {
         label 'Phone'
       }
+      
       @city_entry = entry {
         label 'City'
       }
+      
       @state_entry = entry {
         label 'State'
       }

data/examples/grid.rb

@@ -8,16 +8,16 @@ window('Grid') {
   tab {
     tab_item('Span') {
       grid {
-        4.times { |top_value|
-          4.times { |left_value|
+        4.times do |top_value|
+          4.times do |left_value|
             label("(#{left_value}, #{top_value}) xspan1\nyspan1") {
               left left_value
               top top_value
               hexpand true
               vexpand true
             }
-          }
-        }
+          end
+        end
         label("(0, 4) xspan2\nyspan1 more text fits horizontally") {
           left 0
           top 4

data/examples/histogram.rb

@@ -79,19 +79,15 @@ window('histogram example', 640, 480) {
     
     @area = area {
       on_draw do |area_draw_params|
-        path {
-          rectangle(0, 0, area_draw_params[:area_width], area_draw_params[:area_height])
-          
+        rectangle(0, 0, area_draw_params[:area_width], area_draw_params[:area_height]) {
           fill 0xFFFFFF
         }
         
         graph_width, graph_height = *graph_size(area_draw_params[:area_width], area_draw_params[:area_height])
       
-        path {
-          figure(X_OFF_LEFT, Y_OFF_TOP) {
-            line(X_OFF_LEFT, Y_OFF_TOP + graph_height)
-            line(X_OFF_LEFT + graph_width, Y_OFF_TOP + graph_height)
-          }
+        figure(X_OFF_LEFT, Y_OFF_TOP) {
+          line(X_OFF_LEFT, Y_OFF_TOP + graph_height)
+          line(X_OFF_LEFT + graph_width, Y_OFF_TOP + graph_height)
           
           stroke 0x000000, thickness: 2, miter_limit: 10
         }

data/examples/meta_example.rb

@@ -5,8 +5,10 @@ require 'fileutils'
 class MetaExample
   include Glimmer
   
+  ADDITIONAL_BASIC_EXAMPLES = ['Color Button', 'Font Button', 'Form', 'Date Time Picker', 'Simple Notepad']
+  
   def initialize
-    @selected_example_index = 0
+    @selected_example_index = examples_with_versions.index(basic_examples_with_versions.first)
   end
   
   def examples
@@ -25,6 +27,14 @@ class MetaExample
     end
   end
   
+  def basic_examples_with_versions
+    examples_with_versions.select {|example| example.start_with?('Basic') || ADDITIONAL_BASIC_EXAMPLES.include?(example) }
+  end
+  
+  def advanced_examples_with_versions
+    examples_with_versions - basic_examples_with_versions
+  end
+  
   def file_path_for(example)
     File.join(File.expand_path('.', __dir__), "#{example.underscore}.rb")
   end
@@ -66,17 +76,47 @@ class MetaExample
         vertical_box {
           stretchy false
           
-          @example_radio_buttons = radio_buttons {
+          tab {
             stretchy false
-            items examples_with_versions
-            selected @selected_example_index
             
-            on_selected do
-              @selected_example_index = @example_radio_buttons.selected
-              example = selected_example
-              @code_entry.text = File.read(file_path_for(example))
-              @version_spinbox.value = 1
-            end
+            tab_item('Basic') {
+              vertical_box {
+                @basic_example_radio_buttons = radio_buttons {
+                  stretchy false
+                  items basic_examples_with_versions
+                  selected basic_examples_with_versions.index(examples_with_versions[@selected_example_index])
+                  
+                  on_selected do
+                    @selected_example_index = examples_with_versions.index(basic_examples_with_versions[@basic_example_radio_buttons.selected])
+                    example = selected_example
+                    @code_entry.text = File.read(file_path_for(example))
+                    @version_spinbox.value = 1
+                  end
+                }
+                
+                label # filler
+                label # filler
+              }
+            }
+            
+            tab_item('Advanced') {
+              vertical_box {
+                @advanced_example_radio_buttons = radio_buttons {
+                  stretchy false
+                  items advanced_examples_with_versions
+                  
+                  on_selected do
+                    @selected_example_index = examples_with_versions.index(advanced_examples_with_versions[@advanced_example_radio_buttons.selected])
+                    example = selected_example
+                    @code_entry.text = File.read(file_path_for(example))
+                    @version_spinbox.value = 1
+                  end
+                }
+                
+                label # filler
+                label # filler
+              }
+            }
           }
           
           horizontal_box {

data/examples/snake.rb

@@ -61,9 +61,7 @@ class Snake
             
             @game.width.times do |column|
               area {
-                @cell_grid.last << path {
-                  square(0, 0, CELL_SIZE)
-                  
+                @cell_grid.last << square(0, 0, CELL_SIZE) {
                   fill Presenter::Cell::COLOR_CLEAR
                 }
                 

data/examples/tetris.rb

@@ -203,34 +203,31 @@ class Tetris
     bevel_pixel_size = 0.16 * block_size.to_f
     color = Glimmer::LibUI.interpret_color(Model::Block::COLOR_CLEAR)
     area {
-      block[:background_square] = path {
-        square(0, 0, block_size)
-        
+      block[:background_square] = square(0, 0, block_size) {
         fill color
       }
-      block[:top_bevel_edge] = path {
-        polygon(0, 0, block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size)
-  
+      
+      block[:top_bevel_edge] = polygon {
+        point_array 0, 0, block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size
         fill r: color[:r] + 4*BEVEL_CONSTANT, g: color[:g] + 4*BEVEL_CONSTANT, b: color[:b] + 4*BEVEL_CONSTANT
       }
-      block[:right_bevel_edge] = path {
-        polygon(block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size, block_size)
-  
+      
+      block[:right_bevel_edge] = polygon {
+        point_array block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size, block_size
         fill r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT
       }
-      block[:bottom_bevel_edge] = path {
-        polygon(block_size, block_size, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size)
-  
+      
+      block[:bottom_bevel_edge] = polygon {
+        point_array block_size, block_size, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size
         fill r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT
       }
-      block[:left_bevel_edge] = path {
-        polygon(0, 0, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size)
-  
+      
+      block[:left_bevel_edge] = polygon {
+        point_array 0, 0, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size
         fill r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT
       }
-      block[:border_square] = path {
-        square(0, 0, block_size)
-  
+      
+      block[:border_square] = square(0, 0, block_size) {
         stroke COLOR_GRAY
       }
       

data/examples/tic_tac_toe/board.rb

@@ -38,8 +38,10 @@ class TicTacToe
   
     #row and column numbers are 1-based
     def mark(row, column)
-      self[row, column].mark(current_sign)
-      game_over? #updates winning sign
+      if self[row, column].empty
+        self[row, column].mark(current_sign)
+        game_over? #updates winning sign
+      end
     end
   
     def current_sign

data/examples/tic_tac_toe.rb

@@ -45,9 +45,7 @@ class TicTacToe
             
             3.times.map do |column|
               area {
-                path {
-                  square(0, 0, 60)
-                  
+                square(0, 0, 60) {
                   stroke :black, thickness: 2
                 }
                 text(23, 19) {

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

@@ -21,6 +21,9 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
+require 'glimmer/libui/control_proxy/path_proxy'
+require 'glimmer/libui/shape'
+require 'glimmer/libui/control_proxy/area_proxy'
 
 module Glimmer
   module DSL
@@ -32,7 +35,9 @@ module Glimmer
           Glimmer::LibUI::Shape.exists?(keyword) and
             (
               parent.is_a?(Glimmer::LibUI::ControlProxy::PathProxy) or
-                parent.is_a?(Glimmer::LibUI::Shape)
+              parent.is_a?(Glimmer::LibUI::Shape) or
+              parent.is_a?(Glimmer::LibUI::ControlProxy::AreaProxy) or
+              (parent.nil? && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params)
             )
         end
   

data/lib/glimmer/libui/shape.rb

@@ -73,12 +73,22 @@ module Glimmer
         @args = args
         @block = block
         set_parameter_defaults
+        build_control if implicit_path?
         post_add_content if @block.nil?
       end
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
         @parent&.post_initialize_child(self)
+        @parent.post_add_content if implicit_path? && dynamic?
+      end
+      
+      def post_initialize_child(child, add_child: true)
+        if child.is_a?(ControlProxy::MatrixProxy)
+          path_proxy.post_initialize_child(child, add_child: add_child)
+        else
+          super(child, add_child: add_child)
+        end
       end
       
       # Subclasses must override to perform draw work and call super afterwards to ensure calling destroy when semi-declarative in an on_draw method
@@ -105,6 +115,24 @@ module Glimmer
       def path_proxy
         find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::PathProxy) }
       end
+    
+      def fill(*args)
+        path_proxy.fill(*args)
+      end
+      alias fill= fill
+      alias set_fill fill
+      
+      def stroke(*args)
+        path_proxy.stroke(*args)
+      end
+      alias stroke= stroke
+      alias set_stroke stroke
+      
+      def transform(matrix = nil)
+        path_proxy.transform(matrix)
+      end
+      alias transform= transform
+      alias set_transform transform
       
       def respond_to?(method_name, *args, &block)
         self.class.parameters.include?(method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym) or
@@ -117,6 +145,7 @@ module Glimmer
           method_name = method_name.to_s
           parameter_index = self.class.parameters.index(method_name_parameter)
           if method_name.start_with?('set_') || method_name.end_with?('=') || !args.empty?
+            args = [args] if args.size > 1
             if args.first != @args[parameter_index]
               @args[parameter_index] = args.first
               request_auto_redraw
@@ -124,13 +153,27 @@ module Glimmer
           else
             @args[parameter_index]
           end
-        else
+        else # TODO consider if there is a need to redirect anything to path proxy or delete this TODO
           super
         end
       end
       
       private
       
+      def build_control
+        block = Proc.new {} if dynamic?
+        @parent = Glimmer::LibUI::ControlProxy::PathProxy.new('path', @parent, [], &block)
+      end
+      
+      # indicates if nested directly under area or on_draw event (having an implicit path not an explicit path parent)
+      def implicit_path?
+        @implicit_path ||= !!(@parent.is_a?(Glimmer::LibUI::ControlProxy::AreaProxy) || (@parent.nil? && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params))
+      end
+      
+      def dynamic?
+        ((@parent.nil? || (@parent.is_a?(ControlProxy::PathProxy) && @parent.parent_proxy.nil?)) && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params)
+      end
+      
       def set_parameter_defaults
         self.class.parameter_defaults.each_with_index do |default, i|
           @args[i] ||= default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +238,7 @@ files:
 - examples/basic_table_image_text2.rb
 - examples/basic_table_progress_bar.rb
 - examples/basic_transform.rb
+- examples/basic_transform2.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
@@ -394,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI