glimmer-dsl-libui 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/examples/dynamic_area.rb

@@ -1,97 +1,84 @@
 require 'glimmer-dsl-libui'
 
-include Glimmer
-
-window('Dynamic Area', 240, 600) {
-  margined true
+class DynamicArea
+  include Glimmer
   
-  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
-      }
+  attr_accessor :rectangle_x, :rectangle_y, :rectangle_width, :rectangle_height, :rectangle_red, :rectangle_green, :rectangle_blue, :rectangle_alpha
+  
+  def initialize
+    @rectangle_x = 25
+    @rectangle_y = 25
+    @rectangle_width = 150
+    @rectangle_height = 150
+    @rectangle_red = 102
+    @rectangle_green = 102
+    @rectangle_blue = 204
+    @rectangle_alpha = 100
+  end
+  
+  def launch
+    window('Dynamic Area', 240, 600) {
+      margined true
       
-      @blue_spinbox = spinbox(0, 255) {
-        label 'blue'
-        value 204
+      vertical_box {
+        label('Rectangle Properties') {
+          stretchy false
+        }
         
-        on_changed do
-          @area.queue_redraw_all
-        end
-      }
-      
-      @alpha_spinbox = spinbox(0, 100) {
-        label 'alpha'
-        value 100
+        form {
+          stretchy false
+          
+          spinbox(0, 1000) {
+            label 'x'
+            value <=> [self, :rectangle_x, after_write: -> {@area.queue_redraw_all}]
+          }
+          
+          spinbox(0, 1000) {
+            label 'y'
+            value <=> [self, :rectangle_y, after_write: -> {@area.queue_redraw_all}]
+          }
+          
+          spinbox(0, 1000) {
+            label 'width'
+            value <=> [self, :rectangle_width, after_write: -> {@area.queue_redraw_all}]
+          }
+          
+          spinbox(0, 1000) {
+            label 'height'
+            value <=> [self, :rectangle_height, after_write: -> {@area.queue_redraw_all}]
+          }
+          
+          spinbox(0, 255) {
+            label 'red'
+            value <=> [self, :rectangle_red, after_write: -> {@area.queue_redraw_all}]
+          }
+          
+          spinbox(0, 255) {
+            label 'green'
+            value <=> [self, :rectangle_green, after_write: -> {@area.queue_redraw_all}]
+          }
+          
+          spinbox(0, 255) {
+            label 'blue'
+            value <=> [self, :rectangle_blue, after_write: -> {@area.queue_redraw_all}]
+          }
+          
+          spinbox(0, 100) {
+            label 'alpha'
+            value <=> [self, :rectangle_alpha, after_write: -> {@area.queue_redraw_all}]
+          }
+        }
         
-        on_changed do
-          @area.queue_redraw_all
-        end
-      }
-    }
-    
-    @area = area {
-      on_draw do |area_draw_params|
-        rectangle(@x_spinbox.value, @y_spinbox.value, @width_spinbox.value, @height_spinbox.value) { # a dynamic path is added semi-declaratively inside on_draw block
-          fill r: @red_spinbox.value, g: @green_spinbox.value, b: @blue_spinbox.value, a: @alpha_spinbox.value / 100.0
+        @area = area {
+          on_draw do |area_draw_params|
+            rectangle(rectangle_x, rectangle_y, rectangle_width, rectangle_height) { # a dynamic path is added semi-declaratively inside on_draw block
+              fill r: rectangle_red, g: rectangle_green, b: rectangle_blue, a: rectangle_alpha / 100.0
+            }
+          end
         }
-      end
-    }
-  }
-}.show
+      }
+    }.show
+  end
+end
+
+DynamicArea.new.launch

data/examples/dynamic_area2.rb

