glimmer-dsl-wx 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf55c367fb4ec68158af5d891e0247aeb504438f094b454658440eb6d1089758
-  data.tar.gz: 8c1e5efaf64398f4daecf1b784ed4a5a42b0cc172748398d24d00f16c2a5cf9b
+  metadata.gz: d67fb5f483b55ca655215bf87926ae501dd680b4ffeebbfe02756b257398d4f3
+  data.tar.gz: fffd53b54fba50092ea146df9bb90b268f333cc903a29b6178e9cc80217b9d3a
 SHA512:
-  metadata.gz: 1c3a8d1510fb4887b4395fad8105145ad229beb0e4d954577abea4db2527093563bbd1cb4900b5d06dff5a3b431626a14a098559314de32e769ba7c53ae89059
-  data.tar.gz: e59f34e898c4b4e7c3b979ad112bf34d916efac91e3d7a6a66bda068896a2a9a51025a67534380f451aa11db093eae0931de40187e819a89a3ed0297877117bb
+  metadata.gz: 9e1544b9b4dedfc9f99b31833982642bba382e69b857957a6647aecc8e93ae8d7a7d60af5a6c7f0cdff858ef555c3d7a5b12536a61ce3ba49322051f39ed17fe
+  data.tar.gz: 402553fc0c1462d0f7e20d9931d894347739f9d9229bb1616731ec42897ba45a5e2a37f7ca54f8c06514a726e48cc4f1e4a1e9e2cd641aa810b5b0d793e12046

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 # 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/glimmer_new/hello_sizer.rb
+- 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)
 

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.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.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,51 +24,10 @@ 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!') { |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'
 
@@ -97,58 +54,9 @@ frame { |main_frame|
 }
 ```
 
-**Hello Sizer!**
-
-```ruby
-require 'glimmer-dsl-wx'
-
-include Glimmer
+![Hello, Button!](https://github.com/AndyObtiva/glimmer-dsl-wx/blob/master/screenshots/glimmer-dsl-wx-sample-hello-button.png?raw=true)
 
-frame { |main_frame|
-  title 'Hello, Sizer!'
-  
-  v_box_sizer {
-    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
-    }
-    
-    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
-    }
-    
-    button {
-      sizer_args 0, Wx::DOWN, 10
-      label 'Greeting 3'
-      
-      on_button do
-        message_dialog(
-          "Aloha",
-          "Greeting",
-          Wx::OK | Wx::ICON_INFORMATION
-        ).show_modal
-      end
-    }
-  }
-}
-```
+![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
@@ -168,9 +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)
@@ -182,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
@@ -196,7 +108,7 @@ gem install glimmer-dsl-wx
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-wx', '~> 0.0.6'
+gem 'glimmer-dsl-wx', '~> 0.0.7'
 ```
 
 Test that installation worked by running a sample:
@@ -223,9 +135,204 @@ This gives you `irb` with the `glimmer-dsl-wx` gem loaded and the `Glimmer` modu
 
 ## Smart Defaults and Conventions
 
-- Instantiate any wxWidgets control by using its underscored name (e.g. `Button` becomes `button`)
+- 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
 
 [Glimmer Process](https://github.com/AndyObtiva/glimmer/blob/master/PROCESS.md)

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

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

@@ -44,6 +44,7 @@ module Glimmer
         %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

@@ -29,7 +29,10 @@ module Glimmer
       class SizerArgsExpression < StaticExpression
         def can_interpret?(parent, keyword, *args, &block)
           keyword == 'sizer_args' and
-            parent.is_a?(Glimmer::Wx::ControlProxy) and
+            (
+              parent.is_a?(Glimmer::Wx::ControlProxy) or
+              parent.is_a?(Glimmer::Wx::SizerProxy)
+            ) and
             parent&.parent_proxy&.is_a?(Glimmer::Wx::SizerProxy)
         end
         

data/lib/glimmer/wx/sizer_proxy.rb

@@ -61,6 +61,10 @@ module Glimmer
           "#{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
@@ -136,6 +140,18 @@ module Glimmer
         @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

data/samples/hello/hello_sizer.rb

@@ -26,44 +26,99 @@ include Glimmer
 frame { |main_frame|
   title 'Hello, Sizer!'
   
-  v_box_sizer {
-    button {
-      sizer_args 0, Wx::DOWN, 10
-      label 'Greeting 1'
+  h_box_sizer {
+    v_box_sizer {
+      sizer_args 0, Wx::RIGHT, 10
       
-      on_button do
-        message_dialog(
-          "Hello",
-          "Greeting",
-          Wx::OK | Wx::ICON_INFORMATION
-        ).show_modal
-      end
-    }
-    
-    button {
-      sizer_args 0, Wx::DOWN, 10
-      label 'Greeting 2'
+      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)
       
-      on_button do
-        message_dialog(
-          "Howdy",
-          "Greeting",
-          Wx::OK | Wx::ICON_INFORMATION
-        ).show_modal
-      end
+      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
+      }
     }
     
-    button {
-      sizer_args 0, Wx::DOWN, 10
-      label 'Greeting 3'
+    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)
       
-      on_button do
-        message_dialog(
-          "Aloha",
-          "Greeting",
-          Wx::OK | Wx::ICON_INFORMATION
-        ).show_modal
-      end
+      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.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Andy Maleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-25 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -240,6 +240,7 @@ 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