glimmer-dsl-libui 0.4.16 → 0.4.20

data/VERSION

@@ -1 +1 @@
-0.4.16
+0.4.20

data/examples/area_based_custom_controls.rb

@@ -0,0 +1,278 @@
+require 'glimmer-dsl-libui'
+
+class AreaBasedCustomControls
+  include Glimmer
+  
+  attr_accessor :label_width, :label_height, :label_font_descriptor,
+                :label_text_color, :label_background_fill, :label_border_stroke,
+                :label_text_x, :label_text_y,
+                :button_width, :button_height, :button_font_descriptor,
+                :button_text_color, :button_background_fill, :button_border_stroke,
+                :button_text_x, :button_text_y
+  
+  def initialize
+    self.label_width = 335
+    self.label_height = 50
+    self.label_font_descriptor = {family: OS.linux? ? 'Monospace Bold Italic' : 'Courier New', size: 16, weight: :bold, italic: :italic}
+    self.label_text_color = :red
+    self.label_background_fill = :yellow
+    self.label_border_stroke = :limegreen
+    
+    self.button_width = 150
+    self.button_height = 50
+    self.button_font_descriptor = {family: OS.linux? ? 'Monospace Bold Italic' : 'Courier New', size: 36, weight: OS.linux? ? :normal : :bold, italic: :italic}
+    self.button_text_color = :green
+    self.button_background_fill = :yellow
+    self.button_border_stroke = :limegreen
+  end
+  
+  def rebuild_text_label
+    @text_label.destroy
+    @text_label_vertical_box.content { # re-open vertical box content and shove in a new button
+      @text_label = text_label('This is a text label.',
+                               width: label_width, height: label_height, font_descriptor: label_font_descriptor,
+                               background_fill: label_background_fill, text_color: label_text_color, border_stroke: label_border_stroke,
+                               text_x: label_text_x, text_y: label_text_y)
+    }
+  end
+  
+  def rebuild_push_button
+    @push_button.destroy
+    @push_button_vertical_box.content { # re-open vertical box content and shove in a new button
+      @push_button = push_button('Push',
+                                 width: button_width, height: button_height, font_descriptor: button_font_descriptor,
+                                 background_fill: button_background_fill, text_color: button_text_color, border_stroke: button_border_stroke,
+                                 text_x: button_text_x, text_y: button_text_y) {
+        on_mouse_up do
+          message_box('Button Pushed', 'Thank you for pushing the button!')
+        end
+      }
+    }
+  end
+  
+  def launch
+    window('Area-Based Custom Controls', 385, 385) { |w|
+      margined true
+      
+      tab {
+        tab_item('Text Label') {
+          @text_label_vertical_box = vertical_box {
+            vertical_box {
+              text_label('Text Label Form:', width: 385, height: 30, background_fill: OS.windows? ? :white : {a: 0}, border_stroke: OS.windows? ? :white : {a: 0}, font_descriptor: {size: 16, weight: :bold}, text_x: 0, text_y: OS.windows? ? 0 : 5)
+
+              horizontal_box {
+                label('Width')
+                spinbox(1, 1000) {
+                  value <=> [self, :label_width, after_write: method(:rebuild_text_label)]
+                }
+              }
+              
+              horizontal_box {
+                label('Height')
+                spinbox(1, 1000) {
+                  value <=> [self, :label_height, after_write: method(:rebuild_text_label)]
+                }
+              }
+              
+              horizontal_box {
+                label('Font')
+                font_button {
+                  font <=> [self, :label_font_descriptor, after_write: method(:rebuild_text_label)]
+                }
+              }
+              
+              horizontal_box {
+                label('Text Color')
+                color_button {
+                  color <=> [self, :label_text_color, after_write: method(:rebuild_text_label)]
+                }
+              }
+              
+              horizontal_box {
+                label('Background Color')
+                color_button {
+                  color <=> [self, :label_background_fill, after_write: method(:rebuild_text_label)]
+                }
+              }
+              
+              horizontal_box {
+                label('Border Color')
+                color_button {
+                  color <=> [self, :label_border_stroke, after_write: method(:rebuild_text_label)]
+                }
+              }
+              
+              horizontal_box {
+                label('Text X (0=centered)')
+                spinbox(0, 1000) {
+                  value <=> [self, :label_text_x, on_read: ->(x) {x.nil? ? 0 : x}, on_write: ->(x) {x == 0 ? nil : x}, after_write: method(:rebuild_text_label)]
+                }
+              }
+              
+              horizontal_box {
+                label('Text Y (0=centered)')
+                spinbox(0, 1000) {
+                  value <=> [self, :label_text_y, on_read: ->(y) {y.nil? ? 0 : y}, on_write: ->(y) {y == 0 ? nil : y}, after_write: method(:rebuild_text_label)]
+                }
+              }
+            }
+            
+            @text_label = text_label('This is a text label.',
+                                     width: label_width, height: label_height, font_descriptor: label_font_descriptor,
+                                     background_fill: label_background_fill, text_color: label_text_color, border_stroke: label_border_stroke,
+                                     text_x: label_text_x, text_y: label_text_y)
+          }
+        }
+        
+        tab_item('Push Button') {
+          @push_button_vertical_box = vertical_box {
+            vertical_box {
+              text_label('Push Button Form:', width: 385, height: 30, background_fill: OS.windows? ? :white : {a: 0}, border_stroke: OS.windows? ? :white : {a: 0}, font_descriptor: {size: 16, weight: :bold}, text_x: 0, text_y: OS.windows? ? 0 : 5)
+              
+              horizontal_box {
+                label('Width')
+                spinbox(1, 1000) {
+                  value <=> [self, :button_width, after_write: method(:rebuild_push_button)]
+                }
+              }
+              
+              horizontal_box {
+                label('Height')
+                spinbox(1, 1000) {
+                  value <=> [self, :button_height, after_write: method(:rebuild_push_button)]
+                }
+              }
+              
+              horizontal_box {
+                label('Font')
+                font_button {
+                  font <=> [self, :button_font_descriptor, after_write: method(:rebuild_push_button)]
+                }
+              }
+              
+              horizontal_box {
+                label('Text Color')
+                color_button {
+                  color <=> [self, :button_text_color, after_write: method(:rebuild_push_button)]
+                }
+              }
+              
+              horizontal_box {
+                label('Background Color')
+                color_button {
+                  color <=> [self, :button_background_fill, after_write: method(:rebuild_push_button)]
+                }
+              }
+              
+              horizontal_box {
+                label('Border Color')
+                color_button {
+                  color <=> [self, :button_border_stroke, after_write: method(:rebuild_push_button)]
+                }
+              }
+              
+              horizontal_box {
+                label('Text X (0=centered)')
+                spinbox(0, 1000) {
+                  value <=> [self, :button_text_x, on_read: ->(x) {x.nil? ? 0 : x}, on_write: ->(x) {x == 0 ? nil : x}, after_write: method(:rebuild_push_button)]
+                }
+              }
+              
+              horizontal_box {
+                label('Text Y (0=centered)')
+                spinbox(0, 1000) {
+                  value <=> [self, :button_text_y, on_read: ->(y) {y.nil? ? 0 : y}, on_write: ->(y) {y == 0 ? nil : y}, after_write: method(:rebuild_push_button)]
+                }
+              }
+            }
+            
+            @push_button = push_button('Push',
+                                       width: button_width, height: button_height, font_descriptor: button_font_descriptor,
+                                       background_fill: button_background_fill, text_color: button_text_color, border_stroke: button_border_stroke,
+                                       text_x: button_text_x, text_y: button_text_y) {
+              on_mouse_up do
+                message_box('Button Pushed', 'Thank you for pushing the button!')
+              end
+            }
+          }
+        }
+      }
+    }.show
+  end
+    
+  # text label (area-based custom control) built with vector graphics on top of area.
+  #
+  # background_fill is transparent by default.
+  # background_fill can accept a single color or gradient stops just as per `fill` property in README.
+  # border_stroke is transparent by default.
+  # border_stroke can accept thickness and dashes in addition to color just as per `stroke` property in README.
+  def text_label(label_text,
+                  width: 80, height: 30, font_descriptor: {},
+                  background_fill: {a: 0}, text_color: :black, border_stroke: {a: 0},
+                  text_x: nil, text_y: nil,
+                  &content)
+    area { |the_area|
+      rectangle(1, 1, width, height) {
+        fill background_fill
+      }
+      rectangle(1, 1, width, height) {
+        stroke border_stroke
+      }
+      
+      text_height = (font_descriptor[:size] || 12) * (OS.mac? ? 0.75 : 1.35)
+      text_width = (text_height * label_text.size) * (OS.mac? ? 0.75 : 0.60)
+      text_x ||= (width - text_width) / 2.0
+      text_y ||= (height - 4 - text_height) / 2.0
+      text(text_x, text_y, width) {
+        string(label_text) {
+          color text_color
+          font font_descriptor
+        }
+      }
+      
+      content&.call(the_area)
+    }
+  end
+  
+  # push button (area-based custom control) built with vector graphics on top of area.
+  #
+  # background_fill is white by default.
+  # background_fill can accept a single color or gradient stops just as per `fill` property in README.
+  # border_stroke is black by default.
+  # border_stroke can accept thickness and dashes in addition to color just as per `stroke` property in README.
+  # text_x and text_y are the offset of the button text in releation to its top-left corner
+  # When text_x, text_y are left nil, the text is automatically centered in the button area.
+  # Sometimes, the centering calculation is not perfect due to using a custom font, so
+  # in that case, pass in text_x, and text_y manually
+  #
+  # reuses the text_label custom control
+  def push_button(button_text,
+                  width: 80, height: 30, font_descriptor: {},
+                  background_fill: :white, text_color: :black, border_stroke: {r: 201, g: 201, b: 201},
+                  text_x: nil, text_y: nil,
+                  &content)
+    text_label(button_text,
+                  width: width, height: height, font_descriptor: font_descriptor,
+                  background_fill: background_fill, text_color: text_color, border_stroke: border_stroke,
+                  text_x: text_x, text_y: text_y) { |the_area|
+      
+      # dig into the_area content and grab elements to modify in mouse listeners below
+      background_rectangle = the_area.children[0]
+      button_string = the_area.children[2].children[0]
+      
+      on_mouse_down do
+        background_rectangle.fill = {x0: 0, y0: 0, x1: 0, y1: height, stops: [{pos: 0, r: 72, g: 146, b: 247}, {pos: 1, r: 12, g: 85, b: 214}]}
+        button_string.color = :white
+      end
+      
+      on_mouse_up do
+        background_rectangle.fill = background_fill
+        button_string.color = text_color
+      end
+      
+      content&.call(the_area)
+    }
+  end
+end
+
+AreaBasedCustomControls.new.launch

