glimmer-dsl-libui 0.1.0 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.4

data/examples/area_gallery.rb

@@ -0,0 +1,52 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      path { # declarative stable path
+        square(0, 0, 100)
+        square(100, 100, 400)
+        
+        fill r: 102, g: 102, b: 204
+      }
+      path { # declarative stable path
+        rectangle(0, 100, 100, 400)
+        rectangle(100, 0, 400, 100)
+        
+        fill r: 204, g: 102, b: 204
+      }
+      path { # declarative stable path
+        figure(100, 100) {
+          line(100, 400)
+          line(400, 100)
+          line(400, 400)
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 104, a: 0.5
+        stroke r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        figure(0, 0) {
+          bezier(200, 100, 100, 200, 400, 100)
+          bezier(300, 100, 100, 300, 100, 400)
+          bezier(100, 300, 300, 100, 400, 400)
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        arc(200, 200, 90, 0, 360, false)
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+    }
+  }
+}.show

data/examples/area_gallery2.rb

@@ -0,0 +1,113 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      path { # declarative stable path
+        square {
+          x 0
+          y 0
+          length 100
+        }
+        square {
+          x 100
+          y 100
+          length 400
+        }
+        
+        fill r: 102, g: 102, b: 204
+      }
+      path { # declarative stable path
+        rectangle {
+          x 0
+          y 100
+          width 100
+          height 400
+        }
+        rectangle {
+          x 100
+          y 0
+          width 400
+          height 100
+        }
+        
+        fill r: 204, g: 102, b: 204
+      }
+      path { # declarative stable path
+        figure {
+          x 100
+          y 100
+          
+          line {
+            x 100
+            y 400
+          }
+          line {
+            x 400
+            y 100
+          }
+          line {
+            x 400
+            y 400
+          }
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 104, a: 0.5
+        stroke r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        figure {
+          x 0
+          y 0
+          
+          bezier {
+            c1_x 200
+            c1_y 100
+            c2_x 100
+            c2_y 200
+            end_x 400
+            end_y 100
+          }
+          bezier {
+            c1_x 300
+            c1_y 100
+            c2_x 100
+            c2_y 300
+            end_x 100
+            end_y 400
+          }
+          bezier {
+            c1_x 100
+            c1_y 300
+            c2_x 300
+            c2_y 100
+            end_x 400
+            end_y 400
+          }
+
+          closed true
+        }
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+      path { # declarative stable path
+        arc {
+          x_center 200
+          y_center 200
+          radius 90
+          start_angle 0
+          sweep 360
+          is_negative false
+        }
+
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke thickness: 2, r: 0, g: 0, b: 0
+      }
+    }
+  }
+}.show

data/examples/area_gallery3.rb

@@ -0,0 +1,54 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          square(0, 0, 100)
+          square(100, 100, 400)
+          
+          fill r: 102, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle(0, 100, 100, 400)
+          rectangle(100, 0, 400, 100)
+
+          fill r: 204, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure(100, 100) {
+            line(100, 400)
+            line(400, 100)
+            line(400, 400)
+
+            closed true
+          }
+
+          fill r: 202, g: 102, b: 104, a: 0.5
+          stroke r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure(0, 0) {
+            bezier(200, 100, 100, 200, 400, 100)
+            bezier(300, 100, 100, 300, 100, 400)
+            bezier(100, 300, 300, 100, 400, 400)
+
+            closed true
+          }
+
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          arc(200, 200, 90, 0, 360, false)
+
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+      end
+    }
+  }
+}.show

data/examples/area_gallery4.rb

@@ -0,0 +1,115 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Area Gallery', 400, 400) {
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          square {
+            x 0
+            y 0
+            length 100
+          }
+          square {
+            x 100
+            y 100
+            length 400
+          }
+          
+          fill r: 102, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle {
+            x 0
+            y 100
+            width 100
+            height 400
+          }
+          rectangle {
+            x 100
+            y 0
+            width 400
+            height 100
+          }
+          
+          fill r: 204, g: 102, b: 204
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure {
+            x 100
+            y 100
+            
+            line {
+              x 100
+              y 400
+            }
+            line {
+              x 400
+              y 100
+            }
+            line {
+              x 400
+              y 400
+            }
+  
+            closed true
+          }
+  
+          fill r: 202, g: 102, b: 104, a: 0.5
+          stroke r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          figure {
+            x 0
+            y 0
+            
+            bezier {
+              c1_x 200
+              c1_y 100
+              c2_x 100
+              c2_y 200
+              end_x 400
+              end_y 100
+            }
+            bezier {
+              c1_x 300
+              c1_y 100
+              c2_x 100
+              c2_y 300
+              end_x 100
+              end_y 400
+            }
+            bezier {
+              c1_x 100
+              c1_y 300
+              c2_x 300
+              c2_y 100
+              end_x 400
+              end_y 400
+            }
+  
+            closed true
+          }
+  
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          arc {
+            x_center 200
+            y_center 200
+            radius 90
+            start_angle 0
+            sweep 360
+            is_negative false
+          }
+  
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke thickness: 2, r: 0, g: 0, b: 0
+        }
+      end
+    }
+  }
+}.show

data/examples/basic_area2.rb

@@ -0,0 +1,19 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Area', 400, 400) {
+  margined true
+  
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle(0, 0, 400, 400)
+          
+          fill r: 102, g: 102, b: 204, a: 1.0
+        }
+      end
+    }
+  }
+}.show

data/examples/basic_table_progress_bar.rb

@@ -12,13 +12,23 @@ data = [
   ['task 5', -1],
 ]
 
