glimmer-dsl-libui 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22947befdd94073071547600efd1434fe98babc87c1fb35a169c9133e7979653
-  data.tar.gz: c7733269d49a56c24c13c3df6df4efc680882f12e62926a9169f5114a412af0a
+  metadata.gz: 45785cccb2a89070b2230fdae1c7418b48c6b8ac4682bf6ee0c2eb832f35bc1c
+  data.tar.gz: 0a5544bef68a214ddb4ed55eb4ff71efa5916ce8c7e2d0b1c6d8f36d5b5fbd6f
 SHA512:
-  metadata.gz: d0c881484a837ddc71738e8e91f75881da6de87773703d88172f6d2a13626382d7eaee749ba6ef09f175e90f937a91d248462268780783d34b1a6e65584097da
-  data.tar.gz: f484ecb4e1b16c21899b3263d18d736925752519e6271c611c8ac2ef4639884e8cc057661a7440824cc1df1dacb595226563b9a1343f2b25586358c0340c92cd
+  metadata.gz: '08005e8f56a310c7b534bfafde7e958617ee483985f30facf02a62a015d860a6378e4f7d5399b37fa5a247ef899a7092c313f120d5599a72d288bd3781a43820'
+  data.tar.gz: befd92a20a6bc56c19049cfc385970bd8e113ae191c45ac3c3fffb513dd9140838229b79859392aed2e452d6e235d95059fe5d7847b3ac48cc5b4261aae50b26

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+## 0.0.15
+
+- New examples/form.rb
+- Support `form` control and child attributes of `stretchy` and `label`
+- Smart defaults for `form` child attributes `stretchy` (`true`) and `label` (`''`)
+
+## 0.0.14
+
+- New examples/grid.rb
+- Support `grid` control and child attributes of `left`, `top`, `xspan`, `yspan`, `hexpand`, `halign`, `vexpand`, and `valign`
+- Smart defaults for `grid` child attributes `left` (`0`), `top` (`0`), `xspan` (`1`), `yspan` (`1`), `hexpand` (`false`), `halign` (`0`), `vexpand` (`false`), and `valign` (`0`)
+
+## 0.0.13
+
+- Support examples/date_time_picker.rb
+- Support `date_time_picker`, `date_picker`, and `time_picker` controls having `time`/`time=`/`set_time` property
+
+## 0.0.12
+
+- Have examples/meta_example.rb allow code editing to enable experimentation and learning
+- Fix issue with examples/meta_example using puts_debuggerer (a development gem)
+
 ## 0.0.11
 
 - New examples/basic_color.rb

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.0.11
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.0.15
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-libui/maintainability)
@@ -43,7 +43,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.0.11](#-glimmer-dsl-for-libui-0011)
+- [Glimmer DSL for LibUI 0.0.15](#-glimmer-dsl-for-libui-0015)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -53,6 +53,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Extra Dialogs](#extra-dialogs)
     - [Extra Operations](#extra-operations)
     - [Smart Defaults and Conventions](#smart-defaults-and-conventions)
+    - [API Gotchas](#api-gotchas)
     - [Original API](#original-api)
   - [Glimmer Style Guide](#glimmer-style-guide)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -65,6 +66,9 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Control Gallery](#control-gallery)
     - [Font Button](#font-button)
     - [Color Button](#color-button)
+    - [Date Time Picker](#date-time-picker)
+    - [Grid](#grid)
+    - [Form](#form)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -152,7 +156,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.11'
+gem 'glimmer-dsl-libui', '~> 0.0.15'
 ```
 
 Add `require 'glimmer-dsl-libui'` at the top, and then `include Glimmer` into the top-level main object for testing or into an actual class for serious usage.
@@ -186,7 +190,7 @@ Any control returned by a [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) keyword d
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
 
 ```ruby
-w = window('hello world', 300, 200, 1)
+w = window('hello world')
 puts w.title # => hello world
 w.title = 'howdy'
 puts w.title # => howdy
@@ -199,7 +203,7 @@ Controls are wrapped as Ruby proxy objects, having a `#libui` method to obtain t
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
 
 ```ruby
-w = window('hello world', 300, 200, 1) # => #<Glimmer::LibUI::WindowProxy:0x00007fde4ea39fb0
+w = window('hello world') # => #<Glimmer::LibUI::WindowProxy:0x00007fde4ea39fb0
 w.libui # => #<Fiddle::Pointer:0x00007fde53997980 ptr=0x00007fde51352a60 size=0 free=0x0000000000000000>
 ```
 
@@ -212,11 +216,13 @@ Control(Args) | Properties | Listeners
 `checkbox(text as String)` | `checked` (Boolean), `text` (`String`) | `on_toggled`
 `combobox` | `items` (`Array` of `String`), `selected` (`Integer`) | `on_selected`
 `color_button` | `color` (Array of `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float`), `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float` | `on_changed`
-`date_picker` | `time` (`LibUI::FFI::TM`) | `on_changed`
-`date_time_picker` | `time` (`LibUI::FFI::TM`) | `on_changed`
+`date_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
+`date_time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
 `editable_combobox` | `items` (`Array` of `String`), `text` (`String`) | `on_changed`
 `entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
 `font_button` | `font` [read-only] (`Hash` of keys: `:family`, `:size`, `:weight`, `:italic`, `:stretch`), `family` as `String`, `size` as `Float`, `weight` as `Integer`, `italic` as `Integer`, `stretch` as `Integer` | `on_changed`
+`form` | `padded` (Boolean) | None
+`grid` | `padded` (Boolean) | None
 `group(text as String)` | `margined` (Boolean), `title` (`String`) | None
 `horizontal_box` | `padded` (Boolean) | None
 `horizontal_separator` | None | None
@@ -235,7 +241,7 @@ Control(Args) | Properties | Listeners
 `spinbox(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `tab` | `margined` (Boolean), `num_pages` (`Integer`) | None
 `tab_item(name as String)` | `index` [read-only] (`Integer`), `margined` (Boolean), `name` [read-only] (`String`) | None
-`time_picker` | `time` (`LibUI::FFI::TM`) | `on_changed`
+`time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
 `vertical_box` | `padded` (Boolean) | None
 `window(title as String, width as Integer, height as Integer, has_menubar as Boolean)` | `borderless` (Boolean), `content_size` (width `Numeric`, height `Numeric`), `fullscreen` (Boolean), `margined` (Boolean), `title` (`String`) | `on_closing`, `on_content_size_changed`
 
@@ -246,7 +252,15 @@ Control(Args) | Properties | Listeners
 - `parent` (`Fiddle::Pointer`)
 - `toplevel` [read-only] (Boolean)
 - `visible` (Boolean)
-- `stretchy` [dsl-only] (Boolean): available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `horizontal_box` or `vertical_box`
+- `stretchy` [dsl-only] (Boolean) [default=`true`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `horizontal_box`, `vertical_box`, or `form`
+- `left` [dsl-only] (`Integer`) [default=`0`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `top` [dsl-only] (`Integer`) [default=`0`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `xspan` [dsl-only] (`Integer`) [default=`1`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `yspan` [dsl-only] (`Integer`) [default=`1`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `hexpand` [dsl-only] (Boolean) [default=`false`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `halign` [dsl-only] (`Integer`) [default=`0`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `vexpand` [dsl-only] (Boolean) [default=`false`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `valign` [dsl-only] (`Integer`) [default=`0`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
 
 ### Common Control Operations
 - `destroy`
@@ -268,7 +282,7 @@ Control(Args) | Properties | Listeners
 
 ### Smart Defaults and Conventions
 
-- `horizontal_box` and `vertical_box` controls have `padded` as `true` upon instantiation to ensure more user-friendly GUI by default
+- `horizontal_box`, `vertical_box`, `grid`, and `form` controls have `padded` as `true` upon instantiation to ensure more user-friendly GUI by default
 - `group` controls have `margined` as `true` upon instantiation to ensure more user-friendly GUI by default
 - All controls nested under a `horizontal_box` or `vertical_box` have `stretchy` property (passed to `box_append` method) as `true` by default (filling maximum space)
 - `window` constructor args can be left off and have the following defaults when unspecified: `title` as `'Glimmer'`, `width` as `150`, `height` as `150`, and `has_menubar` as `true`)
@@ -283,7 +297,14 @@ Control(Args) | Properties | Listeners
 - Automatically allocate color value pointers upon instantiating `color_button` controls and free them when destorying `color_button` controls
 - On the Mac, if no `menu` items were added, an automatic `quit_menu_item` is added to enable quitting with CTRL+Q
 - When destroying a control nested under a `horizontal_box` or `vertical_box`, it is automatically deleted from the box's children
+- When destroying a control nested under a `form`, it is automatically deleted from the form's children
 - When destroying a control nested under a `window` or `group`, it is automatically unset as their child to allow successful destruction
+- For `date_time_picker`, `date_picker`, and `time_picker`, make sure `time` hash values for `mon`, `wday`, and `yday` are 1-based instead of [libui](https://github.com/andlabs/libui) original 0-based values, and return `dst` as Boolean instead of `isdst` as `1`/`0`
+- Smart defaults for `grid` child attributes are `left` (`0`), `top` (`0`), `xspan` (`1`), `yspan` (`1`), `hexpand` (`false`), `halign` (`0`), `vexpand` (`false`), and `valign` (`0`)
+
+### API Gotchas
+
+There is no proper way to destroy `grid` children due to [libui](https://github.com/andlabs/libui) not offering any API for deleting them from `grid` (no `grid_delete` similar to `box_delete` for `horizontal_box` and `vertical_box`)
 
 ### Original API
 
@@ -315,7 +336,7 @@ Gotcha: On the Mac, when you close a window opened in `girb`, it remains open un
 
 These examples include reimplementions of the examples in the [LibUI](https://github.com/kojix2/LibUI) project utilizing the [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) as well as brand new examples.
 
-To browse all examples, simply launch the [Meta-Example](examples/meta_example.rb), which lists all examples and displays each example's code when selected.
+To browse all examples, simply launch the [Meta-Example](examples/meta_example.rb), which lists all examples and displays each example's code when selected. It also enables code editing to facilitate experimentation and learning.
 
 [examples/meta_example.rb](examples/meta_example.rb)
 
@@ -362,11 +383,11 @@ class MetaExample
     File.join(File.expand_path('.', __dir__), "#{example.underscore}.rb")
   end
   
+  def glimmer_dsl_libui_file
+    File.expand_path('../lib/glimmer-dsl-libui', __dir__)
+  end
+  
   def launch
-    menu('File') {
-      quit_menu_item
-    }
-    
     window('Meta-Example', 700, 500) { |w|
       margined true
       
@@ -385,13 +406,20 @@ class MetaExample
             stretchy false
             
             on_clicked do
-              system "ruby -r puts_debuggerer -r #{File.expand_path('../lib/glimmer-dsl-libui', __dir__)} #{file_path_for(@examples[@rbs.selected])}"
+              begin
+                meta_example_file = File.join(Dir.home, '.meta_example.rb')
+                File.write(meta_example_file, @nwme.text)
+                result = `ruby -r #{glimmer_dsl_libui_file} #{meta_example_file} 2>&1`
+                msg_box(w, 'Error Running Example', result) if result.include?('error')
+              rescue => e
+                puts 'Unable to write code changes! Running original example...'
+                system "ruby -r #{glimmer_dsl_libui_file} #{file_path_for(@examples[@rbs.selected])}"
+              end
             end
           }
         }
         vertical_box {
           @nwme = non_wrapping_multiline_entry {
-            read_only true
             text File.read(file_path_for(@examples[@rbs.selected]))
           }
         }
@@ -1458,8 +1486,6 @@ Linux
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
 ```ruby
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -1474,6 +1500,255 @@ window('color button', 230) {
 }.show
 ```
 
+### Date Time Picker
+
+[examples/date_time_picker.rb](examples/date_time_picker.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/date_time_picker.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/date_time_picker'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-date-time-picker.png](images/glimmer-dsl-libui-mac-date-time-picker.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-date-time-picker.png](images/glimmer-dsl-libui-linux-date-time-picker.png)
+
+[LibUI](https://github.com/kojix2/LibUI) Original Version:
+
+```ruby
+require 'libui'
+
+UI = LibUI
+
+UI.init
+
+vbox = UI.new_vertical_box
+
+date_time_picker = UI.new_date_time_picker
+
+time = UI::FFI::TM.malloc
+
+UI.date_time_picker_on_changed(date_time_picker) do
+  UI.date_time_picker_time(date_time_picker, time)
+  p sec: time.tm_sec,
+    min: time.tm_min,
+    hour: time.tm_hour,
+    mday: time.tm_mday,
+    mon: time.tm_mon,
+    year: time.tm_year,
+    wday: time.tm_wday,
+    yday: time.tm_yday,
+    isdst: time.tm_isdst
+end
+UI.box_append(vbox, date_time_picker, 1)
+
+main_window = UI.new_window('Date Time Pickers', 300, 200, 1)
+UI.window_on_closing(main_window) do
+  puts 'Bye Bye'
+  UI.control_destroy(main_window)
+  UI.quit
+  0
+end
+UI.window_set_child(main_window, vbox)
+UI.control_show(main_window)
+
+UI.main
+UI.quit
+```
+
+[Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+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
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show
+```
+
+### Grid
+
+[examples/grid.rb](examples/grid.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/grid.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/grid'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-grid-spanning.png](images/glimmer-dsl-libui-mac-grid-spanning.png)
+![glimmer-dsl-libui-mac-grid-expanding.png](images/glimmer-dsl-libui-mac-grid-expanding.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-grid-spanning.png](images/glimmer-dsl-libui-linux-grid-spanning.png)
+![glimmer-dsl-libui-linux-grid-expanding.png](images/glimmer-dsl-libui-linux-grid-expanding.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Grid') {
+  tab {
+    tab_item('Spanning') {
+      grid {
+        4.times { |left_value|
+          4.times { |top_value|
+            label("(#{left_value}, #{top_value}) xspan1\nyspan1") {
+              left left_value
+              top top_value
+              hexpand true
+              vexpand true
+            }
+          }
+        }
+        label("(0, 4) xspan2\nyspan1 more text fits horizontally") {
+          left 0
+          top 4
+          xspan 2
+        }
+        label("(2, 4) xspan2\nyspan1 more text fits horizontally") {
+          left 2
+          top 4
+          xspan 2
+        }
+        label("(0, 5) xspan1\nyspan2\nmore text\nfits vertically") {
+          left 0
+          top 5
+          yspan 2
+        }
+        label("(0, 7) xspan1\nyspan2\nmore text\nfits vertically") {
+          left 0
+          top 7
+          yspan 2
+        }
+        label("(1, 5) xspan3\nyspan4 a lot more text fits horizontally than before\nand\neven\na lot\nmore text\nfits vertically\nthan\nbefore") {
+          left 1
+          top 5
+          xspan 3
+          yspan 4
+        }
+      }
+    }
+    tab_item('Expanding') {
+      grid {
+        label("(0, 0) hexpand/vexpand\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
+          left 0
+          top 0
+          hexpand true
+          vexpand true
+        }
+        label("(1, 0)") {
+          left 1
+          top 0
+        }
+        label("(0, 1)") {
+          left 0
+          top 1
+        }
+        label("(1, 1)") {
+          left 1
+          top 1
+        }
+      }
+    }
+  }
+}.show
+```
+
+### Form
+
+[examples/form.rb](examples/form.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/form.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/form'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-form.png](images/glimmer-dsl-libui-mac-form.png)
+![glimmer-dsl-libui-mac-form-msg-box.png](images/glimmer-dsl-libui-mac-form-msg-box.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-form.png](images/glimmer-dsl-libui-linux-form.png)
+![glimmer-dsl-libui-linux-form-msg-box.png](images/glimmer-dsl-libui-linux-form-msg-box.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Form') { |w|
+  margined true
+  
+  vertical_box {
+    form {
+      @first_name_entry = entry {
+        # stretchy true # Smart default option for appending to form
+        label 'First Name'
+      }
+      
+      @last_name_entry = entry {
+        # stretchy true # Smart default option for appending to form
+        label 'Last Name'
+      }
+    }
+    
+    button('Display Name') {
+      on_clicked do
+        msg_box(w, 'Name', "#{@first_name_entry.text} #{@last_name_entry.text}")
+      end
+    }
+  }
+}.show
+```
+
 ## Contributing to glimmer-dsl-libui
 
 -   Check out the latest master to make sure the feature hasn't been

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.15

data/examples/date_time_picker.rb

@@ -0,0 +1,20 @@
+# 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
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/form.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Form') { |w|
+  margined true
+  
+  vertical_box {
+    form {
+      @first_name_entry = entry {
+        # stretchy true # Smart default option for appending to form
+        label 'First Name'
+      }
+      
+      @last_name_entry = entry {
+        # stretchy true # Smart default option for appending to form
+        label 'Last Name'
+      }
+    }
+    
+    button('Display Name') {
+      on_clicked do
+        msg_box(w, 'Name', "#{@first_name_entry.text} #{@last_name_entry.text}")
+      end
+    }
+  }
+}.show

data/examples/grid.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Grid') {
+  tab {
+    tab_item('Spanning') {
+      grid {
+        4.times { |left_value|
+          4.times { |top_value|
+            label("(#{left_value}, #{top_value}) xspan1\nyspan1") {
+              left left_value
+              top top_value
+              hexpand true
+              vexpand true
+            }
+          }
+        }
+        label("(0, 4) xspan2\nyspan1 more text fits horizontally") {
+          left 0
+          top 4
+          xspan 2
+        }
+        label("(2, 4) xspan2\nyspan1 more text fits horizontally") {
+          left 2
+          top 4
+          xspan 2
+        }
+        label("(0, 5) xspan1\nyspan2\nmore text\nfits vertically") {
+          left 0
+          top 5
+          yspan 2
+        }
+        label("(0, 7) xspan1\nyspan2\nmore text\nfits vertically") {
+          left 0
+          top 7
+          yspan 2
+        }
+        label("(1, 5) xspan3\nyspan4 a lot more text fits horizontally than before\nand\neven\na lot\nmore text\nfits vertically\nthan\nbefore") {
+          left 1
+          top 5
+          xspan 3
+          yspan 4
+        }
+      }
+    }
+    tab_item('Expanding') {
+      grid {
+        label("(0, 0) hexpand/vexpand\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
+          left 0
+          top 0
+          hexpand true
+          vexpand true
+        }
+        label("(1, 0)") {
+          left 1
+          top 0
+        }
+        label("(0, 1)") {
+          left 0
+          top 1
+        }
+        label("(1, 1)") {
+          left 1
+          top 1
+        }
+      }
+    }
+  }
+}.show

data/examples/meta_example.rb

@@ -20,6 +20,10 @@ class MetaExample
     File.join(File.expand_path('.', __dir__), "#{example.underscore}.rb")
   end
   
+  def glimmer_dsl_libui_file
+    File.expand_path('../lib/glimmer-dsl-libui', __dir__)
+  end
+  
   def launch
     window('Meta-Example', 700, 500) { |w|
       margined true
@@ -39,13 +43,20 @@ class MetaExample
             stretchy false
             
             on_clicked do
-              system "ruby -r puts_debuggerer -r #{File.expand_path('../lib/glimmer-dsl-libui', __dir__)} #{file_path_for(@examples[@rbs.selected])}"
+              begin
+                meta_example_file = File.join(Dir.home, '.meta_example.rb')
+                File.write(meta_example_file, @nwme.text)
+                result = `ruby -r #{glimmer_dsl_libui_file} #{meta_example_file} 2>&1`
+                msg_box(w, 'Error Running Example', result) if result.include?('error')
+              rescue => e
+                puts 'Unable to write code changes! Running original example...'
+                system "ruby -r #{glimmer_dsl_libui_file} #{file_path_for(@examples[@rbs.selected])}"
+              end
             end
           }
         }
         vertical_box {
           @nwme = non_wrapping_multiline_entry {
-            read_only true
             text File.read(file_path_for(@examples[@rbs.selected]))
           }
         }

data/lib/glimmer/libui/date_picker_proxy.rb

@@ -27,6 +27,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class DatePickerProxy < DateTimePickerProxy
+      def time(value = nil)
+        if value.nil?
+          super.slice(:mday, :mon, :year, :wday, :yday)
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/glimmer/libui/date_time_picker_proxy.rb

@@ -30,6 +30,39 @@ module Glimmer
       def libui_api_keyword
         'date_time_picker'
       end
+      
+      def time(value = nil)
+        @time ||= ::LibUI::FFI::TM.malloc
+        ::LibUI.date_time_picker_time(@libui, @time)
+        if value.nil?
+          {
+            sec: @time.tm_sec,
+            min: @time.tm_min,
+            hour: @time.tm_hour,
+            mday: @time.tm_mday,
+            mon: @time.tm_mon + 1,
+            year: @time.tm_year + 1900,
+            wday: @time.tm_wday + 1,
+            yday: @time.tm_yday + 1,
+            dst: @time.tm_isdst == 1
+          }
+        else
+          @time.tm_sec = value[:sec] unless value[:sec].nil?
+          @time.tm_min = value[:min] unless value[:min].nil?
+          @time.tm_hour = value[:hour] unless value[:hour].nil?
+          @time.tm_mday = value[:mday] unless value[:mday].nil?
+          @time.tm_mon = value[:mon] - 1 unless value[:mon].nil?
+          @time.tm_year = value[:year] - 1900 unless value[:year].nil?
+          ::LibUI.date_time_picker_set_time(@libui, @time)
+        end
+      end
+      alias set_time time
+      alias time= time
+      
+      def destroy
+        Fiddle.free @time unless @time.nil?
+        super
+      end
     end
   end
 end

data/lib/glimmer/libui/form_proxy.rb

@@ -0,0 +1,54 @@
+# 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/libui/control_proxy'
+
+module Glimmer
+  module LibUI
+    class FormProxy < ControlProxy
+      APPEND_PROPERTIES = %w[label stretchy]
+      
+      def post_initialize_child(child)
+        child.label = '' if child.label.nil?
+        child.stretchy = true if child.stretchy.nil?
+        ::LibUI.form_append(@libui, child.label, child.libui, ControlProxy.boolean_to_integer(child.stretchy))
+        children << child
+      end
+      
+      def children
+        @children ||= []
+      end
+      
+      def destroy_child(child)
+        ::LibUI.send("form_delete", @libui, children.index(child))
+        ControlProxy.all_control_proxies.delete(child)
+      end
+      
+      private
+      
+      def build_control
+        super.tap do
+          self.padded = true
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/grid_proxy.rb

@@ -0,0 +1,57 @@
+# 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/libui/control_proxy'
+
+module Glimmer
+  module LibUI
+    class GridProxy < ControlProxy
+      APPEND_PROPERTIES = %w[left top xspan yspan hexpand halign vexpand valign]
+      
+      def post_initialize_child(child)
+        child.left = 0 if child.left.nil?
+        child.top = 0 if child.top.nil?
+        child.xspan = 1 if child.xspan.nil?
+        child.yspan = 1 if child.yspan.nil?
+        child.hexpand = false if child.hexpand.nil?
+        child.halign = 0 if child.halign.nil?
+        child.vexpand = false if child.vexpand.nil?
+        child.valign = 0 if child.valign.nil?
+        ::LibUI.grid_append(@libui, child.libui, child.left, child.top, child.xspan, child.yspan, ControlProxy.boolean_to_integer(child.hexpand), child.halign, ControlProxy.boolean_to_integer(child.vexpand), child.valign)
+        children << child
+      end
+      
+      def children
+        @children ||= []
+      end
+      
+      # Note that there is no proper destroy_child(child) method for GridProxy due to libui not offering any API for it (no grid_delete)
+      
+      private
+      
+      def build_control
+        super.tap do
+          self.padded = true
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/time_picker_proxy.rb

@@ -27,6 +27,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TimePickerProxy < DateTimePickerProxy
+      def time(value = nil)
+        if value.nil?
+          super.slice(:sec, :min, :hour)
+        else
+          super
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -186,7 +186,10 @@ files:
 - examples/basic_window2.rb
 - examples/color_button.rb
 - examples/control_gallery.rb
+- examples/date_time_picker.rb
 - examples/font_button.rb
+- examples/form.rb
+- examples/grid.rb
 - examples/meta_example.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
@@ -210,6 +213,8 @@ files:
 - lib/glimmer/libui/date_time_picker_proxy.rb
 - lib/glimmer/libui/editable_combobox_proxy.rb
 - lib/glimmer/libui/font_button_proxy.rb
+- lib/glimmer/libui/form_proxy.rb
+- lib/glimmer/libui/grid_proxy.rb
 - lib/glimmer/libui/group_proxy.rb
 - lib/glimmer/libui/horizontal_box_proxy.rb
 - lib/glimmer/libui/menu_item_proxy.rb