data/examples/basic_table.rb

@@ -17,7 +17,7 @@ window('Animal sounds', 300, 200) {
     table {
       text_column('Animal')
       text_column('Description')
-
+     
       cell_rows data
     }
   }

data/examples/cpu_percentage.rb

@@ -11,7 +11,7 @@ Glimmer::LibUI.timer(1) do
   cpu_percentage_value = nil
   if OS.windows?
     cpu_percentage_raw_value = `wmic cpu get loadpercentage`
-    cpu_percentage_value = cpu_percentage_raw_value.split("\n")[2].to_i
+    cpu_percentage_value = cpu_percentage_raw_value.split("\n").map(&:strip).find {|l| l.match(/^\d+$/)}.to_i
   elsif OS.mac?
     cpu_percentage_value = `ps -A -o %cpu | awk '{s+=$1} END {print s}'`.to_i
   elsif OS.linux?

data/examples/custom_draw_text.rb

@@ -21,6 +21,7 @@ class CustomDrawText
               @string.font = fb.font
             end
           }
+
           color_button { |cb|
             label 'Color'
             
@@ -28,13 +29,17 @@ class CustomDrawText
               @string.color = cb.color
             end
           }
-          color_button { |cb|
-            label 'Background'
-            
-            on_changed do
-              @string.background = cb.color
-            end
-          }
+
+          unless OS.windows?
+            color_button { |cb|
+              label 'Background'
+              
+              on_changed do
+                @string.background = cb.color
+              end
+            }
+          end
+
           combobox { |c|
             label 'Underline'
             items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
@@ -44,6 +49,7 @@ class CustomDrawText
               @string.underline = c.selected_item.underscore
             end
           }