-window('Task progress', 300, 200) {
-  horizontal_box {
+window('Task Progress', 300, 200) {
+  vertical_box {
     table {
       text_column('Task')
       progress_bar_column('Progress')
 
-      cell_rows data
+      cell_rows data # implicit data-binding
+    }
+    
+    button('Mark All As Done') {
+      stretchy false
+      
+      on_clicked do
+        data.each_with_index do |row_data, row|
+          data[row] = [row_data[0], 100] # automatically updates table due to implicit data-binding
+        end
+      end
     }
   }
 }.show

data/examples/dynamic_area.rb

@@ -0,0 +1,99 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Dynamic Area', 240, 600) {
+  margined true
+  
+  vertical_box {
+    label('Rectangle Properties') {
+      stretchy false
+    }
+    
+    form {
+      stretchy false
+      
+      @x_spinbox = spinbox(0, 1000) {
+        label 'x'
+        value 25
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+      
+      @y_spinbox = spinbox(0, 1000) {
+        label 'y'
+        value 25
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+      
+      @width_spinbox = spinbox(0, 1000) {
+        label 'width'
+        value 150
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+      
+      @height_spinbox = spinbox(0, 1000) {
+        label 'height'
+        value 150
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+      
+      @red_spinbox = spinbox(0, 255) {
+        label 'red'
+        value 102
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+      
+      @green_spinbox = spinbox(0, 255) {
+        label 'green'
+        value 102
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+      
+      @blue_spinbox = spinbox(0, 255) {
+        label 'blue'
+        value 204
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+      
+      @alpha_spinbox = spinbox(0, 100) {
+        label 'alpha'
+        value 100
+        
+        on_changed do
+          @area.queue_redraw_all
+        end
+      }
+    }
+    
+    @area = area {
+      on_draw do |area_draw_params|
+        path(area_draw_params) { # a dynamic path is added semi-declaratively inside on_draw block
+          rectangle(@x_spinbox.value, @y_spinbox.value, @width_spinbox.value, @height_spinbox.value)
+          
+          fill r: @red_spinbox.value, g: @green_spinbox.value, b: @blue_spinbox.value, a: @alpha_spinbox.value / 100.0
+        }
+      end
+    }
+  }
+}.show

data/examples/dynamic_area2.rb

@@ -0,0 +1,97 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Dynamic Area', 240, 600) {
+  margined true
+  
+  vertical_box {
+    label('Rectangle Properties') {
+      stretchy false
+    }
+    
+    form {
+      stretchy false
+      
+      @x_spinbox = spinbox(0, 1000) {
+        label 'x'
+        value 25
+        
+        on_changed do
+          @rectangle.x = @x_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+        end
+      }
+      
+      @y_spinbox = spinbox(0, 1000) {
+        label 'y'
+        value 25
+        
+        on_changed do
+          @rectangle.y = @y_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+        end
+      }
+      
+      @width_spinbox = spinbox(0, 1000) {
+        label 'width'
+        value 150
+        
+        on_changed do
+          @rectangle.width = @width_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+        end
+      }
+      
+      @height_spinbox = spinbox(0, 1000) {
+        label 'height'
+        value 150
+        
+        on_changed do
+          @rectangle.height = @height_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+        end
+      }
+      
+      @red_spinbox = spinbox(0, 255) {
+        label 'red'
+        value 102
+        
+        on_changed do
+          @path.fill[:r] = @red_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+        end
+      }
+      
+      @green_spinbox = spinbox(0, 255) {
+        label 'green'
+        value 102
+        
+        on_changed do
+          @path.fill[:g] = @green_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+        end
+      }
+      
+      @blue_spinbox = spinbox(0, 255) {
+        label 'blue'
+        value 204
+        
+        on_changed do
+          @path.fill[:b] = @blue_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+        end
+      }
+      
+      @alpha_spinbox = spinbox(0, 100) {
+        label 'alpha'
+        value 100
+        
+        on_changed do
+          @path.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)
+        
+        fill r: @red_spinbox.value, g: @green_spinbox.value, b: @blue_spinbox.value, a: @alpha_spinbox.value / 100.0
+      }
+    }
+  }
+}.show

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

@@ -29,7 +29,7 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          Glimmer::LibUI::ControlProxy.control_exists?(keyword)
+          Glimmer::LibUI::ControlProxy.exists?(keyword)
         end
   
         def interpret(parent, keyword, *args, &block)

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

@@ -39,6 +39,7 @@ module Glimmer
           listener
           property
           control
+          shape
         ]
       )
     end

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

@@ -21,13 +21,17 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/shape'
 
 module Glimmer
   module DSL
     module Libui
       class PropertyExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::LibUI::ControlProxy) and
+          (
+            parent.is_a?(Glimmer::LibUI::ControlProxy) or
+              parent.is_a?(Glimmer::LibUI::Shape)
+          ) and
             block.nil? and
             parent.respond_to?(keyword, *args)
         end

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

@@ -0,0 +1,56 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+
+module Glimmer
+  module DSL
+    module Libui
+      class ShapeExpression < Expression
+        include ParentExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          Glimmer::LibUI::Shape.exists?(keyword) and
+            (
+              parent.is_a?(Glimmer::LibUI::PathProxy) or
+                parent.is_a?(Glimmer::LibUI::Shape)
+            )
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::LibUI::Shape.create(keyword, parent, args, &block)
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          super
+          parent.post_add_content
+        end
+        
+      end
+    end
+  end
+end
+
+# TODO Consider moving all shapes underneath Shape namespace
+require 'glimmer/libui/path_proxy'
+require 'glimmer/libui/shape'
+Dir[File.expand_path('../../libui/*.rb', __dir__)].each {|f| require f}