@@ -18,7 +18,7 @@ window('Dynamic Area', 240, 600) {
         value 25
         
         on_changed do
-          @rectangle.x = @x_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
       
@@ -27,7 +27,7 @@ window('Dynamic Area', 240, 600) {
         value 25
         
         on_changed do
-          @rectangle.y = @y_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
       
@@ -36,7 +36,7 @@ window('Dynamic Area', 240, 600) {
         value 150
         
         on_changed do
-          @rectangle.width = @width_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
       
@@ -45,7 +45,7 @@ window('Dynamic Area', 240, 600) {
         value 150
         
         on_changed do
-          @rectangle.height = @height_spinbox.value # updating properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
       
@@ -54,7 +54,7 @@ window('Dynamic Area', 240, 600) {
         value 102
         
         on_changed do
-          @rectangle.fill[:r] = @red_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
       
@@ -63,7 +63,7 @@ window('Dynamic Area', 240, 600) {
         value 102
         
         on_changed do
-          @rectangle.fill[:g] = @green_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
       
@@ -72,7 +72,7 @@ window('Dynamic Area', 240, 600) {
         value 204
         
         on_changed do
-          @rectangle.fill[:b] = @blue_spinbox.value # updating hash properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
       
@@ -81,15 +81,17 @@ window('Dynamic Area', 240, 600) {
         value 100
         
         on_changed do
-          @rectangle.fill[:a] = @alpha_spinbox.value / 100.0 # updating hash properties automatically triggers area.queue_redraw_all
+          @area.queue_redraw_all
         end
       }
     }
     
-    area {
-      @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
-      }
+    @area = area {
+      on_draw do |area_draw_params|
+        rectangle(@x_spinbox.value, @y_spinbox.value, @width_spinbox.value, @height_spinbox.value) { # a dynamic path is added semi-declaratively inside on_draw block
+          fill r: @red_spinbox.value, g: @green_spinbox.value, b: @blue_spinbox.value, a: @alpha_spinbox.value / 100.0
+        }
+      end
     }
   }
 }.show

data/examples/dynamic_area3.rb

@@ -0,0 +1,90 @@
+require 'glimmer-dsl-libui'
+
+class DynamicArea
+  include Glimmer
+  
+  attr_accessor :rectangle_x, :rectangle_y, :rectangle_width, :rectangle_height, :rectangle_red, :rectangle_green, :rectangle_blue, :rectangle_alpha
+  
+  def initialize
+    @rectangle_x = 25
+    @rectangle_y = 25
+    @rectangle_width = 150
+    @rectangle_height = 150
+    @rectangle_red = 102
+    @rectangle_green = 102
+    @rectangle_blue = 204
+    @rectangle_alpha = 100
+  end
+  
+  def rectangle_fill
+    { r: rectangle_red, g: rectangle_green, b: rectangle_blue, a: rectangle_alpha / 100.0 }
+  end
+  
+  def launch
+    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 <=> [self, :rectangle_x]
+          }
+          
+          @y_spinbox = spinbox(0, 1000) {
+            label 'y'
+            value <=> [self, :rectangle_y]
+          }
+          
+          @width_spinbox = spinbox(0, 1000) {
+            label 'width'
+            value <=> [self, :rectangle_width]
+          }
+          
+          @height_spinbox = spinbox(0, 1000) {
+            label 'height'
+            value <=> [self, :rectangle_height]
+          }
+          
+          @red_spinbox = spinbox(0, 255) {
+            label 'red'
+            value <=> [self, :rectangle_red]
+          }
+          
+          @green_spinbox = spinbox(0, 255) {
+            label 'green'
+            value <=> [self, :rectangle_green]
+          }
+          
+          @blue_spinbox = spinbox(0, 255) {
+            label 'blue'
+            value <=> [self, :rectangle_blue]
+          }
+          
+          @alpha_spinbox = spinbox(0, 100) {
+            label 'alpha'
+            value <=> [self, :rectangle_alpha]
+          }
+        }
+        
+        area {
+          @rectangle = rectangle { # stable implicit path shape
+            x      <= [self, :rectangle_x]
+            y      <= [self, :rectangle_y]
+            width  <= [self, :rectangle_width]
+            height <= [self, :rectangle_height]
+            fill   <= [self, :rectangle_fill, computed_by: [:rectangle_red, :rectangle_green, :rectangle_blue, :rectangle_alpha]]
+          }
+        }
+      }
+    }.show
+  end
+end
+
+DynamicArea.new.launch

data/examples/dynamic_area4.rb

@@ -0,0 +1,95 @@
+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
+          @rectangle.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
+          @rectangle.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
+          @rectangle.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
+          @rectangle.fill[:a] = @alpha_spinbox.value / 100.0 # updating hash properties automatically triggers area.queue_redraw_all
+        end
+      }
+    }
+    
+    area {
+      @rectangle = rectangle(@x_spinbox.value, @y_spinbox.value, @width_spinbox.value, @height_spinbox.value) { # stable implicit path shape
+        fill r: @red_spinbox.value, g: @green_spinbox.value, b: @blue_spinbox.value, a: @alpha_spinbox.value / 100.0
+      }
+    }
+  }
+}.show

data/examples/form_table.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 class FormTable

data/examples/form_table2.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer

data/examples/histogram.rb

@@ -2,106 +2,113 @@
 
 require 'glimmer-dsl-libui'
 
