glimmer-dsl-libui 0.4.14 → 0.4.18

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

@@ -22,6 +22,11 @@ window('Editable column animal sounds', 400, 200) {
       }
 
       cell_rows data
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+        $stdout.flush
+      end
     }
   }
   

data/examples/form_table.rb

@@ -18,7 +18,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -56,8 +56,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to explicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -102,6 +102,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+      
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table2.rb

@@ -1,7 +1,7 @@
 require 'glimmer-dsl-libui'
 
 class FormTable
-  Contact = Struct.new(:name, :email, :phone, :city, :state)
+  Contact = Struct.new(:name, :email, :phone, :city, :state_province)
   
   include Glimmer
   
@@ -18,7 +18,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -56,8 +56,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -95,13 +95,19 @@ class FormTable
           text_column('Email')
           text_column('Phone')
           text_column('City')
-          text_column('State/Province')
+          text_column('State')
     
           editable true
-          cell_rows <=> [self, :contacts, column_attributes: {'State/Province' => :state}] # explicit data-binding to Model Array with column_attributes mapping for a specific column
+          cell_rows <=> [self, :contacts, column_attributes: {'State' => :state_province}] # explicit data-binding to Model Array with column_attributes mapping for a specific column
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table3.rb

@@ -19,7 +19,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -57,8 +57,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -103,6 +103,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table4.rb

@@ -16,7 +16,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -54,8 +54,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               data << new_row # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_data = data.dup
@@ -100,6 +100,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table5.rb

@@ -10,7 +10,7 @@ data = [
   ['Melody Hanheimer', 'melody@hanheimer.com', '213-493-8274', 'Los Angeles', 'CA'],
 ]
 
-window('Contacts', 600, 600) { |w|
+window('Contacts', 600, 600) {
   margined true
   
   vertical_box {
@@ -43,8 +43,8 @@ window('Contacts', 600, 600) { |w|
       
       on_clicked do
         new_row = [@name_entry.text, @email_entry.text, @phone_entry.text, @city_entry.text, @state_entry.text]
-        if new_row.include?('')
-          msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+        if new_row.map(&:to_s).include?('')
+          msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
         else
           data << new_row # automatically inserts a row into the table due to implicit data-binding
           @unfiltered_data = data.dup
@@ -88,6 +88,12 @@ window('Contacts', 600, 600) { |w|
       
       on_changed do |row, type, row_data|
         puts "Row #{row} #{type}: #{row_data}"
+        $stdout.flush # for Windows
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+        $stdout.flush # for Windows
       end
     }
   }

data/examples/meta_example.rb

@@ -180,7 +180,9 @@ class MetaExample
             }
             button('Reset') {
               on_clicked do
-                self.code_text = File.read(file_path_for(selected_example))
+                version_number = @version_spinbox.value == 1 ? '' : @version_spinbox.value
+                example = "#{selected_example}#{version_number}"
+                self.code_text = File.read(file_path_for(example))
               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/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/attributed_string.rb

@@ -22,7 +22,6 @@
 require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/parent'
-require 'glimmer/libui/control_proxy/transformable'
 require 'glimmer/libui/data_bindable'
 
 module Glimmer
@@ -48,7 +47,7 @@ module Glimmer
           @string
         else
           @string = value
-          redraw
+          request_auto_redraw
         end
       end
       alias string= string
@@ -59,7 +58,7 @@ module Glimmer
           @font
         else
           @font = value
-          redraw
+          request_auto_redraw
         end
       end
       alias font= font
@@ -70,7 +69,7 @@ module Glimmer
           @color
         else
           @color = Glimmer::LibUI.interpret_color(value)
-          redraw
+          request_auto_redraw
         end
       end
       alias color= color
@@ -81,7 +80,7 @@ module Glimmer
           @background
         else
           @background = Glimmer::LibUI.interpret_color(value)
-          redraw
+          request_auto_redraw
         end
       end
       alias background= background
@@ -92,7 +91,7 @@ module Glimmer
           @underline
         else
           @underline = value
-          redraw
+          request_auto_redraw
         end
       end
       alias underline= underline
@@ -103,7 +102,7 @@ module Glimmer
           @underline_color
         else
           @underline_color = value
-          redraw
+          request_auto_redraw
         end
       end
       alias underline_color= underline_color
@@ -114,12 +113,21 @@ module Glimmer
           @open_type_features
         else
           @open_type_features = value
-          redraw
+          request_auto_redraw
         end
       end
       alias open_type_features= open_type_features
       alias set_open_type_features open_type_features
       
+      def remove_open_type_features
+        return if @removing_open_type_features
+        @removing_open_type_features = true
+        @open_type_features&.destroy
+        @open_type_features = nil
+        request_auto_redraw
+        @removing_open_type_features = false
+      end
+      
       def post_add_content(block = nil)
         block ||= @block
         block_result = block&.call
@@ -189,6 +197,7 @@ module Glimmer
       end
       
       def destroy
+        return if ControlProxy.main_window_proxy&.destroying?
         open_type_features.destroy unless open_type_features.nil?
         @parent_proxy&.children&.delete(self)
       end

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

@@ -36,9 +36,9 @@ module Glimmer
           attr_accessor :current_area_draw_params
         end
         
-        LISTENERS = ['on_draw', 'on_mouse_event', 'on_mouse_move', 'on_mouse_down', 'on_mouse_up', 'on_mouse_drag_start', 'on_mouse_drag', 'on_mouse_drop', 'on_mouse_crossed', 'on_mouse_enter', 'on_mouse_exit', 'on_drag_broken', 'on_key_event', 'on_key_down', 'on_key_up']
+        CUSTOM_LISTENER_NAMES = ['on_draw', 'on_mouse_event', 'on_mouse_move', 'on_mouse_down', 'on_mouse_up', 'on_mouse_drag_start', 'on_mouse_drag', 'on_mouse_drop', 'on_mouse_crossed', 'on_mouse_enter', 'on_mouse_exit', 'on_drag_broken', 'on_key_event', 'on_key_down', 'on_key_up']
         
-        LISTENER_ALIASES = {
+        CUSTOM_LISTENER_NAME_ALIASES = {
           on_drawn: 'on_draw',
           on_mouse_moved: 'on_mouse_move',
           on_mouse_drag_started: 'on_mouse_drag_start',
@@ -105,7 +105,7 @@ module Glimmer
         
         def draw(area_draw_params)
           children.dup.each {|child| child.draw(area_draw_params)}
-          on_draw.each {|listener| listener.call(area_draw_params)}
+          notify_custom_listeners('on_draw', area_draw_params)
         end
         
         def redraw
@@ -156,37 +156,37 @@ module Glimmer
             @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
               area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
               area_mouse_event = area_mouse_event_hash(area_mouse_event)
-              on_mouse_event.each { |listener| listener.call(area_mouse_event)}
-              on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
+              notify_custom_listeners('on_mouse_event', area_mouse_event)
+              notify_custom_listeners('on_mouse_move', area_mouse_event) if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
               unless @last_area_mouse_event.nil?
-                on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
-                on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
-                on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
-                on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
-                on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+                notify_custom_listeners('on_mouse_down', area_mouse_event) if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
+                notify_custom_listeners('on_mouse_up', area_mouse_event) if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
+                notify_custom_listeners('on_mouse_drag_start', area_mouse_event) if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
+                notify_custom_listeners('on_mouse_drag', area_mouse_event) if area_mouse_event[:held] > 0
+                notify_custom_listeners('on_mouse_drop', area_mouse_event) if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
               end
               @last_area_mouse_event = area_mouse_event
             end
             @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
               left = Glimmer::LibUI.integer_to_boolean(left)
-              on_mouse_crossed.each { |listener| listener.call(left) }
+              notify_custom_listeners('on_mouse_crossed', left)
               if left
-                on_mouse_exit.each { |listener| listener.call(left) }
+                notify_custom_listeners('on_mouse_exit', left)
               else
-                on_mouse_enter.each { |listener| listener.call(left) }
+                notify_custom_listeners('on_mouse_enter', left)
               end
             end
             @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
-              on_drag_broken.each { |listener| listener.call }
+              notify_custom_listeners('on_drag_broken')
             end
             @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
               area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
               area_key_event = area_key_event_hash(area_key_event)
-              on_key_event.each { |listener| listener.call(area_key_event) }
+              notify_custom_listeners('on_key_event', area_key_event)
               if area_key_event[:up]
-                on_key_up.each { |listener| listener.call(area_key_event) }
+                notify_custom_listeners('on_key_up', area_key_event)
               else
-                on_key_down.each { |listener| listener.call(area_key_event) }
+                notify_custom_listeners('on_key_down', area_key_event)
               end
             end
             @listeners_installed = true

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

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

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,39 +31,17 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ButtonColumnProxy < ControlProxy
-          include Column
-          include EnableableColumn
-          
-          def on_clicked(&block)
-            # TODO consider generalizing into custom listeners and moving to ControlProxy
-            @on_clicked_procs ||= []
-            if block.nil?
-              @on_clicked_procs
-            else
-              @on_clicked_procs << block
-              block
+          class << self
+            def default_value
+              ''
             end
           end
           
-          def can_handle_listener?(listener_name)
-            listener_name == 'on_clicked' || super
-          end
+          include Column
+          include EnableableColumn
           
-          def handle_listener(listener_name, &listener)
-            case listener_name
-            when 'on_clicked'
-              on_clicked(&listener)
-            else
-              super
-            end
-          end
+          CUSTOM_LISTENER_NAMES = ['on_clicked']
           
-          def notify_listeners(listener_name, *args)
-            @on_clicked_procs&.each do |on_clicked_proc|
-              on_clicked_proc.call(*args)
-            end
-          end
-              
           private
           
           def build_control

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

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

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