+
           combobox { |c|
             label 'Underline Built-In Color'
             items Glimmer::LibUI.enum_symbols(:underline_color).map(&:to_s).map(&:capitalize)
@@ -59,6 +65,7 @@ class CustomDrawText
               end
             end
           }
+
           @underline_custom_color_button = color_button {
             label 'Underline Custom Color'
             

data/examples/custom_draw_text2.rb

@@ -22,6 +22,7 @@ class CustomDrawText
               @area.queue_redraw_all
             end
           }
+
           color_button { |cb|
             label 'Color'
             
@@ -30,14 +31,18 @@ class CustomDrawText
               @area.queue_redraw_all
             end
           }
-          color_button { |cb|
-            label 'Background'
-            
-            on_changed do
-              @background = cb.color
-              @area.queue_redraw_all
-            end
-          }
+          
+          unless OS.windows?
+            color_button { |cb|
+              label 'Background'
+              
+              on_changed do
+                @background = cb.color
+                @area.queue_redraw_all
+              end
+            }
+          end
+
           combobox { |c|
             label 'Underline'
             items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
@@ -48,6 +53,7 @@ class CustomDrawText
               @area.queue_redraw_all
             end
           }
+
           combobox { |c|
             label 'Underline Built-In Color'
             items Glimmer::LibUI.enum_symbols(:underline_color).map(&:to_s).map(&:capitalize)
@@ -64,6 +70,7 @@ class CustomDrawText
               @area.queue_redraw_all
             end
           }
+
           @underline_custom_color_button = color_button {
             label 'Underline Custom Color'
             

data/examples/method_based_custom_keyword.rb

@@ -13,13 +13,13 @@ def form_field(model, attribute)
   }
 end
 
