glimmer-dsl-libui 0.11.6 → 0.11.8

data/examples/basic_area.rb

@@ -5,11 +5,9 @@ include Glimmer
 window('Basic Area', 400, 400) {
   margined true
   
-  vertical_box {
-    area {
-      rectangle(0, 0, 400, 400) { # stable implicit path shape, added declaratively
-        fill r: 102, g: 102, b: 204, a: 1.0
-      }
+  area {
+    rectangle(0, 0, 400, 400) { # stable implicit path shape, added declaratively
+      fill r: 102, g: 102, b: 204, a: 1.0
     }
   }
 }.show

data/examples/basic_area2.rb

@@ -5,13 +5,11 @@ include Glimmer
 window('Basic Area', 400, 400) {
   margined true
   
-  vertical_box {
-    area {
-      on_draw do |area_draw_params|
-        rectangle(0, 0, 400, 400) { # dynamic implicit path shape, added semi-declaratively inside on_draw block
-          fill r: 102, g: 102, b: 204, a: 1.0
-        }
-      end
-    }
+  area {
+    on_draw do |area_draw_params|
+      rectangle(0, 0, 400, 400) { # dynamic implicit path shape, added semi-declaratively inside on_draw block
+        fill r: 102, g: 102, b: 204, a: 1.0
+      }
+    end
   }
 }.show

data/examples/basic_area3.rb

@@ -5,13 +5,11 @@ include Glimmer
 window('Basic Area', 400, 400) {
   margined true
   
-  vertical_box {
-    area {
-      path { # stable path, added declaratively
-        rectangle(0, 0, 400, 400)
-        
-        fill r: 102, g: 102, b: 204, a: 1.0
-      }
+  area {
+    path { # stable path, added declaratively
+      rectangle(0, 0, 400, 400)
+      
+      fill r: 102, g: 102, b: 204, a: 1.0
     }
   }
 }.show

data/examples/basic_area4.rb

@@ -5,15 +5,13 @@ include Glimmer
 window('Basic Area', 400, 400) {
   margined true
   
-  vertical_box {
-    area {
-      on_draw do |area_draw_params|
-        path { # dynamic path, added semi-declaratively inside on_draw block
-          rectangle(0, 0, 400, 400)
-          
-          fill r: 102, g: 102, b: 204, a: 1.0
-        }
-      end
-    }
+  area {
+    on_draw do |area_draw_params|
+      path { # dynamic path, 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_button.rb

@@ -25,30 +25,28 @@ class BasicTableButton
   
   def launch
     window('Animal sounds', 400, 200) {
-      horizontal_box {
-        table {
-          text_column('Animal')
-          text_column('Description')
-          button_column('Action') {
-            on_clicked do |row|
-              # Option 1: direct data deletion is the simpler solution
-#               @animals.delete_at(row) # automatically deletes actual table row due to explicit data-binding
-              
-              # Option 2: cloning only to demonstrate table row deletion upon explicit setting of animals attribute (cloning is not recommended beyond demonstrating this point)
-              new_animals = @animals.clone
-              new_animals.delete_at(row)
-              self.animals = new_animals # automatically loses deleted table row due to explicit data-binding
-            end
-          }
-    
-          cell_rows <= [self, :animals, column_attributes: {'Animal' => :name, 'Description' => :sound}]
-          
-          # explicit unidirectional data-binding of table cell_rows to self.animals
-          on_changed do |row, type, row_data|
-            puts "Row #{row} #{type}: #{row_data}"
-            $stdout.flush
+      table {
+        text_column('Animal')
+        text_column('Description')
+        button_column('Action') {
+          on_clicked do |row|
+            # Option 1: direct data deletion is the simpler solution
+#             @animals.delete_at(row) # automatically deletes actual table row due to explicit data-binding
+            
+            # Option 2: cloning only to demonstrate table row deletion upon explicit setting of animals attribute (cloning is not recommended beyond demonstrating this point)
+            new_animals = @animals.clone
+            new_animals.delete_at(row)
+            self.animals = new_animals # automatically loses deleted table row due to explicit data-binding
           end
         }
+  
+        cell_rows <= [self, :animals, column_attributes: {'Animal' => :name, 'Description' => :sound}]
+        
+        # explicit unidirectional data-binding of table cell_rows to self.animals
+        on_changed do |row, type, row_data|
+          puts "Row #{row} #{type}: #{row_data}"
+          $stdout.flush
+        end
       }
     }.show
   end

data/examples/basic_table_button2.rb

@@ -13,22 +13,20 @@ data = [
 ]
 
 window('Animal sounds', 400, 200) {
-  horizontal_box {
-    table {
-      text_column('Animal')
-      text_column('Description')
-      button_column('Action') {
-        on_clicked do |row|
-          data.delete_at(row) # automatically deletes actual table row due to implicit data-binding
-        end
-      }
-
-      cell_rows data # implicit data-binding
-      
-      on_changed do |row, type, row_data|
-        puts "Row #{row} #{type}: #{row_data}"
-        $stdout.flush
+  table {
+    text_column('Animal')
+    text_column('Description')
+    button_column('Action') {
+      on_clicked do |row|
+        data.delete_at(row) # automatically deletes actual table row due to implicit data-binding
       end
     }
+
+    cell_rows data # implicit data-binding
+    
+    on_changed do |row, type, row_data|
+      puts "Row #{row} #{type}: #{row_data}"
+      $stdout.flush
+    end
   }
 }.show

data/examples/basic_table_checkbox.rb

@@ -13,25 +13,23 @@ data = [
 ]
 
 window('Animal sounds', 400, 200) {
-  horizontal_box {
-    table {
-      text_column('Animal')
-      text_column('Description')
-      checkbox_column('Mammal') {
-        editable true
-      }
-
-      cell_rows data
-      
-      on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
-        puts "Row #{row} #{type}: #{row_data}"
-        $stdout.flush
-      end
-      
-      on_edited do |row, row_data| # only fires on direct table editing
-        puts "Row #{row} edited: #{row_data}"
-        $stdout.flush
-      end
+  table {
+    text_column('Animal')
+    text_column('Description')
+    checkbox_column('Mammal') {
+      editable true
     }
+
+    cell_rows data
+    
+    on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
+      puts "Row #{row} #{type}: #{row_data}"
+      $stdout.flush
+    end
+    
+    on_edited do |row, row_data| # only fires on direct table editing
+      puts "Row #{row} edited: #{row_data}"
+      $stdout.flush
+    end
   }
 }.show

data/examples/basic_table_checkbox_text.rb

@@ -13,25 +13,23 @@ data = [
 ]
 
 window('Animal sounds', 400, 200) {
-  horizontal_box {
-    table {
-      text_column('Animal')
-      text_column('Sound')
-      checkbox_text_column('Description') {
-        editable true
-      }
-
-      cell_rows data
-      
-      on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
-        puts "Row #{row} #{type}: #{row_data.map(&:to_s)}"
-        $stdout.flush
-      end
-      
-      on_edited do |row, row_data| # only fires on direct table editing
-        puts "Row #{row} edited: #{row_data.map(&:to_s)}"
-        $stdout.flush
-      end
+  table {
+    text_column('Animal')
+    text_column('Sound')
+    checkbox_text_column('Description') {
+      editable true
     }
+
+    cell_rows data
+    
+    on_changed do |row, type, row_data| # fires on all changes (even ones happening through data array)
+      puts "Row #{row} #{type}: #{row_data.map(&:to_s)}"
+      $stdout.flush
+    end
+    
+    on_edited do |row, row_data| # only fires on direct table editing
+      puts "Row #{row} edited: #{row_data.map(&:to_s)}"
+      $stdout.flush
+    end
   }
 }.show

data/examples/basic_table_color.rb

@@ -89,16 +89,14 @@ class BasicTableColor
   
   def launch
     window('Animals', 500, 200) {
-      horizontal_box {
-        table {
-          text_color_column('Animal')
-          text_color_column('Sound')
-          checkbox_text_color_column('Description')
-          image_text_color_column('GUI')
-          background_color_column # must always be the last column and always expects data-binding model attribute `background_color` when binding to Array of models
-    
-          cell_rows <= [self, :animals, column_attributes: {'Animal' => :name_color, 'Sound' => :sound_color, 'Description' => :mammal_description_color, 'GUI' => :image_description_color}]
-        }
+      table {
+        text_color_column('Animal')
+        text_color_column('Sound')
+        checkbox_text_color_column('Description')
+        image_text_color_column('GUI')
+        background_color_column # must always be the last column and always expects data-binding model attribute `background_color` when binding to Array of models
+  
+        cell_rows <= [self, :animals, column_attributes: {'Animal' => :name_color, 'Sound' => :sound_color, 'Description' => :mammal_description_color, 'GUI' => :image_description_color}]
       }
     }.show
   end

data/examples/basic_table_color2.rb

@@ -13,15 +13,13 @@ data = [
 ]
 
 window('Animals', 500, 200) {
-  horizontal_box {
-    table {
-      text_color_column('Animal')
-      text_color_column('Sound')
-      checkbox_text_color_column('Description')
-      image_text_color_column('GUI')
-      background_color_column # must be the last column
+  table {
+    text_color_column('Animal')
+    text_color_column('Sound')
+    checkbox_text_color_column('Description')
+    image_text_color_column('GUI')
+    background_color_column # must be the last column
 
-      cell_rows data
-    }
+    cell_rows data
   }
 }.show

data/examples/basic_table_color3.rb

@@ -23,15 +23,13 @@ data = [
 ]
 
 window('Animals', 500, 200) {
-  horizontal_box {
-    table {
-      text_color_column('Animal')
-      text_color_column('Sound')
-      checkbox_text_color_column('Description')
-      image_text_color_column('GUI')
-      background_color_column('Mammal')
+  table {
+    text_color_column('Animal')
+    text_color_column('Sound')
+    checkbox_text_color_column('Description')
+    image_text_color_column('GUI')
+    background_color_column('Mammal')
 
-      cell_rows data
-    }
+    cell_rows data
   }
 }.show

data/examples/basic_table_image_text.rb

@@ -19,14 +19,12 @@ rescue StandardError => e
 end
 
 window('The Red Turtle', 670, 350) {
-  horizontal_box {
-    table {
-      image_text_column('image/number')
-      image_text_column('image/number (editable)') {
-        editable true
-      }
-      
-      cell_rows IMAGE_ROWS
+  table {
+    image_text_column('image/number')
+    image_text_column('image/number (editable)') {
+      editable true
     }
+    
+    cell_rows IMAGE_ROWS
   }
 }.show

data/examples/basic_table_image_text2.rb

@@ -20,14 +20,12 @@ rescue StandardError => e
 end
 
 window('The Red Turtle', 670, 350) {
-  horizontal_box {
-    table {
-      image_text_column('image/number')
-      image_text_column('image/number (editable)') {
-        editable true
-      }
-      
-      cell_rows IMAGE_ROWS
+  table {
+    image_text_column('image/number')
+    image_text_column('image/number (editable)') {
+      editable true
     }
+    
+    cell_rows IMAGE_ROWS
   }
 }.show

data/examples/basic_table_image_text3.rb

@@ -31,14 +31,12 @@ rescue StandardError => e
 end
 
 window('The Red Turtle', 670, 350) {
-  horizontal_box {
-    table {
-      image_text_column('image/number')
-      image_text_column('image/number (editable)') {
-        editable true
-      }
-      
-      cell_rows IMAGE_ROWS
+  table {
+    image_text_column('image/number')
+    image_text_column('image/number (editable)') {
+      editable true
     }
+    
+    cell_rows IMAGE_ROWS
   }
 }.show

data/examples/date_time_picker.rb

@@ -1,25 +1,25 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
-class DateTimePicker
-  include Glimmer
+class Event
+  attr_accessor :time
+end
+
+class DateTimePickerApplication
+  include Glimmer::LibUI::Application
   
-  attr_accessor :picked_time
+  before_body do
+    @event = Event.new
+  end
   
-  def launch
+  body {
     window('Date Time Pickers', 300, 200) {
-      vertical_box {
-        date_time_picker {
-          time <=> [self, :picked_time, after_write: ->(time) { p time }]
-        }
+      date_time_picker {
+        time <=> [@event, :time,
+                   after_write: ->(time) { p time }
+                 ]
       }
-      
-      on_closing do
-        puts 'Bye Bye'
-      end
-    }.show
-  end
+    }
+  }
 end
 
-DateTimePicker.new.launch
+DateTimePickerApplication.launch

data/examples/date_time_picker2.rb

@@ -1,20 +1,12 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
 
 window('Date Time Pickers', 300, 200) {
-  vertical_box {
-    date_time_picker { |dtp|
-      on_changed do
-        time = dtp.time
-        p time
-      end
-    }
+  date_time_picker { |dtp|
+    on_changed do
+      time = dtp.time
+      p time
+    end
   }
-  
-  on_closing do
-    puts 'Bye Bye'
-  end
 }.show

data/examples/lazy_table.rb

@@ -58,16 +58,14 @@ class LazyTable
     window("1,000,000 Lazy Loaded Contacts", 600, 700) {
       margined true
       
-      vertical_box {
-        table {
-          text_column('Name')
-          text_column('Email')
-          text_column('Phone')
-          text_column('City')
-          text_column('State')
-          
-          cell_rows ContactGenerator.new(1_000_000)
-        }
+      table {
+        text_column('Name')
+        text_column('Email')
+        text_column('Phone')
+        text_column('City')
+        text_column('State')
+        
+        cell_rows ContactGenerator.new(1_000_000)
       }
     }
   }

data/examples/lazy_table2.rb

@@ -53,16 +53,14 @@ class LazyTable
     window("1,000,000 Lazy Loaded Contacts", 600, 700) {
       margined true
       
-      vertical_box {
-        table {
-          text_column('Name')
-          text_column('Email')
-          text_column('Phone')
-          text_column('City')
-          text_column('State')
-          
-          cell_rows @contacts
-        }
+      table {
+        text_column('Name')
+        text_column('Email')
+        text_column('Phone')
+        text_column('City')
+        text_column('State')
+        
+        cell_rows @contacts
       }
     }
   }

data/examples/lazy_table3.rb

@@ -56,16 +56,14 @@ class LazyTable
     window("1,000,000 Lazy Loaded Contacts", 600, 700) {
       margined true
       
-      vertical_box {
-        table {
-          text_column('Name')
-          text_column('Email')
-          text_column('Phone')
-          text_column('City')
-          text_column('State')
-          
-          cell_rows ContactGenerator.new(1_000_000)
-        }
+      table {
+        text_column('Name')
+        text_column('Email')
+        text_column('Phone')
+        text_column('City')
+        text_column('State')
+        
+        cell_rows ContactGenerator.new(1_000_000)
       }
     }
   }

data/examples/lazy_table4.rb

@@ -51,16 +51,14 @@ class LazyTable
     window("1,000,000 Lazy Loaded Contacts", 600, 700) {
       margined true
       
-      vertical_box {
-        table {
-          text_column('Name')
-          text_column('Email')
-          text_column('Phone')
-          text_column('City')
-          text_column('State')
-          
-          cell_rows @contacts
-        }
+      table {
+        text_column('Name')
+        text_column('Email')
+        text_column('Phone')
+        text_column('City')
+        text_column('State')
+        
+        cell_rows @contacts
       }
     }
   }

data/examples/simple_notepad.rb

@@ -5,11 +5,5 @@ require 'glimmer-dsl-libui'
 include Glimmer
 
 window('Notepad', 500, 300) {
-  on_closing do
-    puts 'Bye Bye'
-  end
-  
-  vertical_box {
-    non_wrapping_multiline_entry
-  }
+  non_wrapping_multiline_entry
 }.show

data/examples/tetris/model/block.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/examples/tetris/model/game.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/examples/tetris/model/past_game.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/examples/tetris/model/tetromino.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/examples/tetris.rb

@@ -396,7 +396,7 @@ class Tetris
   
   def show_about_dialog
     Glimmer::LibUI.queue_main do
-      msg_box('About', 'Glimmer Tetris - Glimmer DSL for LibUI Example - Copyright (c) 2021-2023 Andy Maleh')
+      msg_box('About', 'Glimmer Tetris - Glimmer DSL for LibUI Example - Copyright (c) 2021-2024 Andy Maleh')
     end
   end
 end

data/examples/tic_tac_toe/board.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/examples/tic_tac_toe/cell.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 Andy Maleh
+# Copyright (c) 2021-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the