glimmer-dsl-wx 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d5a658d9129e3c8ebf9c27f75d090d8d3f987a56866d1072d8ee17c757a7845
-  data.tar.gz: 31fc334221373c19a3461742fac4c201caf513b79413fa3738e09b4aa7a7b752
+  metadata.gz: d67fb5f483b55ca655215bf87926ae501dd680b4ffeebbfe02756b257398d4f3
+  data.tar.gz: fffd53b54fba50092ea146df9bb90b268f333cc903a29b6178e9cc80217b9d3a
 SHA512:
-  metadata.gz: 1516d96c79fdcd492d647092af6eed155b36091b7c2499c60384c24666a16e2cb5d2f397d92dd4c5f408d5d9cb947d24b50f7797ca70c644831ceafd89b6225a
-  data.tar.gz: e55a50420ee69b41e8406367151320aa29dd9d1d4ba57481475877e6e1624b2fcd1e157c00705ae9f43fb0b417ec4214079a8fa0377f32095c75c06300995368
+  metadata.gz: 9e1544b9b4dedfc9f99b31833982642bba382e69b857957a6647aecc8e93ae8d7a7d60af5a6c7f0cdff858ef555c3d7a5b12536a61ce3ba49322051f39ed17fe
+  data.tar.gz: 402553fc0c1462d0f7e20d9931d894347739f9d9229bb1616731ec42897ba45a5e2a37f7ca54f8c06514a726e48cc4f1e4a1e9e2cd641aa810b5b0d793e12046

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 0.0.7
+
+- Sizer addable support (e.g. supporting `growable_col(1, 1)`, using `add_growable_col(1, 1)` method in wxruby3 API)
+- Ability to nest sizers within sizers
+- Update samples/hello/hello_sizer.rb to use a `spacer` addable and nest `v_box_sizer` under `h_box_sizer`
+
+## 0.0.6
+
+- Sizer (layout) support
+- samples/hello/hello_sizer.rb
+- Refactor/move `glimmer_new` samples to `hello` directory
+- Fix `ControlProxy#frame_proxy` method, which grabs the parent frame (going all the way to the top of the hierarchy)
+
 ## 0.0.5
 
 - Nested child control support

data/README.md

@@ -1,6 +1,6 @@
-# [<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 WX 0.0.5
+# [<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 WX 0.0.7
 ## wxWidgets Ruby Desktop Development GUI Library
