glimmer-dsl-libui 0.11.10 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc986b55cf3a2e7709de2312a9c1c347d46ab164f4fcb9b7d9ffb4f03f938b7
-  data.tar.gz: 16788eb79d6c697856296ffccd60e430a2068208ee2b4f43850183eee56dc9e6
+  metadata.gz: e5f1ed415725c882407b3aa780a19d0a1d7f21ad388e1aec0f98119e781b802c
+  data.tar.gz: 7f5a04c65e07437ab3cc86c82187cd5840ae265d72ecb46745f1e9cc7230cf96
 SHA512:
-  metadata.gz: 2ad2265f1cefe53aa1d23157c33c0e8126738943ddcd735e0d3da24fcf9afa3ae1e467b66bdae204c0e0474d926938bcf693ab9c8510495521595a994a493d05
-  data.tar.gz: 8de4c0931c5a47d052eb4818512f6a0149a7c634c6375c79307695a3eef075eac8043d2a2eb38758f8d0fcc7c72fdac11fb19bb635ccf5cef6e592fbcd7b313a
+  metadata.gz: 6fe322ae6ee6772be7d8a01d24dfce89ee3c6e5296dbef1c5084c3a55b0299219dd99b33e6652ec36d49f6154422e61c21090f3bce66d74acc4c62697d9356f4
+  data.tar.gz: b5512ffaa585b5be77738abbe75436ad573925196180bbe40d437ae9253439de5141290bf92cb4fef4ec30880d4ed4f1c086099ff41d162e761dca6739fe5e4d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.12.0
+
+- Custom Control Component Slots (containers that could accept content within different parts of a Custom Component)
+
 ## 0.11.10
 
 - Fix issue with not being able to add content to the body root of a custom control by opening a block when invoking the custom control keyword

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.11.10
+# [<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.12.0
 ## Prerequisite-Free Ruby Desktop Development Cross-Platform Native GUI Library  ([Fukuoka Award Winning](http://www.digitalfukuoka.jp/topics/187?locale=ja))
 ### The Quickest Way From Zero To GUI
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
@@ -28,7 +28,7 @@ The main trade-off in using [Glimmer DSL for LibUI](https://rubygems.org/gems/gl
 - [Declarative DSL syntax](#glimmer-gui-dsl-concepts) that visually maps to the GUI control hierarchy
 - [Convention over configuration](#smart-defaults-and-conventions) via smart defaults and automation of low-level details
 - Requiring the [least amount of syntax](#glimmer-gui-dsl-concepts) possible to build GUI
-- [Custom Component](#custom-components) support (Custom Controls, Custom Windows, and Custom Shapes), including external Ruby gems (e.g. [Graphs and Charts](https://github.com/AndyObtiva/glimmer-libui-cc-graphs_and_charts))
+- [Custom Component](#custom-components) support (Custom Controls, Custom Windows, and Custom Shapes), including [Component Slots](#class-based-custom-control-slots) and external Ruby gems (e.g. [Graphs and Charts](https://github.com/AndyObtiva/glimmer-libui-cc-graphs_and_charts))
 - [Bidirectional/Unidirectional Data-Binding](#data-binding) to declaratively wire and automatically synchronize GUI Views with Models
 - [Scaffolding](#scaffold-application) for new custom windows/controls, apps, and gems
 - [Far Future Plan] Native-Executable [packaging](#packaging) on Mac, Windows, and Linux.
@@ -456,7 +456,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.11.10'
+gem 'glimmer-dsl-libui', '~> 0.12.0'
 ```
 
 Test that installation worked by running the [Glimmer Meta-Example](#examples):
@@ -3073,9 +3073,11 @@ Custom components like custom controls, custom windows, and custom shapes can be
 
 For example, you can define a custom `address_view` control as an aggregate of multiple `label` controls to reuse multiple times as a standard address View, displaying street, city, state, and zip code.
 
+Component slots are also supported, meaning containers that could accept content within different parts of a component (e.g. `address_form` can have a `header` slot and a `footer` slot to display extra information about the address being entered).
+
 There are two ways to define custom components:
 - Method-Based: simply define a method representing the custom component you want (e.g. `address_view`) with any options needed (e.g. `address(address_model: some_model)`).
-- Class-Based: define a class matching the camelcased name of the custom component by convention (e.g. the `address_view` custom component keyword would have a class called `AddressView`) and `include Glimmer::LibUI::CustomControl`, `include Glimmer::LibUI::CustomWindow`, or `include Glimmer::LibUI::CustomShape` depending on if the component represents a standard control, a whole window, or an [area canvas graphics shape](#area-path-shapes). Classes add the benefit of being able to distribute the custom components into a separate file for external reuse from multiple views or for sharing as a Ruby gem (e.g. [Graphs and Charts Ruby gem](https://github.com/AndyObtiva/glimmer-libui-cc-graphs_and_charts)).
+- Class-Based: define a class matching the camelcased name of the custom component by convention (e.g. the `address_view` custom component keyword would have a class called `AddressView`) and `include Glimmer::LibUI::CustomControl`, `include Glimmer::LibUI::CustomWindow`, or `include Glimmer::LibUI::CustomShape` depending on if the component represents a standard control, a whole window, or an [area canvas graphics shape](#area-path-shapes). Classes add the benefit of being able to distribute the custom components into a separate file for external reuse from multiple views or for sharing as a Ruby gem (e.g. [Graphs and Charts Ruby gem](https://github.com/AndyObtiva/glimmer-libui-cc-graphs_and_charts)). They also support Component Slots.
 
 It is OK to use the terms "custom control", "custom component", and "custom keyword" synonymously though "custom component" is a broader term that covers things other than controls too like custom shapes (e.g. `cube`), custom attributed strings (e.g. `alternating_color_string`), and custom transforms (`isometric_transform`).
 
@@ -3182,6 +3184,8 @@ window('Method-Based Custom Keyword') {
 
 #### Class-Based Custom Components
 
+##### Class-Based Custom Controls
+
 Define a class matching the camelcased name of the [custom control](#custom-components) by convention (e.g. the `address_view` [custom control](#custom-components) keyword would have a class called `AddressView`) and `include Glimmer::LibUI::CustomControl`. Classes add the benefit of being able to distribute the [custom control](#custom-components)s into separate files and reuse externally from multiple places or share via Ruby gems.
 
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
@@ -3312,6 +3316,212 @@ ClassBasedCustomControls.launch
 
 ![glimmer-dsl-libui-mac-method-based-custom-keyword.png](images/glimmer-dsl-libui-mac-method-based-custom-keyword.png)
 
+##### Class-Based Custom Control Slots
+
+Component can have Component Slots inside layout container controls: `vertical_box`, `horizontal_box`, `form`, and `grid`.
+
+Simply pass a `slot: slot_name` option to the layout container control to designate it as a Component Slot inside a Custom Control class (in the example below, we have a `:header` slot and a `:footer` slot):
+
+```ruby
+  body {
+    vertical_box {
+      vertical_box(slot: :header) {
+        stretchy false
+      }
+      form {
+        form_field(model: address, attribute: :street)
+        form_field(model: address, attribute: :p_o_box)
+        form_field(model: address, attribute: :city)
+        form_field(model: address, attribute: :state)
+        form_field(model: address, attribute: :zip_code)
+      }
+      vertical_box(slot: :footer) {
+        stretchy false
+      }
+    }
+  }
+```
+
+Next, in the Custom Control consuming code, open a block matching the name of the Component Slot (e.g. `header {}` and `footer {}`):
+
+```ruby
+          address_form(address: @address) {
+            header {
+              label('Billing Address') {
+                stretchy false
+              }
+            }
+            footer {
+              label('Billing address is used for online payments') {
+                stretchy false
+              }
+            }
+          }
+```
+
+Note that the slotted labels can include properties that apply to their Component Slot container like `stretchy false`.
+
+![glimmer-dsl-libui-mac-class-based-custom-control-slots.png](/images/glimmer-dsl-libui-mac-class-based-custom-control-slots.png)
+
+Example ([Class-Based Custom Control Slots](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#class-based-custom-control-slots)):
+
+```ruby
+require 'glimmer-dsl-libui'
+require 'facets'
+
+Address = Struct.new(:street, :p_o_box, :city, :state, :zip_code)
+
+class FormField
+  include Glimmer::LibUI::CustomControl
+  
+  options :model, :attribute
+  
+  body {
+    entry { |e|
+      label attribute.to_s.underscore.split('_').map(&:capitalize).join(' ')
+      text <=> [model, attribute]
+    }
+  }
+end
+
+class AddressForm
+  include Glimmer::LibUI::CustomControl
+  
+  option :address
+  
+  body {
+    vertical_box {
+      vertical_box(slot: :header) {
+        stretchy false
+      }
+      form {
+        form_field(model: address, attribute: :street)
+        form_field(model: address, attribute: :p_o_box)
+        form_field(model: address, attribute: :city)
+        form_field(model: address, attribute: :state)
+        form_field(model: address, attribute: :zip_code)
+      }
+      vertical_box(slot: :footer) {
+        stretchy false
+      }
+    }
+  }
+end
+
+class LabelPair
+  include Glimmer::LibUI::CustomControl
+  
+  options :model, :attribute, :value
+  
+  body {
+    horizontal_box {
+      label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
+      label(value.to_s) {
+        text <= [model, attribute]
+      }
+    }
+  }
+end
+
+class AddressView
+  include Glimmer::LibUI::CustomControl
+  
+  options :address
+  
+  body {
+    vertical_box {
+      vertical_box(slot: :header) {
+        stretchy false
+      }
+      address.each_pair do |attribute, value|
+        label_pair(model: address, attribute: attribute, value: value)
+      end
+    }
+  }
+end
+
+class ClassBasedCustomControlSlots
+  include Glimmer::LibUI::Application # alias: Glimmer::LibUI::CustomWindow
+  
+  before_body do
+    @address1 = Address.new('123 Main St', '23923', 'Denver', 'Colorado', '80014')
+    @address2 = Address.new('2038 Park Ave', '83272', 'Boston', 'Massachusetts', '02101')
+  end
+  
+  body {
+    window('Class-Based Custom Control Slots') {
+      margined true
+      
+      horizontal_box {
+        vertical_box {
+          address_form(address: @address1) {
+            header {
+              label('Shipping Address') {
+                stretchy false
+              }
+            }
+            footer {
+              label('Shipping address is used for mailing purchases') {
+                stretchy false
+              }
+            }
+          }
+          
+          horizontal_separator {
+            stretchy false
+          }
+          
+          address_view(address: @address1) {
+            header {
+              label('Shipping Address (Saved)') {
+                stretchy false
+              }
+            }
+          }
+        }
+        
+        vertical_separator {
+          stretchy false
+        }
+        
+        vertical_box {
+          address_form(address: @address2) {
+            header {
+              label('Billing Address') {
+                stretchy false
+              }
+            }
+            footer {
+              label('Billing address is used for online payments') {
+                stretchy false
+              }
+            }
+          }
+          
+          horizontal_separator {
+            stretchy false
+          }
+                    
+          address_view(address: @address2) {
+            header {
+              label('Billing Address (Saved)') {
+                stretchy false
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+end
+
+ClassBasedCustomControlSlots.launch
+```
+
+![glimmer-dsl-libui-mac-class-based-custom-control-slots.png](/images/glimmer-dsl-libui-mac-class-based-custom-control-slots.png)
+
+##### Class-Based Custom Shapes
+
 Example of a `cube` custom shape (you may copy/paste in [`girb`](#girb-glimmer-irb)):
 
 ```ruby
@@ -3484,13 +3694,15 @@ BasicCustomShape.launch
 
 ![glimmer-dsl-libui-mac-basic-custom-shape.gif](/images/glimmer-dsl-libui-mac-basic-composite-shape.gif)
 
+##### Class-Based Custom Windows (Applications)
+
 You can also define Custom Window keywords, that is [custom control](#custom-components)s with `window` being the body root. These are also known as Applications. To define a Custom Window, you `include Glimmer::LibUI::CustomWindow` or `include Glimmer:LibUI::Application` and then you can invoke the `::launch` method on the class.
 
 The [`area`](#area-api) control can be utilized to build non-native custom controls from scratch by leveraging vector graphics, formattable text, keyboard events, and mouse events. This is demonstrated in the [Area-Based Custom Controls](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#area-based-custom-controls) example.
 
 Defining custom controls enables unlimited extension of the [Glimmer GUI DSL](#glimmer-gui-dsl). The sky is the limit on what can be done with custom controls as a result. You can compose new visual vocabulary to build applications in any domain from higher concepts rather than [mere standard controls](#supported-keywords). For example, in a traffic signaling app, you could define `street`, `light_signal`, `traffic_sign`, and `car` as custom keywords and build your application from these concepts directly, saving enormous time and achieving much higher productivity.
 
-Learn more from custom control usage in [Method-Based Custom Controls](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#method--based-custom-controls), [Class-Based Custom Controls](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#class-based-custom-controls), [Area-Based Custom Controls](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#area-based-custom-controls), [Basic Composite Shape](), [Basic Custom Shape](), [Basic Scrolling Area](/docs/examples/GLIMMER-DSL-LIBUI-BASIC-EXAMPLES.md#basic-scrolling-area), [Histogram](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#histogram), and [Tetris](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#tetris) examples.
+Learn more from custom control usage in [Method-Based Custom Controls](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#method--based-custom-controls), [Class-Based Custom Controls](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#class-based-custom-controls), [Class-Based Custom Control Slots](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#class-based-custom-control-slots), [Area-Based Custom Controls](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#area-based-custom-controls), [Basic Composite Shape](), [Basic Custom Shape](), [Basic Scrolling Area](/docs/examples/GLIMMER-DSL-LIBUI-BASIC-EXAMPLES.md#basic-scrolling-area), [Histogram](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#histogram), and [Tetris](/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md#tetris) examples.
 
 ### Observer Pattern
 

data/VERSION

@@ -1 +1 @@
-0.11.10
+0.12.0

data/docs/examples/GLIMMER-DSL-LIBUI-ADVANCED-EXAMPLES.md

@@ -20,6 +20,7 @@
   - [Login](#login)
   - [Method-Based Custom Controls](#method-based-custom-controls)
   - [Class-Based Custom Controls](#class-based-custom-controls)
+  - [Class-Based Custom Control Slots](#class-based-custom-control-slots)
   - [Area-Based Custom Controls](#area-based-custom-controls)
   - [Midi Player](#midi-player)
   - [Snake](#snake)
@@ -1546,131 +1547,31 @@ Mac | Windows | Linux
 ----|---------|------
 ![glimmer-dsl-libui-mac-method-based-custom-keyword.png](/images/glimmer-dsl-libui-mac-method-based-custom-keyword.png) | ![glimmer-dsl-libui-windows-method-based-custom-keyword.png](/images/glimmer-dsl-libui-windows-method-based-custom-keyword.png) | ![glimmer-dsl-libui-linux-method-based-custom-keyword.png](/images/glimmer-dsl-libui-linux-method-based-custom-keyword.png)
 
-New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version (with [data-binding](#data-binding)):
+## Class-Based Custom Control Slots
 
-```ruby
-require 'glimmer-dsl-libui'
-require 'facets'
+Class-Based Custom Controls support slots, which enable adding content to various parts of a custom control, like a header, a footer, etc...
 
-Address = Struct.new(:street, :p_o_box, :city, :state, :zip_code)
+Code: [examples/class_based_custom_control_slots.rb](/examples/class_based_custom_control_slots.rb)
 
-class FormField
-  include Glimmer::LibUI::CustomControl
-  
-  options :model, :attribute
-  
-  body {
-    entry { |e|
-      label attribute.to_s.underscore.split('_').map(&:capitalize).join(' ')
-      text <=> [model, attribute]
-    }
-  }
-end
+Run with `glimmer examples` command if you installed the [glimmer-dsl-libui Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
 
-class AddressForm
-  include Glimmer::LibUI::CustomControl
-  
-  options :address
-  
-  body {
-    form {
-      form_field(model: address, attribute: :street)
-      form_field(model: address, attribute: :p_o_box)
-      form_field(model: address, attribute: :city)
-      form_field(model: address, attribute: :state)
-      form_field(model: address, attribute: :zip_code)
-    }
-  }
-end
+```
+glimmer examples
+```
 
-class LabelPair
-  include Glimmer::LibUI::CustomControl
-  
-  options :model, :attribute, :value
-  
-  body {
-    horizontal_box {
-      label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
-      label(value.to_s) {
-        text <= [model, attribute]
-      }
-    }
-  }
-end
+Run directly with this command if you installed the [glimmer-dsl-libui Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
 
-class AddressView
-  include Glimmer::LibUI::CustomControl
-  
-  options :address
-  
-  body {
-    vertical_box {
-      address.each_pair do |attribute, value|
-        label_pair(model: address, attribute: attribute, value: value)
-      end
-    }
-  }
-end
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/class_based_custom_control_slots'"
+```
 
-class ClassBasedCustomControls
-  include Glimmer::LibUI::Application # alias: Glimmer::LibUI::CustomWindow
-  
-  before_body do
-    @address1 = Address.new('123 Main St', '23923', 'Denver', 'Colorado', '80014')
-    @address2 = Address.new('2038 Park Ave', '83272', 'Boston', 'Massachusetts', '02101')
-  end
-  
-  body {
-    window('Class-Based Custom Keyword') {
-      margined true
-      
-      horizontal_box {
-        vertical_box {
-          label('Address 1') {
-            stretchy false
-          }
-          
-          address_form(address: @address1)
-          
-          horizontal_separator {
-            stretchy false
-          }
-          
-          label('Address 1 (Saved)') {
-            stretchy false
-          }
-          
-          address_view(address: @address1)
-        }
-        
-        vertical_separator {
-          stretchy false
-        }
-        
-        vertical_box {
-          label('Address 2') {
-            stretchy false
-          }
-          
-          address_form(address: @address2)
-          
-          horizontal_separator {
-            stretchy false
-          }
-          
-          label('Address 2 (Saved)') {
-            stretchy false
-          }
-          
-          address_view(address: @address2)
-        }
-      }
-    }
-  }
-end
+Run with this command from the root of the project if you cloned the project:
 
-ClassBasedCustomControls.launch
 ```
+bin/glimmer examples/class_based_custom_control_slots.rb
+```
+
+![glimmer-dsl-libui-mac-class-based-custom-control-slots.png](/images/glimmer-dsl-libui-mac-class-based-custom-control-slots.png)
 
 ## Area-Based Custom Controls
 

data/examples/class_based_custom_control_slots.rb

@@ -0,0 +1,150 @@
+require 'glimmer-dsl-libui'
+require 'facets'
+
+Address = Struct.new(:street, :p_o_box, :city, :state, :zip_code)
+
+class FormField
+  include Glimmer::LibUI::CustomControl
+  
+  options :model, :attribute
+  
+  body {
+    entry { |e|
+      label attribute.to_s.underscore.split('_').map(&:capitalize).join(' ')
+      text <=> [model, attribute]
+    }
+  }
+end
+
+class AddressForm
+  include Glimmer::LibUI::CustomControl
+  
+  option :address
+  
+  body {
+    vertical_box {
+      vertical_box(slot: :header) {
+        stretchy false
+      }
+      form {
+        form_field(model: address, attribute: :street)
+        form_field(model: address, attribute: :p_o_box)
+        form_field(model: address, attribute: :city)
+        form_field(model: address, attribute: :state)
+        form_field(model: address, attribute: :zip_code)
+      }
+      vertical_box(slot: :footer) {
+        stretchy false
+      }
+    }
+  }
+end
+
+class LabelPair
+  include Glimmer::LibUI::CustomControl
+  
+  options :model, :attribute, :value
+  
+  body {
+    horizontal_box {
+      label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
+      label(value.to_s) {
+        text <= [model, attribute]
+      }
+    }
+  }
+end
+
+class AddressView
+  include Glimmer::LibUI::CustomControl
+  
+  options :address
+  
+  body {
+    vertical_box {
+      vertical_box(slot: :header) {
+        stretchy false
+      }
+      address.each_pair do |attribute, value|
+        label_pair(model: address, attribute: attribute, value: value)
+      end
+    }
+  }
+end
+
+class ClassBasedCustomControlSlots
+  include Glimmer::LibUI::Application # alias: Glimmer::LibUI::CustomWindow
+  
+  before_body do
+    @address1 = Address.new('123 Main St', '23923', 'Denver', 'Colorado', '80014')
+    @address2 = Address.new('2038 Park Ave', '83272', 'Boston', 'Massachusetts', '02101')
+  end
+  
+  body {
+    window('Class-Based Custom Control Slots') {
+      margined true
+      
+      horizontal_box {
+        vertical_box {
+          address_form(address: @address1) {
+            header {
+              label('Shipping Address') {
+                stretchy false
+              }
+            }
+            footer {
+              label('Shipping address is used for mailing purchases') {
+                stretchy false
+              }
+            }
+          }
+          
+          horizontal_separator {
+            stretchy false
+          }
+          
+          address_view(address: @address1) {
+            header {
+              label('Shipping Address (Saved)') {
+                stretchy false
+              }
+            }
+          }
+        }
+        
+        vertical_separator {
+          stretchy false
+        }
+        
+        vertical_box {
+          address_form(address: @address2) {
+            header {
+              label('Billing Address') {
+                stretchy false
+              }
+            }
+            footer {
+              label('Billing address is used for online payments') {
+                stretchy false
+              }
+            }
+          }
+          
+          horizontal_separator {
+            stretchy false
+          }
+                    
+          address_view(address: @address2) {
+            header {
+              label('Billing Address (Saved)') {
+                stretchy false
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+end
+
+ClassBasedCustomControlSlots.launch

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

@@ -0,0 +1,44 @@
+# 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
+# "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'
+require 'glimmer/dsl/expression'
+require 'glimmer/libui/custom_control'
+
+module Glimmer
+  module DSL
+    module Libui
+      class CustomControlSlotContentExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          slot = keyword.to_s.to_sym
+          block_given? &&
+            parent.is_a?(Glimmer::LibUI::CustomControl) &&
+            parent.slot_controls.keys.include?(slot)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          slot = keyword.to_s.to_sym
+          parent.slot_controls[slot]&.content(&block)
+        end
+      end
+    end
+  end
+end

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

@@ -44,6 +44,7 @@ module Glimmer
           string
           operation
           control
+          custom_control_slot_content
           custom_control
           shape
           custom_shape

data/lib/glimmer/libui/control_proxy.rb

@@ -126,14 +126,18 @@ module Glimmer
       ]
       
       # libui returns the contained LibUI object
-      attr_reader :parent_proxy, :parent_custom_control, :libui, :args, :keyword, :block, :content_added
+      attr_reader :parent_proxy, :parent_custom_control, :custom_control, :libui, :args, :options, :slot, :keyword, :block, :content_added
       alias content_added? content_added
       
       def initialize(keyword, parent, args, &block)
         @keyword = keyword
+        @custom_control = CustomControl.custom_controls_being_interpreted.last
         @parent_custom_control = parent if parent.is_a?(CustomControl)
         @parent_proxy = parent.is_a?(CustomControl) ? parent.body_root : parent
         @args = args
+        @options = args.last.is_a?(Hash) ? args.pop : {}
+        @slot = options[:slot]
+        custom_control.slot_controls[@slot] = self if @slot && custom_control
         @block = block
         @enabled = true
         build_control

data/lib/glimmer/libui/custom_control.rb

@@ -171,7 +171,7 @@ module Glimmer
             end_eval
           end
         end
-
+        
         def before_body(&block)
           @before_body_block = block
         end
@@ -189,13 +189,14 @@ module Glimmer
         end
       end
 
-      attr_reader :body_root, :libui, :parent, :parent_proxy, :args, :keyword, :content, :options
+      attr_reader :body_root, :libui, :parent, :parent_proxy, :args, :keyword, :content, :options, :slot_controls
 
       def initialize(keyword, parent, args, options, &content)
         CustomControl.custom_controls_being_interpreted << self
         @parent_proxy = @parent = parent
         options ||= {}
         @options = self.class.options.merge(options)
+        @slot_controls = {}
         @content = ProcTracker.new(content) if content
         execute_hook('before_body')
         body_block = self.class.instance_variable_get("@body_block")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.12.0
 platform: ruby
 authors:
 - Andy Maleh
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -423,6 +423,7 @@ files:
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/button_counter.rb
+- examples/class_based_custom_control_slots.rb
 - examples/class_based_custom_controls.rb
 - examples/color_button.rb
 - examples/color_button2.rb
@@ -504,6 +505,7 @@ files:
 - lib/glimmer/dsl/libui/content_expression.rb
 - lib/glimmer/dsl/libui/control_expression.rb
 - lib/glimmer/dsl/libui/custom_control_expression.rb
+- lib/glimmer/dsl/libui/custom_control_slot_content_expression.rb
 - lib/glimmer/dsl/libui/custom_shape_expression.rb
 - lib/glimmer/dsl/libui/data_binding_expression.rb
 - lib/glimmer/dsl/libui/dsl.rb