glimmer-dsl-libui 0.0.12 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be478e9d224fabeac6b2d42b7ccae6f7063491c88b1ea14e90cf1665e379bdf
-  data.tar.gz: b8b9b58fe072ec1973263ae20dbbe5407d7dceb30290420dd6734397cd850918
+  metadata.gz: 2ab738eba1965fffc98860a23a44f2e1ed15c0c426ba4d21bcbb3fc4812ecde5
+  data.tar.gz: 2d5c195882767b63d941d9b8bad8338bc5d5ce160e97f34a9f57f5631c833fac
 SHA512:
-  metadata.gz: 534bf3ffa94019746c5a1291af5d8a676766221ea299e627cbb38dd1e3814f941688b8cf0182f243b942e73180f2f642c93598ca4d03a3a2df36cc249459316a
-  data.tar.gz: 3d6a77dcaffdedc6149d2efdb05df1e01f6499114054d5d43f83d576abeed0791d7cc6138335087fbfbd4d29bd481b1c016e71fe4c40af963218fd6e5227b3be
+  metadata.gz: 23e1de3b8f30f90abb605a351e6cd9302dd778da2e711f7c72c4ad39b267090bab324bd056ca3855c343781c53757af320ca67c0d4aacac4c6351f7cf4a646e8
+  data.tar.gz: 18f3d9b8d48bc15a342efeb38f6979e1b2516b5144a790876d931c28a2803da840f980d0d9b9cd4c96484817d4cf241d19b7b64c751229fa1ae6a236029545ac

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## 0.0.16
+
+- Support ability to instantiate without args and set args as properties afterwards inside block (e.g. `window { title 'Greeter'; content_size 300, 400; button {text 'Greet'; on_clicked {puts 'Hi'}} }`)
+  - window (was supported before, but changed default title to empty string)
+  - button
+  - checkbox
+  - group
+  - label
+
+## 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

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.12
+# [<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.16
 ## 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.12](#-glimmer-dsl-for-libui-0012)
+- [Glimmer DSL for LibUI 0.0.16](#-glimmer-dsl-for-libui-0016)
   - [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.12'
+gem 'glimmer-dsl-libui', '~> 0.0.16'
 ```
 
 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,11 +282,13 @@ 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`)
+- All controls nested under a `horizontal_box`, `vertical_box`, and `form` have `stretchy` property (fill maximum space) as `true` by default (passed to `box_append`/`form_append` method)
+- `window` instatiation args can be left off, having the following defaults when unspecified: `title` as `''`, `width` as `150`, `height` as `150`, and `has_menubar` as `true`)
 - `window` has an `on_closing` listener by default that quits application upon hitting the close button (can be overridden with a manual `on_closing` implementation that returns integer `0` for success)
+- `group` has `title` property default to `''` if not specified in instantiation args, so it can be instantiated without args with `title` property specified in nested block (e.g. `group {title 'Address'; ...}`)
+- `button`, `checkbox`, and `label` have `text` default to `''` if not specified in instantiation args, so they can be instantiated without args with `text` property specified in nested block (e.g. `button {text 'Greet'; on_clicked {puts 'Hello'}}`)
 - `quit_menu_item` has an `on_clicked` listener by default that quits application upon selecting the quit menu item (can be overridden with a manual `on_clicked` implementation that returns integer `0` for success)
 - If an `on_closing` listener was defined on `window` and it does not return an integer, default exit behavior is assumed (`window.destroy` is called followed by `LibUI.quit`, returning `0`).
 - If an `on_clicked` listener was defined on `quit_menu_item` and it does not return an integer, default exit behavior is assumed (`main_window.destroy` is called followed by `LibUI.quit`, returning `0`).
@@ -283,7 +299,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
 
@@ -653,7 +676,7 @@ window('Basic Entry', 300, 50) { |w|
     }
     
     button('Button') {
-      stretchy false
+      stretchy false # stretchy property is available when control is nested under horizontal_box
       
       on_clicked do
         text = e.text
@@ -1465,8 +1488,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
@@ -1481,6 +1502,253 @@ 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 {
+        label 'First Name' # label property is available when control is nested under form
+      }
+      
+      @last_name_entry = entry {
+        label 'Last Name' # label property is available when control is nested under form
+      }
+    }
+    
+    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.12
+0.0.16

data/examples/basic_entry.rb

@@ -16,7 +16,7 @@ window('Basic Entry', 300, 50) { |w|
     }
     
     button('Button') {
-      stretchy false
+      stretchy false # stretchy property is available when control is nested under horizontal_box
       
       on_clicked do
         text = e.text

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,27 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Form') { |w|
+  margined true
+  
+  vertical_box {
+    form {
+      @first_name_entry = entry {
+        label 'First Name' # label property is available when control is nested under form
+      }
+      
+      @last_name_entry = entry {
+        label 'Last Name' # label property is available when control is nested under form
+      }
+    }
+    
+    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/lib/glimmer/libui/button_proxy.rb

@@ -0,0 +1,41 @@
+# 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
+    # Proxy for LibUI button objects
+    #
+    # Follows the Proxy Design Pattern
+    class ButtonProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/checkbox_proxy.rb

@@ -0,0 +1,41 @@
+# 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
+    # Proxy for LibUI checkbox objects
+    #
+    # Follows the Proxy Design Pattern
+    class CheckboxProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy.rb

@@ -66,6 +66,10 @@ module Glimmer
         def menu_proxies
           all_control_proxies.select {|c| c.keyword == 'menu' }
         end
+        
+        def new_control(keyword, args)
+          ::LibUI.send("new_#{keyword}", *args)
+        end
       end
       
       BOOLEAN_PROPERTIES = %w[
@@ -254,7 +258,7 @@ module Glimmer
       
       def build_control
         @libui = if ::LibUI.respond_to?("new_#{keyword}")
-          ::LibUI.send("new_#{@keyword}", *@args)
+          ControlProxy.new_control(@keyword, @args)
         elsif ::LibUI.respond_to?(keyword)
           @args[0] = @args.first.libui if @args.first.is_a?(ControlProxy)
           ::LibUI.send(@keyword, *@args)

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

@@ -27,6 +27,8 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class GroupProxy < ControlProxy
+      DEFAULT_TITLE = ''
+      
       def post_initialize_child(child)
         ::LibUI.group_set_child(@libui, child.libui)
       end
@@ -39,7 +41,10 @@ module Glimmer
       private
       
       def build_control
-        super.tap do
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TITLE if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+        @libui.tap do
           self.margined = true
         end
       end

data/lib/glimmer/libui/label_proxy.rb

@@ -0,0 +1,41 @@
+# 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
+    # Proxy for LibUI label objects
+    #
+    # Follows the Proxy Design Pattern
+    class LabelProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/menu_proxy.rb

@@ -0,0 +1,41 @@
+# 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
+    # Proxy for LibUI menu objects
+    #
+    # Follows the Proxy Design Pattern
+    class MenuProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      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

data/lib/glimmer/libui/window_proxy.rb

@@ -27,7 +27,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class WindowProxy < ControlProxy
-      DEFAULT_TITLE = 'Glimmer'
+      DEFAULT_TITLE = ''
       DEFAULT_WIDTH = 150
       DEFAULT_HEIGHT = 150
       DEFAULT_HAS_MENUBAR = 1
@@ -79,7 +79,7 @@ module Glimmer
         construction_args[2] = DEFAULT_HEIGHT if construction_args.size == 2
         construction_args[3] = DEFAULT_HAS_MENUBAR if construction_args.size == 3
         construction_args[3] = ControlProxy.boolean_to_integer(construction_args[3]) if construction_args.size == 4 && (construction_args[3].is_a?(TrueClass) || construction_args[3].is_a?(FalseClass))
-        @libui = ::LibUI.send("new_window", *construction_args)
+        @libui = ControlProxy.new_control(@keyword, construction_args)
         @libui.tap do
           handle_listener('on_closing') do
             destroy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.16
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-23 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
@@ -202,7 +205,9 @@ files:
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/libui/about_menu_item_proxy.rb
 - lib/glimmer/libui/box.rb
+- lib/glimmer/libui/button_proxy.rb
 - lib/glimmer/libui/check_menu_item_proxy.rb
+- lib/glimmer/libui/checkbox_proxy.rb
 - lib/glimmer/libui/color_button_proxy.rb
 - lib/glimmer/libui/combobox_proxy.rb
 - lib/glimmer/libui/control_proxy.rb
@@ -210,9 +215,13 @@ 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/label_proxy.rb
 - lib/glimmer/libui/menu_item_proxy.rb
+- lib/glimmer/libui/menu_proxy.rb
 - lib/glimmer/libui/multiline_entry_proxy.rb
 - lib/glimmer/libui/non_wrapping_multiline_entry_proxy.rb
 - lib/glimmer/libui/preferences_menu_item_proxy.rb