-def address_form(address)
+def address_form(address_model)
   form {
-    form_field(address, :street)
-    form_field(address, :p_o_box)
-    form_field(address, :city)
-    form_field(address, :state)
-    form_field(address, :zip_code)
+    form_field(address_model, :street)
+    form_field(address_model, :p_o_box)
+    form_field(address_model, :city)
+    form_field(address_model, :state)
+    form_field(address_model, :zip_code)
   }
 end
 
@@ -32,10 +32,10 @@ def label_pair(model, attribute, value)
   }
 end
 
-def address(address)
+def address(address_model)
   vertical_box {
-    address.each_pair do |attribute, value|
-      label_pair(address, attribute, value)
+    address_model.each_pair do |attribute, value|
+      label_pair(address_model, attribute, value)
     end
   }
 end

data/examples/method_based_custom_keyword2.rb

@@ -17,13 +17,13 @@ def form_field(model, property)
   }
 end
 
-def address_form(address)
+def address_form(address_model)
   form {
-    form_field(address, :street)
-    form_field(address, :p_o_box)
-    form_field(address, :city)
-    form_field(address, :state)
-    form_field(address, :zip_code)
+    form_field(address_model, :street)
+    form_field(address_model, :p_o_box)
+    form_field(address_model, :city)
+    form_field(address_model, :state)
+    form_field(address_model, :zip_code)
   }
 end
 
@@ -39,10 +39,10 @@ def label_pair(model, attribute, value)
   end
 end
 
-def address(address)
+def address(address_model)
   vertical_box {
-    address.each_pair do |attribute, value|
-      label_pair(address, attribute, value)
+    address_model.each_pair do |attribute, value|
+      label_pair(address_model, attribute, value)
     end
   }
 end

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

@@ -41,6 +41,7 @@ module Glimmer
           shine_data_binding
           property
           string
+          operation
           control
           shape
         ]

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

@@ -25,7 +25,7 @@ require 'glimmer/dsl/observe_expression'
 
 module Glimmer
   module DSL
-    module SWT
+    module Libui
       class ObserveExpression < StaticExpression
         include TopLevelExpression
         include Glimmer::DSL::ObserveExpression

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

@@ -0,0 +1,47 @@
+# 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/libui/control_proxy'
+require 'glimmer/libui/shape'
+require 'glimmer/libui/attributed_string'
+
+module Glimmer
+  module DSL
+    module Libui
+      class OperationExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          (
+            parent.is_a?(Glimmer::LibUI::ControlProxy) or
+              parent.is_a?(Glimmer::LibUI::Shape) or
+              parent.is_a?(Glimmer::LibUI::AttributedString)
+          ) and
+            block.nil? and
+            parent.respond_to?(keyword, *args)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          parent.send(keyword, *args)
+        end
+      end
+    end
+  end
+end

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

@@ -35,11 +35,11 @@ module Glimmer
               parent.is_a?(Glimmer::LibUI::AttributedString)
           ) and
             block.nil? and
-            parent.respond_to?(keyword, *args)
+            parent.respond_to?("#{keyword}=", *args)
         end
   
         def interpret(parent, keyword, *args, &block)
-          parent.send(keyword, *args)
+          parent.send("#{keyword}=", *args)
         end
       end
     end

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

@@ -45,6 +45,7 @@ module Glimmer
           child.deregister_all_custom_listeners
           ::LibUI.send("box_delete", @libui, children.index(child))
           ControlProxy.control_proxies.delete(child)
+          children.delete(child)
         end
         
         private

data/lib/glimmer/libui/control_proxy/column/background_color_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class BackgroundColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              :white
+            end
+          end
+          
           include Column
           
           def name

data/lib/glimmer/libui/control_proxy/column/button_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ButtonColumnProxy < ControlProxy
+          class << self
+            def default_value
+              ''
+            end
+          end
+          
           include Column
           include EnableableColumn
           

data/lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxColumnProxy < ControlProxy
+          class << self
+            def default_value
+              false
+            end
+          end
+          
           include Column
           include EditableColumn
           

data/lib/glimmer/libui/control_proxy/column/checkbox_text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxTextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [false, '', :black]
+            end
+          end
+          
           include Column
           include TripleColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxTextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [false, '']
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/image_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageColumnProxy < ControlProxy
+          class << self
+            def default_value
+              Glimmer::LibUI::ICON
+            end
+          end
+          
           include Column
         
           private

data/lib/glimmer/libui/control_proxy/column/image_text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageTextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [Glimmer::LibUI::ICON, '', :black]
+            end
+          end
+          
           include Column
           include TripleColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageTextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [Glimmer::LibUI::ICON, '']
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn