glimmer-dsl-libui 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 276e4ac15791c16e7f6b8816bba43b7a402484800bc1a11e84037e5511ec9b39
-  data.tar.gz: b6fcc1cb1e2707452ab8e88140d40446e7e740e6b0d5d2241aa204ec59ee8a11
+  metadata.gz: e2d658816439f96cc50c56c93adb7a41798defb44470f47101d65d64fc09bb0d
+  data.tar.gz: 37abc1ee1f738d73110b9de2e5e9648c0f20d1a81fc928101b6f4d8bf5ca8e85
 SHA512:
-  metadata.gz: 07a11c38a4d2e2a9ea043bab960c20b84cb148ba837d4293157b452a0851d51246373f1b031aa3c79680a28e56c2e95b33c0661c6949aa865a6182151b719872
-  data.tar.gz: 53c5d5be2ca21d765d81e75d1b6924965536a7c34d5ba63899b7e37f7e2785c19eabf271fbbb801b899cb703ffa7d2ad4357c38dd6bce63673adcc3899b1e00a
+  metadata.gz: c7cbb8b5b0a37fef0d7ac89e4ddc7a18a73d9be0d82dbc58d801cc4a4bc1504dd60f803c8268083eb96fc52c2e807cbd300689a3744c9f43c7b5f1f15c778902
+  data.tar.gz: 63cfe0c72200e81b196e5cc4fa47473239bc2919db52c027abc5f62ea8de48573a793174d6d61fd2852cc2e19bbb0a5466f0fb6a881af7075bb1e8307c364384

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.2
+
+- Automatically add `vertical_box` parent to `area` if it did not have a box parent (otherwise, it seems not to show up on Linux, even when directly under `grid`)
+
 ## 0.2.1
 
 - Have examples/timer.rb show `msg_box` on finish

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.2.1
+# [<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.2.2
 ## 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)
@@ -197,7 +197,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.2.1](#-glimmer-dsl-for-libui-021)
+- [Glimmer DSL for LibUI 0.2.2](#-glimmer-dsl-for-libui-022)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -331,7 +331,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.2.1'
+gem 'glimmer-dsl-libui', '~> 0.2.2'
 ```
 
 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.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/examples/color_the_circles.rb

@@ -183,7 +183,7 @@ class ColorTheCircles
           }
         }
         
-        vertical_box {
+        @area = area {
           left 0
           top 4
           hexpand true
@@ -191,30 +191,27 @@ class ColorTheCircles
           halign :fill
           valign :fill
           
-          @area = area {
-            on_draw do |area_draw_params|
+          on_draw do |area_draw_params|
+            path {
+              rectangle(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT)
+              
+              fill :white
+            }
+            
+            @circles_data.each do |circle_data|
               path {
-                rectangle(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT)
+                circle_data[:circle] = circle(*circle_data[:args])
                 
-                fill :white
+                fill circle_data[:fill]
+                stroke circle_data[:stroke]
               }
-              
-              @circles_data.each do |circle_data|
-                path {
-                  circle_data[:circle] = circle(*circle_data[:args])
-                  
-                  fill circle_data[:fill]
-                  stroke circle_data[:stroke]
-                }
-              end
-            end
-            
-            on_mouse_down do |area_mouse_event|
-              color_circle(area_mouse_event[:x], area_mouse_event[:y])
             end
-          }
+          end
+          
+          on_mouse_down do |area_mouse_event|
+            color_circle(area_mouse_event[:x], area_mouse_event[:y])
+          end
         }
-        
       }
     }.show
   end

data/lib/glimmer/libui/control_proxy/area_proxy.rb

@@ -60,7 +60,18 @@ module Glimmer
         end
         
         def post_add_content
-          super
+          unless parent_proxy.is_a?(Box)
+            original_parent_proxy = @parent_proxy
+            @vertical_box_parent_proxy = ControlProxy.create('vertical_box', parent_proxy, []) {} # block prevents calling post add content
+            append_properties.each do |property|
+              @vertical_box_parent_proxy.append_property(property, append_property(property))
+            end
+            @vertical_box_parent_proxy.post_add_content
+            @parent_proxy = @vertical_box_parent_proxy
+            @vertical_box_parent_proxy.post_initialize_child(self)
+          else
+            super
+          end
           install_listeners
         end
         
@@ -72,7 +83,7 @@ module Glimmer
         def redraw
           queue_redraw_all
         end
-        
+          
         private
         
         def build_control

data/lib/glimmer/libui/control_proxy/window_proxy.rb

@@ -35,12 +35,6 @@ module Glimmer
         DEFAULT_HAS_MENUBAR = 1
         
         def post_initialize_child(child)
-          if child.is_a?(AreaProxy)
-            vertical_box_parent = ControlProxy.create('vertical_box', self, [])
-            child.instance_variable_set(:@parent_proxy, vertical_box_parent)
-            vertical_box_parent.post_initialize_child(child)
-            child = vertical_box_parent
-          end
           ::LibUI.window_set_child(@libui, child.libui)
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andy Maleh