glimmer-dsl-libui 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 979ea7d60d873acdbe09e6ae2ceb48318798fa41ed13bb3a6bc8dcb642933165
-  data.tar.gz: 7cc05757477a0a42b85a20a6b298c147b5fba948f9e1eedd21701ab392a2d78a
+  metadata.gz: 9b5839a358a532ac1bef6daae1352c655beb83586ebaec5310f9ea585560bce2
+  data.tar.gz: c624d4787132b6d35e91432b551866515f1d99a29882c4395275752bed58bbf5
 SHA512:
-  metadata.gz: 8feb498d6d9eae22df82c9c9e2b0bd12ef11eb1ec9e4f90ac94f7151be28225f7dce775b8352b25ef98e4bc36f2aedd56370a1265a313f0997161396034f16d0
-  data.tar.gz: f76393bfebc577d9ce5e5add450ee70e337b67e7a63be24f5f91e4180d65c0d72c7236680f5843c446161710961ec51aa6520f037fcdcc0fc617d21ac182b850
+  metadata.gz: 5637badd742ecea707c0e0b976f616f99175ff16cd15302d5f9ab5ce8d5beab1684582d061299454599926c9028ec01ec3767e0313f3ed1cb24575c36eb4eee6
+  data.tar.gz: 63ffa8f18c75c6aea32e9a9302b3203bd03e011d342d5320d2023709e6dbd949dda89a9afdc282fb53580ddbcce7d2022a0bb484df55f854ab9e100920ed5384

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.4.2
+
+- examples/button_counter.rb (takes advantage of unidirectional data-binding)
+- Ensure that upon re-opening `#content {}` of `area`, `path`, shapes, `image`, `table`, `text`, and general controls, `post_add_content` initialization is prevented from running multiple times where inappropriate.
+- Document `LibUI` API methods
+- Fix issue with examples/meta_example.rb showing more versions in counts than available
+
 ## 0.4.1
 
 - Document `observe` keyword
@@ -14,7 +21,7 @@
 - Upgrade to LibUI 0.0.13
 - Support general control/shape/attributed_string property unidirectional data-binding (with `<=` sign or `<=>`)
 - Support `observe` DSL keyword for simple model observation outside of GUI (e.g. `observe(model, attribute) { do_something }` )