-include Glimmer
-
-X_OFF_LEFT   = 20
-Y_OFF_TOP    = 20
-X_OFF_RIGHT  = 20
-Y_OFF_BOTTOM = 20
-POINT_RADIUS = 5
-COLOR_BLUE   = 0x1E90FF
-
-@datapoints   = 10.times.map {Random.new.rand(90)}
-
-def graph_size(area_width, area_height)
-  graph_width = area_width - X_OFF_LEFT - X_OFF_RIGHT
-  graph_height = area_height - Y_OFF_TOP - Y_OFF_BOTTOM
-  [graph_width, graph_height]
-end
-
-def point_locations(width, height)
-  xincr = width / 9.0 # 10 - 1 to make the last point be at the end
-  yincr = height / 100.0
-
-  @datapoints.each_with_index.map do |value, i|
-    val = 100 - value
-    [xincr * i, yincr * val]
+class Histogram
+  include Glimmer
+  
+  X_OFF_LEFT   = 20
+  Y_OFF_TOP    = 20
+  X_OFF_RIGHT  = 20
+  Y_OFF_BOTTOM = 20
+  POINT_RADIUS = 5
+  COLOR_BLUE   = Glimmer::LibUI.interpret_color(0x1E90FF)
+  
+  attr_accessor :datapoints, :histogram_color
+  
+  def initialize
+    @datapoints   = 10.times.map {Random.new.rand(90)}
+    @histogram_color        = COLOR_BLUE
   end
-end
-
-# method-based custom control representing a graph path
-def graph_path(width, height, should_extend, &block)
-  locations = point_locations(width, height).flatten
-  path {
-    if should_extend
-      polygon(locations + [width, height, 0, height])
-    else
-      polyline(locations)
+  
+  def graph_size(area_width, area_height)
+    graph_width = area_width - X_OFF_LEFT - X_OFF_RIGHT
+    graph_height = area_height - Y_OFF_TOP - Y_OFF_BOTTOM
+    [graph_width, graph_height]
+  end
+  
+  def point_locations(width, height)
+    xincr = width / 9.0 # 10 - 1 to make the last point be at the end
+    yincr = height / 100.0
+  
+    @datapoints.each_with_index.map do |value, i|
+      val = 100 - value
+      [xincr * i, yincr * val]
     end
-    
-    # apply a transform to the coordinate space for this path so (0, 0) is the top-left corner of the graph
-    transform {
-      translate X_OFF_LEFT, Y_OFF_TOP
-    }
-    
-    block.call
-  }
-end
-
-window('histogram example', 640, 480) {
-  margined true
+  end
   
-  horizontal_box {
-    vertical_box {
-      stretchy false
-      
-      10.times do |i|
-        spinbox(0, 100) { |sb|
-          stretchy false
-          value @datapoints[i]
-          
-          on_changed do
-            @datapoints[i] = sb.value
-            @area.queue_redraw_all
-          end
-        }
+  # method-based custom control representing a graph path
+  def graph_path(width, height, should_extend, &block)
+    locations = point_locations(width, height).flatten
+    path {
+      if should_extend
+        polygon(locations + [width, height, 0, height])
+      else
+        polyline(locations)
       end
       
-      @color_button = color_button {
-        stretchy false
-        color COLOR_BLUE
-        
-        on_changed do
-          @area.queue_redraw_all
-        end
+      # apply a transform to the coordinate space for this path so (0, 0) is the top-left corner of the graph
+      transform {
+        translate X_OFF_LEFT, Y_OFF_TOP
       }
+      
+      block.call
     }
-    
-    @area = area {
-      on_draw do |area_draw_params|
-        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])
+  end
+  
+  def launch
+    window('histogram example', 640, 480) {
+      margined true
       
-        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)
+      horizontal_box {
+        vertical_box {
+          stretchy false
           
-          stroke 0x000000, thickness: 2, miter_limit: 10
-        }
-      
-        # now create the fill for the graph below the graph line
-        graph_path(graph_width, graph_height, true) {
-          fill @color_button.color.merge(a: 0.5)
+          10.times do |i|
+            spinbox(0, 100) { |sb|
+              stretchy false
+              value <=> [self, "datapoints[#{i}]", after_write: -> { @area.queue_redraw_all }]
+            }
+          end
+          
+          color_button { |cb|
+            stretchy false
+            color COLOR_BLUE
+            
+            on_changed do
+              @histogram_color = cb.color
+              @area.queue_redraw_all
+            end
+          }
         }
         
-        # now draw the histogram line
-        graph_path(graph_width, graph_height, false) {
-          stroke @color_button.color.merge(thickness: 2, miter_limit: 10)
+        @area = area {
+          on_draw do |area_draw_params|
+            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])
+          
+            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
+            }
+          
+            # now create the fill for the graph below the graph line
+            graph_path(graph_width, graph_height, true) {
+              fill @histogram_color.merge(a: 0.5)
+            }
+            
+            # now draw the histogram line
+            graph_path(graph_width, graph_height, false) {
+              stroke @histogram_color.merge(thickness: 2, miter_limit: 10)
+            }
+          end
         }
-      end
-    }
-  }
-}.show
+      }
+    }.show
+  end
+end
+
+Histogram.new.launch