-[![Gem Version](https://badge.fury.io/rb/glimmer-dsl-wx.svg)](http://badge.fury.io/rb/glimmer-dsl-wx)
+[![Gem Version](https://badge.fury.io/rb/glimmer-dsl-wx.svg)](https://badge.fury.io/rb/glimmer-dsl-wx)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [WX](https://www.wxwidgets.org/) is an [MRI Ruby](https://www.ruby-lang.org) desktop development GUI (Graphical User Interface) library for the cross-platform native widget [wxWidgets](https://www.wxwidgets.org/) GUI toolkit. It provides a Glimmer GUI DSL on top of the [wxruby3](https://github.com/mcorino/wxRuby3) binding.
@@ -16,8 +16,6 @@
 
 **Hello, World!**
 
-![Hello, World!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-world.png?raw=true)
-
 ```ruby
 require 'glimmer-dsl-wx'
 
@@ -26,70 +24,40 @@ include Glimmer
 frame(title: 'Hello, World!')
 ```
 
-Alternate Syntax:
-
-```ruby
-require 'glimmer-dsl-wx'
-
-include Glimmer
-
-frame {
-  title 'Hello, World!'
-}
-```
+![Hello, World!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-world.png?raw=true)
 
 **Hello Button!**
 
-
-![Hello, Button!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button.png?raw=true)
-
-![Hello, Button! Clicked](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button-clicked.png?raw=true)
-
-
 ```ruby
 require 'glimmer-dsl-wx'
 
 include Glimmer
 
-frame(title: 'Hello, Button!') { |f|
-  button(label: 'Click To Find Who Built This!') {
-    on_button do
-      about_box(
-        name: f.title,
-        version: Wx::WXRUBY_VERSION,
-        description: "This is the Hello, Button! sample",
-        developers: ['The Glimmer DSL for WX Development Team']
-      )
-    end
-  }
-}
-```
-
-Alternate Syntax:
-
-```ruby
-require 'glimmer-dsl-wx'
-
-include Glimmer
-
-frame { |f|
+frame { |main_frame|
   title 'Hello, Button!'
   
-  button {
-    label 'Click To Find Who Built This!'
-    
-    on_button do
-      about_box(
-        name: f.title,
-        version: Wx::WXRUBY_VERSION,
-        description: "This is the Hello, Button! sample",
-        developers: ['The Glimmer DSL for WX Development Team']
-      )
-    end
+  h_box_sizer {
+    button {
+      sizer_args 0, Wx::RIGHT, 10
+      label 'Click To Find Who Built This!'
+      
+      on_button do
+        about_box(
+          name: main_frame.title,
+          version: Wx::WXRUBY_VERSION,
+          description: "This is the Hello, Button! sample",
+          developers: ['The Glimmer DSL for WX Development Team']
+        )
+      end
+    }
   }
 }
 ```
 
+![Hello, Button!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button.png?raw=true)
+
+![Hello, Button! Clicked](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button-clicked.png?raw=true)
+
 **[Glimmer](https://rubygems.org/gems/glimmer) DSL Comparison Table:**
 DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
 ----|-----------|---------|------------------|------|------|--------
@@ -108,7 +76,13 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
 ## Table of Contents
 
 - [Glimmer DSL for WX](#)
-  - [Usage](#usage)
+  - [Setup](#setup)
+  - [GIRB (Glimmer IRB)](#girb-glimmer-irb)
+  - [Smart Defaults and Conventions](#smart-defaults-and-conventions)
+  - [Samples](#samples)
+    - [Hello, World!](#hello-world)
+    - [Hello, Button!](#hello-button)
+    - [Hello, Sizer!](#hello-sizer)
   - [Process](#process)
   - [Resources](#resources)
   - [Help](#help)
@@ -120,7 +94,7 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
   - [Contributors](#contributors)
   - [License](#license)
 
-## Usage
+## Setup
 
 Follow instructions for installing [wxruby3](https://github.com/mcorino/wxRuby3) on a supported platform (Linux or Windows):
 https://github.com/mcorino/wxRuby3/blob/master/INSTALL.md
@@ -134,19 +108,229 @@ gem install glimmer-dsl-wx
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-wx', '~> 0.0.5'
+gem 'glimmer-dsl-wx', '~> 0.0.7'
 ```
 
 Test that installation worked by running a sample:
 
 ```
-ruby -r glimmer-dsl-wx -e "require 'samples/glimmer_new/hello_world'"
+ruby -r glimmer-dsl-wx -e "require 'samples/hello/hello_world'"
 ```
 
 If you cloned project, test by running a sample locally:
 
 ```
-ruby -r ./lib/glimmer-dsl-wx.rb samples/glimmer_new/hello_world.rb
+ruby -r ./lib/glimmer-dsl-wx.rb samples/hello/hello_world.rb
+```
+
+## GIRB (Glimmer IRB)
+
+You can run the `girb` command (`bin/girb` if you cloned the project locally) to do some quick and dirty experimentation and learning:
+
+```
+girb
+```
+
+This gives you `irb` with the `glimmer-dsl-wx` gem loaded and the `Glimmer` module mixed into the main object for easy experimentation with GUI.
+
+## Smart Defaults and Conventions
+
+- Instantiate any wxWidgets control or sizer by using its underscored name (e.g. `Button` becomes `button`)
+- `frame` will automatically execute within a `Wx::App.run` block and `show` the Frame
+
+## Samples
+
+### Hello, World!
+
+![Hello, World!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-world.png?raw=true)
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame(title: 'Hello, World!')
+```
+
+Alternate Syntax:
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame {
+  title 'Hello, World!'
+}
+```
+
+### Hello Button!
+
+![Hello, Button!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button.png?raw=true)
+
+![Hello, Button! Clicked](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button-clicked.png?raw=true)
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame(title: 'Hello, Button!') { |main_frame|
+  h_box_sizer {
+    button(label: 'Click To Find Who Built This!') {
+      sizer_args 0, Wx::RIGHT, 10
+      
+      on_button do
+        about_box(
+          name: main_frame.title,
+          version: Wx::WXRUBY_VERSION,
+          description: "This is the Hello, Button! sample",
+          developers: ['The Glimmer DSL for WX Development Team']
+        )
+      end
+    }
+  }
+}
+```
+
+Alternate Syntax:
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame { |main_frame|
+  title 'Hello, Button!'
+  
+  h_box_sizer {
+    button {
+      sizer_args 0, Wx::RIGHT, 10
+      label 'Click To Find Who Built This!'
+      
+      on_button do
+        about_box(
+          name: main_frame.title,
+          version: Wx::WXRUBY_VERSION,
+          description: "This is the Hello, Button! sample",
+          developers: ['The Glimmer DSL for WX Development Team']
+        )
+      end
+    }
+  }
+}
+```
+
+### Hello Sizer!
+
+![Hello, Sizer!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-sizer-button.png?raw=true)
+
+![Hello, Sizer! Clicked](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-sizer-clicked.png?raw=true)
+
+```ruby
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame { |main_frame|
+  title 'Hello, Sizer!'
+  
+  h_box_sizer {
+    v_box_sizer {
+      sizer_args 0, Wx::RIGHT, 10
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 1'
+        
+        on_button do
+          message_dialog(
+            "Hello",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 2'
+        
+        on_button do
+          message_dialog(
+            "Howdy",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 3'
+        
+        on_button do
+          message_dialog(
+            "Hi",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+    }
+    
+    v_box_sizer {
+      sizer_args 0, Wx::RIGHT, 10
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 4'
+        
+        on_button do
+          message_dialog(
+            "Ciao",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 5'
+        
+        on_button do
+          message_dialog(
+            "Aloha",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 6'
+        
+        on_button do
+          message_dialog(
+            "Salut",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+    }
+  }
+}
 ```
 
 ## Process

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/lib/glimmer/dsl/wx/control_expression.rb

@@ -37,6 +37,7 @@ module Glimmer
         end
         
         def around(parent, keyword, args, block, &interpret_and_add_content)
+          # TODO refactor/extract this logic to a FrameExpression
           if keyword == 'frame'
             ::Wx::App.run do
               frame_proxy = interpret_and_add_content.call

data/lib/glimmer/dsl/wx/dsl.rb

@@ -43,6 +43,9 @@ module Glimmer
 #           control
         %w[
           listener
+          sizer_args
+          sizer_addable
+          sizer
           property
           control
         ]

data/lib/glimmer/dsl/wx/sizer_addable_expression.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/wx/control_proxy'
+require 'glimmer/wx/sizer_proxy'
+
+module Glimmer
+  module DSL
+    module Wx
+      class SizerAddableExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          parent.is_a?(Glimmer::Wx::SizerProxy) and
+            block.nil? and
+            parent.can_add_sizer_addable?(keyword)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          parent.add_sizer_addable(keyword, *args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/wx/sizer_args_expression.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/static_expression'
+require 'glimmer/wx/control_proxy'
+require 'glimmer/wx/sizer_proxy'
+
+module Glimmer
+  module DSL
+    module Wx
+      class SizerArgsExpression < StaticExpression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'sizer_args' and
+            (
+              parent.is_a?(Glimmer::Wx::ControlProxy) or
+              parent.is_a?(Glimmer::Wx::SizerProxy)
+            ) and
+            parent&.parent_proxy&.is_a?(Glimmer::Wx::SizerProxy)
+        end
+        
+        def interpret(parent, keyword, *args, &block)
+          parent.parent_proxy.add(parent, *args, &block)
+        end
+      end
+      SizerArgumentsExpression = SizerArgsExpression
+    end
+  end
+end

data/lib/glimmer/dsl/wx/sizer_expression.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/wx/control_proxy'
+require 'glimmer/wx/sizer_proxy'
+
+module Glimmer
+  module DSL
+    module Wx
+      class SizerExpression < Expression
+        include ParentExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          (
+            parent.is_a?(Glimmer::Wx::ControlProxy) or
+            parent.is_a?(Glimmer::Wx::SizerProxy)
+          ) and
+            Glimmer::Wx::SizerProxy.exists?(keyword)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Wx::SizerProxy.create(keyword, parent, args, &block)
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          options[:post_add_content] = true if options[:post_add_content].nil?
+          super
+          parent&.post_add_content if options[:post_add_content]
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/wx/control_proxy.rb

@@ -116,9 +116,19 @@ module Glimmer
         # No Op by default
       end
       
+      # Returns closest frame ancestor or self if it is a frame
       def frame_proxy
         found_proxy = self
-        until found_proxy.nil? || found_proxy.is_a?(WindowProxy)
+        until found_proxy.nil? || found_proxy.is_a?(FrameProxy)
+          found_proxy = found_proxy.parent_proxy
+        end
+        found_proxy
+      end
+      
+      # Returns closest control ancestor
+      def control_proxy
+        found_proxy = parent_proxy
+        until found_proxy.nil? || found_proxy.is_a?(ControlProxy)
           found_proxy = found_proxy.parent_proxy
         end
         found_proxy
@@ -132,7 +142,7 @@ module Glimmer
       
       def handle_listener(listener_name, &listener)
         event = listener_name.to_s.sub('on_', '')
-        @parent_proxy.wx.send("evt_#{event}", @wx, &listener)
+        frame_proxy.wx.send("evt_#{event}", @wx, &listener)
 #         elsif has_custom_listener?(listener_name)
 #           handle_custom_listener(listener_name, &listener)
 #         end
@@ -210,15 +220,8 @@ module Glimmer
       private
       
       def build_control
-        if is_a?(Parent)
-          @wx = ControlProxy.new_control(@keyword, @parent_proxy&.wx, @args)
-        else
-          sizer = ::Wx::HBoxSizer.new
-          @parent_proxy.sizer = sizer
-          @wx = ControlProxy.new_control(@keyword, @parent_proxy&.wx, @args)
-          sizer.add @wx, 0, ::Wx::RIGHT, 8
-        end
-        @wx
+        # must pass control_proxy.wx as parent because the direct parent might be a sizer
+        @wx = ControlProxy.new_control(@keyword, control_proxy&.wx, @args)
       end
     end
   end

data/lib/glimmer/wx/sizer_proxy.rb

@@ -0,0 +1,166 @@
+# Copyright (c) 2023 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/wx/data_bindable'
+require 'glimmer/wx/parent'
+
+module Glimmer
+  module Wx
+    # Proxy for Wx sizer objects
+    #
+    # Follows the Proxy Design Pattern
+    class SizerProxy
+      class << self
+        def exists?(keyword)
+          keyword.end_with?('_sizer') and
+            (
+              ::Wx.constants.include?(wx_constant_symbol(keyword)) or
+              descendant_keyword_constant_map.keys.include?(keyword)
+            )
+        end
+        
+        def create(keyword, parent, args, &block)
+          sizer_proxy_class(keyword).new(keyword, parent, args, &block)
+        end
+        
+        def sizer_proxy_class(keyword)
+          descendant_keyword_constant_map[keyword] || SizerProxy
+        end
+        
+        def new_sizer(keyword, parent, args)
+          args = args.clone || []
+          if args.last.is_a?(Hash)
+            args[-1] = args[-1].clone
+          end
+          ::Wx.const_get(wx_constant_symbol(keyword)).new(*args)
+        end
+        
+        def wx_constant_symbol(keyword)
+          keyword.to_s.camelcase(:upper).to_sym
+        end
+        
+        def constant_symbol(keyword)
+          "#{keyword.to_s.camelcase(:upper)}Proxy".to_sym
+        end
+        
+        def sizer_addable_method(keyword)
+          "add_#{keyword}"
+        end
+        
+        def keyword(constant_symbol)
+          constant_symbol.to_s.underscore.sub(/_proxy$/, '')
+        end
+        
+        def descendant_keyword_constant_map
+          @descendant_keyword_constant_map ||= map_descendant_keyword_constants_for(self)
+        end
+        
+        def reset_descendant_keyword_constant_map
+          @descendant_keyword_constant_map = nil
+          descendant_keyword_constant_map
+        end
+        
+        def map_descendant_keyword_constants_for(klass, accumulator: {})
+          klass.constants.map do |constant_symbol|
+            [constant_symbol, klass.const_get(constant_symbol)]
+          end.select do |constant_symbol, constant|
+            constant.is_a?(Module) && !accumulator.values.include?(constant)
+          end.each do |constant_symbol, constant|
+            accumulator[keyword(constant_symbol)] = constant
+            map_descendant_keyword_constants_for(constant, accumulator: accumulator)
+          end
+          accumulator
+        end
+      end
+      
+      include DataBindable
+      
+      # wx returns the contained LibUI object
+      attr_reader :parent_proxy, :wx, :args, :keyword, :block, :content_added
+      alias content_added? content_added
+      
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent
+        @args = args
+        @block = block
+        build_sizer
+        post_add_content if @block.nil?
+      end
+      
+      # Subclasses may override to perform post add_content work (normally must call super)
+      def post_add_content
+        unless @content_added
+          @parent_proxy&.post_initialize_child(self)
+          @content_added = true
+        end
+      end
+      
+      # Subclasses may override to perform post initialization work on an added child
+      def post_initialize_child(child)
+        # No Op by default
+      end
+      
+      def respond_to?(method_name, *args, &block)
+        @wx.respond_to?(method_name, true) ||
+          super(method_name, true)
+      end
+      
+      def method_missing(method_name, *args, &block)
+        if @wx.respond_to?(method_name, true)
+          @wx.send(method_name, *args, &block)
+        else
+          super
+        end
+      end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::SizerExpression.new, @keyword, {post_add_content: @content_added}, &block)
+      end
+      
+      def add(control_proxy, *args, &block)
+        @wx.add(control_proxy.wx, *args)
+      end
+      
+      # Checks if it can add a sizer addable (visual things other than controls)
+      # Example: for keyword `growable_col`, sizer addable method is `add_growable_col`
+      def can_add_sizer_addable?(keyword)
+        @wx.respond_to?(SizerProxy.sizer_addable_method(keyword))
+      end
+      
+      # Adds a sizer addable (visual things other than controls)
+      # Example: for keyword `growable_col`, sizer addable method is `add_growable_col`
+      def add_sizer_addable(keyword, *args)
+        @wx.send(SizerProxy.sizer_addable_method(keyword), *args)
+      end
+      
+      private
+      
+      def build_sizer
+        @wx = SizerProxy.new_sizer(@keyword, @parent_proxy.wx, @args)
+        parent_proxy.sizer = @wx if parent_proxy.is_a?(Glimmer::Wx::ControlProxy)
+        @wx
+      end
+    end
+  end
+end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/samples/{glimmer_new → hello}/hello_button.rb

@@ -23,15 +23,19 @@ require 'glimmer-dsl-wx'
 
 include Glimmer
 
-frame(title: 'Hello, Button!') { |f|
-  button(label: 'Click To Find Who Built This!') {
-    on_button do
-      about_box(
-        name: f.title,
-        version: Wx::WXRUBY_VERSION,
-        description: "This is the Hello, Button! sample",
-        developers: ['The Glimmer DSL for WX Development Team']
-      )
-    end
+frame(title: 'Hello, Button!') { |main_frame|
+  h_box_sizer {
+    button(label: 'Click To Find Who Built This!') {
+      sizer_args 0, Wx::RIGHT, 10
+      
+      on_button do
+        about_box(
+          name: main_frame.title,
+          version: Wx::WXRUBY_VERSION,
+          description: "This is the Hello, Button! sample",
+          developers: ['The Glimmer DSL for WX Development Team']
+        )
+      end
+    }
   }
 }

data/samples/{glimmer_new → hello}/hello_button2.rb

@@ -23,19 +23,22 @@ require 'glimmer-dsl-wx'
 
 include Glimmer
 
-frame { |f|
+frame { |main_frame|
   title 'Hello, Button!'
   
-  button {
-    label 'Click To Find Who Built This!'
-    
-    on_button do
-      about_box(
-        name: f.title,
-        version: Wx::WXRUBY_VERSION,
-        description: "This is the Hello, Button! sample",
-        developers: ['The Glimmer DSL for WX Development Team']
-      )
-    end
+  h_box_sizer {
+    button {
+      sizer_args 0, Wx::RIGHT, 10
+      label 'Click To Find Who Built This!'
+      
+      on_button do
+        about_box(
+          name: main_frame.title,
+          version: Wx::WXRUBY_VERSION,
+          description: "This is the Hello, Button! sample",
+          developers: ['The Glimmer DSL for WX Development Team']
+        )
+      end
+    }
   }
 }

data/samples/hello/hello_sizer.rb

@@ -0,0 +1,124 @@
+# Copyright (c) 2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-wx'
+
+include Glimmer
+
+frame { |main_frame|
+  title 'Hello, Sizer!'
+  
+  h_box_sizer {
+    v_box_sizer {
+      sizer_args 0, Wx::RIGHT, 10
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 1'
+        
+        on_button do
+          message_dialog(
+            "Hello",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 2'
+        
+        on_button do
+          message_dialog(
+            "Howdy",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 3'
+        
+        on_button do
+          message_dialog(
+            "Hi",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+    }
+    
+    v_box_sizer {
+      sizer_args 0, Wx::RIGHT, 10
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 4'
+        
+        on_button do
+          message_dialog(
+            "Ciao",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 5'
+        
+        on_button do
+          message_dialog(
+            "Aloha",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+  
+      spacer(10)
+      
+      button {
+        sizer_args 0, Wx::DOWN, 10
+        label 'Greeting 6'
+        
+        on_button do
+          message_dialog(
+            "Salut",
+            "Greeting",
+            Wx::OK | Wx::ICON_INFORMATION
+          ).show_modal
+        end
+      }
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-wx
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Andy Maleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -240,20 +240,25 @@ files:
 - lib/glimmer/dsl/wx/operation_expression.rb
 - lib/glimmer/dsl/wx/property_expression.rb
 - lib/glimmer/dsl/wx/shine_data_binding_expression.rb
+- lib/glimmer/dsl/wx/sizer_addable_expression.rb
+- lib/glimmer/dsl/wx/sizer_args_expression.rb
+- lib/glimmer/dsl/wx/sizer_expression.rb
 - lib/glimmer/proc_tracker.rb
 - lib/glimmer/wx/control_proxy.rb
 - lib/glimmer/wx/control_proxy/frame_proxy.rb
 - lib/glimmer/wx/data_bindable.rb
 - lib/glimmer/wx/parent.rb
+- lib/glimmer/wx/sizer_proxy.rb
 - samples/art/wxruby-128x128.png
 - samples/art/wxruby-256x256.png
 - samples/art/wxruby-64x64.png
 - samples/art/wxruby.ico
 - samples/art/wxruby.png
-- samples/glimmer_new/hello_button.rb
-- samples/glimmer_new/hello_button2.rb
-- samples/glimmer_new/hello_world.rb
-- samples/glimmer_new/hello_world2.rb
+- samples/hello/hello_button.rb
+- samples/hello/hello_button2.rb
+- samples/hello/hello_sizer.rb
+- samples/hello/hello_world.rb
+- samples/hello/hello_world2.rb
 - samples/minimal/mondrian.ico
 - samples/minimal/mondrian.png
 - samples/minimal/nothing.rb