-- Simplify examples/snake.rb with data-binding
+- Simplify examples/snake.rb with data-binding and make smaller (20x20) to be more challenging and fun
 - Simplify examples/tic_tac_toe.rb with data-binding
 - Fix issue with `Shape#redraw` method calling `AreaProxy#auto_redraw` instead of `AreaProxy#redraw`
 

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.4.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.4.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)
 [![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)
@@ -264,6 +264,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
       - [Basic Draw Text](#basic-draw-text)
     - [Advanced Examples](#advanced-examples)
       - [Area Gallery](#area-gallery)
+      - [Button Counter](#button-counter)
       - [Color The Circles](#color-the-circles)
       - [Control Gallery](#control-gallery)
       - [Custom Draw Text](#custom-draw-text)
@@ -372,7 +373,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.4.1'
+gem 'glimmer-dsl-libui', '~> 0.4.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.
@@ -1398,6 +1399,270 @@ Learn more from data-binding usage in [Snake](#snake) and [Tic Tac Toe](#tic_tac
 
 ### Original API
 
+Here are all the lower-level [LibUI](https://github.com/kojix2/LibUI) API methods utilized by [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui):
+- `alloc_control`
+- `area_begin_user_window_move`
+- `area_begin_user_window_resize`
+- `area_queue_redraw_all`
+- `area_scroll_to`
+- `area_set_size`
+- `attribute_color`
+- `attribute_family`
+- `attribute_features`
+- `attribute_get_type`
+- `attribute_italic`
+- `attribute_size`
+- `attribute_stretch`
+- `attribute_underline`
+- `attribute_underline_color`
+- `attribute_weight`
+- `attributed_string_append_unattributed`
+- `attributed_string_byte_index_to_grapheme`
+- `attributed_string_delete`
+- `attributed_string_for_each_attribute`
+- `attributed_string_grapheme_to_byte_index`
+- `attributed_string_insert_at_unattributed`
+- `attributed_string_len`
+- `attributed_string_num_graphemes`
+- `attributed_string_set_attribute`
+- `attributed_string_string`
+- `box_append`
+- `box_delete`
+- `box_padded`
+- `box_set_padded`
+- `button_on_clicked`
+- `button_set_text`
+- `button_text`
+- `checkbox_checked`
+- `checkbox_on_toggled`
+- `checkbox_set_checked`
+- `checkbox_set_text`
+- `checkbox_text`
+- `color_button_color`
+- `color_button_on_changed`
+- `color_button_set_color`
+- `combobox_append`
+- `combobox_on_selected`
+- `combobox_selected`
+- `combobox_set_selected`
+- `control_destroy`
+- `control_disable`
+- `control_enable`
+- `control_enabled`
+- `control_enabled_to_user`
+- `control_handle`
+- `control_hide`
+- `control_parent`
+- `control_set_parent`
+- `control_show`
+- `control_toplevel`
+- `control_verify_set_parent`
+- `control_visible`
+- `date_time_picker_on_changed`
+- `date_time_picker_set_time`
+- `date_time_picker_time`
+- `draw_clip`
+- `draw_fill`
+- `draw_free_path`
+- `draw_free_text_layout`
+- `draw_matrix_invert`
+- `draw_matrix_invertible`
+- `draw_matrix_multiply`
+- `draw_matrix_rotate`
+- `draw_matrix_scale`
+- `draw_matrix_set_identity`
+- `draw_matrix_skew`
+- `draw_matrix_transform_point`
+- `draw_matrix_transform_size`
+- `draw_matrix_translate`
+- `draw_new_path`
+- `draw_new_text_layout`
+- `draw_path_add_rectangle`
+- `draw_path_arc_to`
+- `draw_path_bezier_to`
+- `draw_path_close_figure`
+- `draw_path_end`
+- `draw_path_line_to`
+- `draw_path_new_figure`
+- `draw_path_new_figure_with_arc`
+- `draw_restore`
+- `draw_save`
+- `draw_stroke`
+- `draw_text`
+- `draw_text_layout_extents`
+- `draw_transform`
+- `editable_combobox_append`
+- `editable_combobox_on_changed`
+- `editable_combobox_set_text`
+- `editable_combobox_text`
+- `entry_on_changed`
+- `entry_read_only`
+- `entry_set_read_only`
+- `entry_set_text`
+- `entry_text`
+- `ffi_lib`
+- `ffi_lib=`
+- `font_button_font`
+- `font_button_on_changed`
+- `form_append`
+- `form_delete`
+- `form_padded`
+- `form_set_padded`
+- `free_attribute`
+- `free_attributed_string`
+- `free_control`
+- `free_font_button_font`
+- `free_image`
+- `free_init_error`
+- `free_open_type_features`
+- `free_table_model`
+- `free_table_value`
+- `free_text`
+- `grid_append`
+- `grid_insert_at`
+- `grid_padded`
+- `grid_set_padded`
+- `group_margined`
+- `group_set_child`
+- `group_set_margined`
+- `group_set_title`
+- `group_title`
+- `image_append`
+- `init`
+- `label_set_text`
+- `label_text`
+- `main`
+- `main_step`
+- `main_steps`
+- `menu_append_about_item`
+- `menu_append_check_item`
+- `menu_append_item`
+- `menu_append_preferences_item`
+- `menu_append_quit_item`
+- `menu_append_separator`
+- `menu_item_checked`
+- `menu_item_disable`
+- `menu_item_enable`
+- `menu_item_on_clicked`
+- `menu_item_set_checked`
+- `msg_box`
+- `msg_box_error`
+- `multiline_entry_append`
+- `multiline_entry_on_changed`
+- `multiline_entry_read_only`
+- `multiline_entry_set_read_only`
+- `multiline_entry_set_text`
+- `multiline_entry_text`
+- `new_area`
+- `new_attributed_string`
+- `new_background_attribute`
+- `new_button`
+- `new_checkbox`
+- `new_color_attribute`
+- `new_color_button`
+- `new_combobox`
+- `new_date_picker`
+- `new_date_time_picker`
+- `new_editable_combobox`
+- `new_entry`
+- `new_family_attribute`
+- `new_features_attribute`
+- `new_font_button`
+- `new_form`
+- `new_grid`
+- `new_group`
+- `new_horizontal_box`
+- `new_horizontal_separator`
+- `new_image`
+- `new_italic_attribute`
+- `new_label`
+- `new_menu`
+- `new_multiline_entry`
+- `new_non_wrapping_multiline_entry`
+- `new_open_type_features`
+- `new_password_entry`
+- `new_progress_bar`
+- `new_radio_buttons`
+- `new_scrolling_area`
+- `new_search_entry`
+- `new_size_attribute`
+- `new_slider`
+- `new_spinbox`
+- `new_stretch_attribute`
+- `new_tab`
+- `new_table`
+- `new_table_model`
+- `new_table_value_color`
+- `new_table_value_image`
+- `new_table_value_int`
+- `new_table_value_string`
+- `new_time_picker`
+- `new_underline_attribute`
+- `new_underline_color_attribute`
+- `new_vertical_box`
+- `new_vertical_separator`
+- `new_weight_attribute`
+- `new_window`
+- `on_should_quit`
+- `open_file`
+- `open_type_features_add`
+- `open_type_features_clone`
+- `open_type_features_for_each`
+- `open_type_features_get`
+- `open_type_features_remove`
+- `progress_bar_set_value`
+- `progress_bar_value`
+- `queue_main`
+- `quit`
+- `radio_buttons_append`
+- `radio_buttons_on_selected`
+- `radio_buttons_selected`
+- `radio_buttons_set_selected`
+- `save_file`
+- `slider_on_changed`
+- `slider_set_value`
+- `slider_value`
+- `spinbox_on_changed`
+- `spinbox_set_value`
+- `spinbox_value`
+- `tab_append`
+- `tab_delete`
+- `tab_insert_at`
+- `tab_margined`
+- `tab_num_pages`
+- `tab_set_margined`
+- `table_append_button_column`
+- `table_append_checkbox_column`
+- `table_append_checkbox_text_column`
+- `table_append_image_column`
+- `table_append_image_text_column`
+- `table_append_progress_bar_column`
+- `table_append_text_column`
+- `table_model_row_changed`
+- `table_model_row_deleted`
+- `table_model_row_inserted`
+- `table_value_color`
+- `table_value_get_type`
+- `table_value_image`
+- `table_value_int`
+- `table_value_string`
+- `timer`
+- `uninit`
+- `user_bug_cannot_set_parent_on_toplevel`
+- `window_borderless`
+- `window_content_size`
+- `window_fullscreen`
+- `window_margined`
+- `window_on_closing`
+- `window_on_content_size_changed`
+- `window_set_borderless`
+- `window_set_child`
+- `window_set_content_size`
+- `window_set_fullscreen`
+- `window_set_margined`
+- `window_set_title`
+- `window_title`
+
 To learn more about the [LibUI](https://github.com/kojix2/LibUI) API exposed through [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui):
 - Check out [LibUI ffi.rb](https://github.com/kojix2/LibUI/blob/main/lib/libui/ffi.rb)
 - Check out the [libui C Headers](https://github.com/andlabs/libui/blob/master/ui.h)
@@ -3110,9 +3375,9 @@ Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/
 ruby -r glimmer-dsl-libui -e "require 'examples/basic_scrolling_area'"
 ```
 
-Mac |
-----|
-![glimmer-dsl-libui-mac-dynamic-area.png](images/glimmer-dsl-libui-mac-basic-scrolling-area.png) ![glimmer-dsl-libui-mac-dynamic-area-updated.png](images/glimmer-dsl-libui-mac-basic-scrolling-area-scrolled.png)
+Mac | Linux
+----|------
+![glimmer-dsl-libui-mac-dynamic-area.png](images/glimmer-dsl-libui-mac-basic-scrolling-area.png) ![glimmer-dsl-libui-mac-dynamic-area-updated.png](images/glimmer-dsl-libui-mac-basic-scrolling-area-scrolled.png) | ![glimmer-dsl-libui-linux-dynamic-area.png](images/glimmer-dsl-libui-linux-basic-scrolling-area.png) ![glimmer-dsl-libui-linux-dynamic-area-updated.png](images/glimmer-dsl-libui-linux-basic-scrolling-area-scrolled.png)
 
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
@@ -4433,6 +4698,56 @@ window('Area Gallery', 400, 400) {
 }.show
 ```
 
+#### Button Counter
+
+[examples/button_counter.rb](examples/button_counter.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/button_counter.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/button_counter'"
+```
+
+Mac | Linux
+----|------
+![glimmer-dsl-libui-mac-button-counter.png](images/glimmer-dsl-libui-mac-button-counter.png) | ![glimmer-dsl-libui-linux-button-counter.png](images/glimmer-dsl-libui-linux-button-counter.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+class ButtonCounter
+  include Glimmer
+
+  attr_accessor :count
+
+  def initialize
+    @count = 0
+  end
+
+  def launch
+    window('Hello, Button!') {
+      button {
+        text <= [self, :count, on_read: ->(count) {"Count: #{count}"}] # data-bind button text to self count, converting to string on read.
+        
+        on_clicked do
+          self.count += 1
+        end
+      }
+    }.show
+  end
+end
+
+ButtonCounter.new.launch
+```
+
 #### Color The Circles
 
 [examples/color_the_circles.rb](examples/color_the_circles.rb)

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/examples/button_counter.rb

@@ -0,0 +1,27 @@
+require 'glimmer-dsl-libui'
+
+class ButtonCounter
+  include Glimmer
+
+  attr_accessor :count
+
+  def initialize
+    @count = 0
+  end
+
+  def launch
+    window('Hello, Button!', 190, 20) {
+      vertical_box {
+        button {
+          text <= [self, :count, on_read: ->(count) {"Count: #{count}"}] # data-bind button text to self count, converting to string on read.
+          
+          on_clicked do
+            self.count += 1
+          end
+        }
+      }
+    }.show
+  end
+end
+
+ButtonCounter.new.launch

data/examples/meta_example.rb

@@ -40,7 +40,7 @@ class MetaExample
   end
   
   def version_count_for(example)
-    Dir.glob(File.join(File.expand_path('.', __dir__), "#{example.underscore}*.rb")).select {|file| file.match(/\d\.rb$/)}.count + 1
+    Dir.glob(File.join(File.expand_path('.', __dir__), "#{example.underscore}*.rb")).select {|file| file.match(/#{example.underscore}\d\.rb$/)}.count + 1
   end
   
   def glimmer_dsl_libui_file

data/examples/snake.rb

@@ -38,7 +38,7 @@ class Snake
   def create_gui
     @main_window = window {
       # data-bind window title to game score, converting it to a title string on read from the model
-      title <= [@game, :score, on_read: -> (score) {"Glimmer Snake (Score: #{@game.score})"}]
+      title <= [@game, :score, on_read: -> (score) {"Snake (Score: #{@game.score})"}]
       content_size @game.width * CELL_SIZE, @game.height * CELL_SIZE
       resizable false
       

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

@@ -86,14 +86,17 @@ module Glimmer
         
         def post_add_content
           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))
+            unless @content_added
+              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)
+              @content_added = true
             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
@@ -142,48 +145,51 @@ module Glimmer
         end
         
         def install_listeners
-          @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
-            area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
-            area_draw_params = area_draw_params_hash(area_draw_params)
-            AreaProxy.current_area_draw_params = area_draw_params
-            draw(area_draw_params)
-            AreaProxy.current_area_draw_params = nil
-          end
-          @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
-            area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
-            area_mouse_event = area_mouse_event_hash(area_mouse_event)
-            on_mouse_event.each { |listener| listener.call(area_mouse_event)}
-            on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
-            unless @last_area_mouse_event.nil?
-              on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
-              on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
-              on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
-              on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
-              on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+          unless @listeners_installed
+            @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
+              area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
+              area_draw_params = area_draw_params_hash(area_draw_params)
+              AreaProxy.current_area_draw_params = area_draw_params
+              draw(area_draw_params)
+              AreaProxy.current_area_draw_params = nil
             end
-            @last_area_mouse_event = area_mouse_event
-          end
-          @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
-            left = Glimmer::LibUI.integer_to_boolean(left)
-            on_mouse_crossed.each { |listener| listener.call(left) }
-            if left
-              on_mouse_exit.each { |listener| listener.call(left) }
-            else
-              on_mouse_enter.each { |listener| listener.call(left) }
+            @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
+              area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
+              area_mouse_event = area_mouse_event_hash(area_mouse_event)
+              on_mouse_event.each { |listener| listener.call(area_mouse_event)}
+              on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
+              unless @last_area_mouse_event.nil?
+                on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
+                on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
+                on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
+                on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
+                on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+              end
+              @last_area_mouse_event = area_mouse_event
             end
-          end
-          @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
-            on_drag_broken.each { |listener| listener.call }
-          end
-          @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
-            area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
-            area_key_event = area_key_event_hash(area_key_event)
-            on_key_event.each { |listener| listener.call(area_key_event) }
-            if area_key_event[:up]
-              on_key_up.each { |listener| listener.call(area_key_event) }
-            else
-              on_key_down.each { |listener| listener.call(area_key_event) }
+            @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
+              left = Glimmer::LibUI.integer_to_boolean(left)
+              on_mouse_crossed.each { |listener| listener.call(left) }
+              if left
+                on_mouse_exit.each { |listener| listener.call(left) }
+              else
+                on_mouse_enter.each { |listener| listener.call(left) }
+              end
+            end
+            @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
+              on_drag_broken.each { |listener| listener.call }
+            end
+            @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
+              area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
+              area_key_event = area_key_event_hash(area_key_event)
+              on_key_event.each { |listener| listener.call(area_key_event) }
+              if area_key_event[:up]
+                on_key_up.each { |listener| listener.call(area_key_event) }
+              else
+                on_key_down.each { |listener| listener.call(area_key_event) }
+              end
             end
+            @listeners_installed = true
           end
         end
         

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

@@ -56,9 +56,8 @@ module Glimmer
               draw(AreaProxy.current_area_draw_params)
               destroy
             end
-            @content_added = true
           else # image object not control
-            build_control
+            build_control unless @content_added
             super
           end
         end
@@ -68,7 +67,7 @@ module Glimmer
             @args[0]
           else
             @args[0] = value
-            if @content_added
+            if area_image? && @content_added
               post_add_content
               request_auto_redraw
             end
@@ -167,8 +166,8 @@ module Glimmer
           end
           canvas.resample_nearest_neighbor!(width, height) if width && height
           @data = canvas.to_rgba_stream
-          self.width = canvas.width
-          self.height = canvas.height
+          @args[1] = canvas.width
+          @args[2] = canvas.height
           [@data, width, height]
         end
         

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

@@ -55,7 +55,7 @@ module Glimmer
         end
         
         def post_add_content
-          build_control
+          build_control unless @content_added
           super
         end
         

data/lib/glimmer/libui/control_proxy.rb

@@ -136,7 +136,10 @@ module Glimmer
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
-        @parent_proxy&.post_initialize_child(self)
+        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

data/lib/glimmer/libui/shape.rb

@@ -79,8 +79,11 @@ module Glimmer
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
-        @parent&.post_initialize_child(self)
-        @parent.post_add_content if implicit_path? && dynamic?
+        unless @content_added
+          @parent&.post_initialize_child(self)
+          @parent.post_add_content if implicit_path? && dynamic?
+          @content_added = true
+        end
       end
       
       def post_initialize_child(child, add_child: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andy Maleh
@@ -244,6 +244,7 @@ files:
 - examples/basic_transform2.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
+- examples/button_counter.rb
 - examples/color_button.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb