glimmer-dsl-libui 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aefaaeba868daf629c8ec07474b45a78f10c2dfb17ef5fc748b97dc3f00447c
-  data.tar.gz: eccf64a897d80f36e99f738c4cf528715c666ad80a86fa2c6abdb75d340edd39
+  metadata.gz: d0d69180e099ba8e4ef76b6d862542fd84753baf128e07ea17ef145ee1a4e20d
+  data.tar.gz: 25a96db46d241e7e17ec45778bda264fc662c77fcf9323e4eb0917ace5cda6da
 SHA512:
-  metadata.gz: 9bc9daeb504c2133ceadb0556ec29ff2264789c4d0c86a1958752106beed708912830692125c660579914d1cea67fe16827056add48f7d132ab67c9e814ab15e
-  data.tar.gz: ce7a85691919adb938b1eb3de235ca5fed5a9bfa4b484f649dff1a5a03ee7a46cabcd25cb7c54da9d86a60e215495e0e075f82c647f6e5125e491aa617491ef6
+  metadata.gz: 5073abc3a7bec0ffafa7d7dccc90273c9d6fbb5533a15a74b083a25df0d7a8b3e0dd7536429b47ea1d8b863afb4e98ef6de63943593025b3a53df39a7d455eeb
+  data.tar.gz: 33c26144db9e702762afaa3866685851e620208b60515937bdaccf44d059056c2232a325fc43d629f8998965f35b60106f390677ff2400305f711b1860475f4b

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 0.2.13
+
+- Rename examples/color_the_circles.rb to examples/color_the_shapes.rb to fix/make compatible with Windows by rendering only Squares on Windows, but Squares and Circles on Mac/Linux
+- Fix examples/basic_table_button.rb double-deletion issue on Windows via a temporary workaround (generating an extra empty row on Windows only)
+- Fix examples/basic_table_checkbox.rb , examples/basic_table_checkbox_text.rb , and examples/basic_table_color.rb on Windows
+- Fix examples/basic_table_progress_bar.rb crash due to an issue on Windows when switching from -1 to a positive value
+- Fix examples/area_gallery.rb (all its versions) by disabling arc/circle on Windows where they don't work due to issue in libui
+- Fix girb on Windows
+- Removed redundant `table` on_change notification
+- Fix issue with supplying a font without all its keys (e.g. missing `:weight`) to attributed `string` nested under `text`, tolerating missing font keys.
+- Fix issue with examples/color_the_circles.rb when clicking outside the playing area causing this error:
+```
+examples/color_the_circles.rb:82:in `block in color_circle': undefined method `include?' for nil:NilClass (NoMethodError)
+        from examples/color_the_circles.rb:81:in `each'
+        from examples/color_the_circles.rb:81:in `find'
+        from examples/color_the_circles.rb:81:in `color_circle'
+        from examples/color_the_circles.rb:212:in `block (4 levels) in launch'
+```
+
 ## 0.2.12
 
 - Upgrade to glimmer 2.4.0

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.12
+# [<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.13
 ## 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)
@@ -119,19 +119,21 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
-    path { # declarative stable path
-      arc(400, 220, 180, 90, 90, false)
-
-      # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-      fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-    }
-    path { # declarative stable path
-      circle(200, 200, 90)
-
-      fill r: 202, g: 102, b: 204, a: 0.5
-      stroke r: 0, g: 0, b: 0, thickness: 2
-    }
+    unless OS.windows?
+      path { # declarative stable path
+        arc(400, 220, 180, 90, 90, false)
+  
+        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
+      }
+      path { # declarative stable path
+        circle(200, 200, 90)
+  
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke r: 0, g: 0, b: 0, thickness: 2
+      }
+    end
     text(160, 40, 100) { # x, y, width
       string('Area Gallery') {
         font family: 'Times', size: 14
@@ -255,7 +257,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Basic Transform](#basic-transform)
     - [Login](#login)
     - [Timer](#timer)
-    - [Color The Circles](#color-the-circles)
+    - [Color The Shapes](#color-the-shapes)
     - [Basic Draw Text](#basic-draw-text)
     - [Custom Draw Text](#custom-draw-text)
     - [Method-Based Custom Keyword](#method-based-custom-keyword)
@@ -346,7 +348,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.2.12'
+gem 'glimmer-dsl-libui', '~> 0.2.13'
 ```
 
 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.
@@ -1013,6 +1015,10 @@ window('Method-Based Custom Keyword') {
 - There is no proper way to destroy `grid` children due to [libui](https://github.com/andlabs/libui) not offering any API for deleting them from `grid` (no `grid_delete` similar to `box_delete` for `horizontal_box` and `vertical_box`).
 - `table` `checkbox_column` and `checkbox_text_column` checkbox editing only works on Windows and Linux (not Mac) due to a current limitation in [libui](https://github.com/andlabs/ui/issues/357).
 - `text` `align` property seems not to work on the Mac ([libui](https://github.com/andlabs/libui) has an [issue](https://github.com/andlabs/libui/pull/407) about it)
+- `text` `string` `background` does not work on Windows due to an issue in [libui](https://github.com/andlabs/libui).
+- `arc` shape does not work on Windows due to an issue in [libui](https://github.com/andlabs/libui).
+- `table` controls on Windows intentionally get an extra empty row at the end because if any row were to be deleted for the first time, double-deletion happens due to an issue in [libui](https://github.com/andlabs/libui) on Windows.
+- `table` `progress_bar` column on Windows cannot be updated with a positive value if it started initially with `-1` (it ignores update to avoid crashing due to an issue in [libui](https://github.com/andlabs/libui) on Windows.
 
 ### Original API
 
@@ -3895,19 +3901,21 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
-    path { # declarative stable path
-      arc(400, 220, 180, 90, 90, false)
-
-      # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-      fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-    }
-    path { # declarative stable path
-      circle(200, 200, 90)
-
-      fill r: 202, g: 102, b: 204, a: 0.5
-      stroke r: 0, g: 0, b: 0, thickness: 2
-    }
+    unless OS.windows?
+      path { # declarative stable path
+        arc(400, 220, 180, 90, 90, false)
+  
+        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
+      }
+      path { # declarative stable path
+        circle(200, 200, 90)
+  
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke r: 0, g: 0, b: 0, thickness: 2
+      }
+    end
     text(160, 40, 100) { # x, y, width
       string('Area Gallery') {
         font family: 'Times', size: 14
@@ -4066,30 +4074,32 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
-    path { # declarative stable path
-      arc {
-        x_center 400
-        y_center 220
-        radius 180
-        start_angle 90
-        sweep 90
-        is_negative false
+    unless OS.windows?
+      path { # declarative stable path
+        arc {
+          x_center 400
+          y_center 220
+          radius 180
+          start_angle 90
+          sweep 90
+          is_negative false
+        }
+  
+        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
-
-      # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-      fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-    }
-    path { # declarative stable path
-      circle {
-        x_center 200
-        y_center 200
-        radius 90
+      path { # declarative stable path
+        circle {
+          x_center 200
+          y_center 200
+          radius 90
+        }
+  
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
-
-      fill r: 202, g: 102, b: 204, a: 0.5
-      stroke r: 0, g: 0, b: 0, thickness: 2
-    }
+    end
     text {
       x 160
       y 40
@@ -4201,19 +4211,21 @@ window('Area Gallery', 400, 400) {
         fill r: 202, g: 102, b: 204, a: 0.5
         stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        arc(400, 220, 180, 90, 90, false)
-  
-        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-      }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        circle(200, 200, 90)
-  
-        fill r: 202, g: 102, b: 204, a: 0.5
-        stroke r: 0, g: 0, b: 0, thickness: 2
-      }
+      unless OS.windows?
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          arc(400, 220, 180, 90, 90, false)
+    
+          # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+          fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+          stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
+        }
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          circle(200, 200, 90)
+    
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke r: 0, g: 0, b: 0, thickness: 2
+        }
+      end
       text(160, 40, 100) { # x, y, width
         string('Area Gallery') {
           font family: 'Times', size: 14
@@ -4374,30 +4386,32 @@ window('Area Gallery', 400, 400) {
         fill r: 202, g: 102, b: 204, a: 0.5
         stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        arc {
-          x_center 400
-          y_center 220
-          radius 180
-          start_angle 90
-          sweep 90
-          is_negative false
+      unless OS.windows?
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          arc {
+            x_center 400
+            y_center 220
+            radius 180
+            start_angle 90
+            sweep 90
+            is_negative false
+          }
+    
+          # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+          fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+          stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
         }
-  
-        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-      }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        circle {
-          x_center 200
-          y_center 200
-          radius 90
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          circle {
+            x_center 200
+            y_center 200
+            radius 90
+          }
+    
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke r: 0, g: 0, b: 0, thickness: 2
         }
-  
-        fill r: 202, g: 102, b: 204, a: 0.5
-        stroke r: 0, g: 0, b: 0, thickness: 2
-      }
+      end
       text {
         x 160
         y 40
@@ -5100,70 +5114,74 @@ end
 Timer.new
 ```
 
-### Color The Circles
+### Color The Shapes
 
-[examples/color_the_circles.rb](examples/color_the_circles.rb)
+[examples/color_the_shapes.rb](examples/color_the_shapes.rb)
 
 Run with this command from the root of the project if you cloned the project:
 
 ```
-ruby -r './lib/glimmer-dsl-libui' examples/color_the_circles.rb
+ruby -r './lib/glimmer-dsl-libui' examples/color_the_shapes.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/color_the_circles'"
+ruby -r glimmer-dsl-libui -e "require 'examples/color_the_shapes'"
 ```
 
 Mac
 
-![glimmer-dsl-libui-mac-color-the-circles.png](images/glimmer-dsl-libui-mac-color-the-circles.png)
-![glimmer-dsl-libui-mac-color-the-circles-lost.png](images/glimmer-dsl-libui-mac-color-the-circles-lost.png)
-![glimmer-dsl-libui-mac-color-the-circles-won.png](images/glimmer-dsl-libui-mac-color-the-circles-won.png)
+![glimmer-dsl-libui-mac-color-the-shapes.png](images/glimmer-dsl-libui-mac-color-the-shapes.png)
+![glimmer-dsl-libui-mac-color-the-shapes-lost.png](images/glimmer-dsl-libui-mac-color-the-shapes-lost.png)
+![glimmer-dsl-libui-mac-color-the-shapes-won.png](images/glimmer-dsl-libui-mac-color-the-shapes-won.png)
 
 Linux
 
-![glimmer-dsl-libui-linux-color-the-circles.png](images/glimmer-dsl-libui-linux-color-the-circles.png)
-![glimmer-dsl-libui-linux-color-the-circles-lost.png](images/glimmer-dsl-libui-linux-color-the-circles-lost.png)
-![glimmer-dsl-libui-linux-color-the-circles-won.png](images/glimmer-dsl-libui-linux-color-the-circles-won.png)
+![glimmer-dsl-libui-linux-color-the-shapes.png](images/glimmer-dsl-libui-linux-color-the-shapes.png)
+![glimmer-dsl-libui-linux-color-the-shapes-lost.png](images/glimmer-dsl-libui-linux-color-the-shapes-lost.png)
+![glimmer-dsl-libui-linux-color-the-shapes-won.png](images/glimmer-dsl-libui-linux-color-the-shapes-won.png)
 
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
 ```ruby
 require 'glimmer-dsl-libui'
 
-class ColorTheCircles
+class ColorTheShapes
   include Glimmer
   
   WINDOW_WIDTH = 800
   WINDOW_HEIGHT = 600
-  CIRCLE_MIN_RADIUS = 15
-  CIRCLE_MAX_RADIUS = 50
+  SHAPE_MIN_SIZE = 15
+  SHAPE_MAX_SIZE = 100
   MARGIN_WIDTH = 55
   MARGIN_HEIGHT = 155
   TIME_MAX_EASY = 4
   TIME_MAX_MEDIUM = 3
   TIME_MAX_HARD = 2
   TIME_MAX_INSANE = 1
+  SHAPES = ['square'] + (OS.windows? ? [] : ['circle'])
   
   attr_accessor :score
   
   def initialize
-    @circles_data = []
+    @shapes_data = []
     @score = 0
     @time_max = TIME_MAX_HARD
+    @game_over = false
     register_observers
-    setup_circle_factory
+    setup_shape_factory
   end
   
   def register_observers
     observer = Glimmer::DataBinding::Observer.proc do |new_score|
       @score_label.text = new_score.to_s
       if new_score == -20
+        @game_over = true
         msg_box('You Lost!', 'Sorry! Your score reached -20')
         restart_game
       elsif new_score == 0
+        @game_over = true
         msg_box('You Won!', 'Congratulations! Your score reached 0')
         restart_game
       end
@@ -5171,13 +5189,15 @@ class ColorTheCircles
     observer.observe(self, :score) # automatically enhances self to become Glimmer::DataBinding::ObservableModel and notify observer on score attribute changes
   end
   
-  def setup_circle_factory
+  def setup_shape_factory
     consumer = Proc.new do
-      if @circles_data.empty?
-        # start with 3 circles to make more challenging
-        add_circle until @circles_data.size > 3
-      else
-        add_circle
+      unless @game_over
+        if @shapes_data.empty?
+          # start with 3 shapes to make more challenging
+          add_shape until @shapes_data.size > 3
+        else
+          add_shape
+        end
       end
       delay = rand * @time_max
       Glimmer::LibUI.timer(delay, repeat: false, &consumer)
@@ -5185,13 +5205,13 @@ class ColorTheCircles
     Glimmer::LibUI.queue_main(&consumer)
   end
   
-  def add_circle
-    circle_x_center = rand * (WINDOW_WIDTH - MARGIN_WIDTH - CIRCLE_MAX_RADIUS) + CIRCLE_MAX_RADIUS
-    circle_y_center = rand * (WINDOW_HEIGHT - MARGIN_HEIGHT - CIRCLE_MAX_RADIUS) + CIRCLE_MAX_RADIUS
-    circle_radius = rand * (CIRCLE_MAX_RADIUS - CIRCLE_MIN_RADIUS) + CIRCLE_MIN_RADIUS
+  def add_shape
+    shape_x = rand * (WINDOW_WIDTH - MARGIN_WIDTH - SHAPE_MAX_SIZE) + SHAPE_MAX_SIZE
+    shape_y = rand * (WINDOW_HEIGHT - MARGIN_HEIGHT - SHAPE_MAX_SIZE) + SHAPE_MAX_SIZE
+    shape_size = rand * (SHAPE_MAX_SIZE - SHAPE_MIN_SIZE) + SHAPE_MIN_SIZE
     stroke_color = Glimmer::LibUI.x11_colors.sample
-    @circles_data << {
-      args: [circle_x_center, circle_y_center, circle_radius],
+    @shapes_data << {
+      args: [shape_x, shape_y, shape_size],
       fill: nil,
       stroke: stroke_color
     }
@@ -5201,9 +5221,29 @@ class ColorTheCircles
   
   def restart_game
     @score = 0 # update variable directly to avoid notifying observers
-    @circles_data.clear
+    @shapes_data.clear
+    @game_over = false
   end
   
+  def color_shape(x, y)
+    clicked_shape_data = @shapes_data.find do |shape_data|
+      shape_data[:fill].nil? && shape_data[:shape]&.include?(x, y)
+    end
+    if clicked_shape_data
+      clicked_shape_data[:fill] = clicked_shape_data[:stroke]
+      push_colored_shape_behind_uncolored_shapes(clicked_shape_data)
+      @area.queue_redraw_all
+      self.score += 1 # notifies score observers automatically of change
+    end
+  end
+  
+  def push_colored_shape_behind_uncolored_shapes(colored_shape_data)
+    removed_colored_shape_data = @shapes_data.delete(colored_shape_data)
+    last_colored_shape_data = @shapes_data.select {|cd| cd[:fill]}.last
+    last_colored_shape_data_index = @shapes_data.index(last_colored_shape_data) || -1
+    @shapes_data.insert(last_colored_shape_data_index + 1, removed_colored_shape_data)
+  end
+
   def launch
     menu('Actions') {
       menu_item('Restart') {
@@ -5246,12 +5286,12 @@ class ColorTheCircles
     menu('Help') {
       menu_item('Instructions') {
         on_clicked do
-          msg_box('Instructions', "Score goes down as circles are added.\nIf it reaches -20, you lose!\n\nClick circles to color and score!\nOnce score reaches 0, you win!\n\nBeware of concealed light-colored circles!\nThey are revealed once darker circles intersect them.\n\nThere are four levels of difficulty.\nChange via difficulty menu if the game gets too tough.")
+          msg_box('Instructions', "Score goes down as shapes are added.\nIf it reaches -20, you lose!\n\nClick shapes to color and score!\nOnce score reaches 0, you win!\n\nBeware of concealed light-colored shapes!\nThey are revealed once darker shapes intersect them.\n\nThere are four levels of difficulty.\nChange via difficulty menu if the game gets too tough.")
         end
       }
     }
     
-    window('Color The Circles', WINDOW_WIDTH, WINDOW_HEIGHT) {
+    window('Color The Shapes', WINDOW_WIDTH, WINDOW_HEIGHT) {
       margined true
       
       grid {
@@ -5265,13 +5305,13 @@ class ColorTheCircles
           end
         }
         
-        label('Score goes down as circles are added. If it reaches -20, you lose!') {
+        label('Score goes down as shapes are added. If it reaches -20, you lose!') {
           left 0
           top 1
           halign :center
         }
         
-        label('Click circles to color and score! Once score reaches 0, you win!') {
+        label('Click shapes to color and score! Once score reaches 0, you win!') {
           left 0
           top 2
           halign :center
@@ -5291,51 +5331,41 @@ class ColorTheCircles
           }
         }
         
-        vertical_box {
+        @area = area {
           left 0
           top 4
           hexpand true
           vexpand true
           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
+            }
+
+            @shapes_data.each do |shape_data|
               path {
-                rectangle(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT)
-                
-                fill :white
+                shape_data[:shape] = send(SHAPES.sample, *shape_data[:args])
+
+                fill shape_data[:fill]
+                stroke shape_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|
-              clicked_circle_data = @circles_data.find do |circle_data|
-                circle_data[:fill].nil? && circle_data[:circle].include?(area_mouse_event[:x], area_mouse_event[:y])
-              end
-              if clicked_circle_data
-                clicked_circle_data[:fill] = clicked_circle_data[:stroke]
-                @area.queue_redraw_all
-                self.score += 1 # notifies score observers automatically of change
-              end
-            end
-          }
+          end
+
+          on_mouse_down do |area_mouse_event|
+            color_shape(area_mouse_event[:x], area_mouse_event[:y])
+          end
         }
-        
       }
     }.show
   end
 end
 
-ColorTheCircles.new.launch
+ColorTheShapes.new.launch
 ```
 
 ### Basic Draw Text

data/VERSION

@@ -1 +1 @@
-0.2.12
+0.2.13

data/bin/girb_runner.rb

@@ -27,7 +27,7 @@ require_relative '../lib/glimmer-dsl-libui'
 
 include Glimmer
 
-GIRB_RUNNER_EXIT_FILE = "#{Etc.getpwuid.dir}/.girb_runner_exit"
+GIRB_RUNNER_EXIT_FILE = "#{Dir.home}/.girb_runner_exit"
 FileUtils.rm_rf GIRB_RUNNER_EXIT_FILE
 
 @exit_method = method(:exit)

data/examples/area_gallery.rb

@@ -41,19 +41,21 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
-    path { # declarative stable path
-      arc(400, 220, 180, 90, 90, false)
-
-      # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-      fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-    }
-    path { # declarative stable path
-      circle(200, 200, 90)
-
-      fill r: 202, g: 102, b: 204, a: 0.5
-      stroke r: 0, g: 0, b: 0, thickness: 2
-    }
+    unless OS.windows?
+      path { # declarative stable path
+        arc(400, 220, 180, 90, 90, false)
+  
+        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
+      }
+      path { # declarative stable path
+        circle(200, 200, 90)
+  
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke r: 0, g: 0, b: 0, thickness: 2
+      }
+    end
     text(160, 40, 100) { # x, y, width
       string('Area Gallery') {
         font family: 'Times', size: 14

data/examples/area_gallery2.rb

@@ -95,30 +95,32 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
-    path { # declarative stable path
-      arc {
-        x_center 400
-        y_center 220
-        radius 180
-        start_angle 90
-        sweep 90
-        is_negative false
+    unless OS.windows?
+      path { # declarative stable path
+        arc {
+          x_center 400
+          y_center 220
+          radius 180
+          start_angle 90
+          sweep 90
+          is_negative false
+        }
+  
+        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
-
-      # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-      fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-    }
-    path { # declarative stable path
-      circle {
-        x_center 200
-        y_center 200
-        radius 90
+      path { # declarative stable path
+        circle {
+          x_center 200
+          y_center 200
+          radius 90
+        }
+  
+        fill r: 202, g: 102, b: 204, a: 0.5
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
-
-      fill r: 202, g: 102, b: 204, a: 0.5
-      stroke r: 0, g: 0, b: 0, thickness: 2
-    }
+    end
     text {
       x 160
       y 40

data/examples/area_gallery3.rb

@@ -42,19 +42,21 @@ window('Area Gallery', 400, 400) {
         fill r: 202, g: 102, b: 204, a: 0.5
         stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        arc(400, 220, 180, 90, 90, false)
-  
-        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-      }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        circle(200, 200, 90)
-  
-        fill r: 202, g: 102, b: 204, a: 0.5
-        stroke r: 0, g: 0, b: 0, thickness: 2
-      }
+      unless OS.windows?
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          arc(400, 220, 180, 90, 90, false)
+    
+          # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+          fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+          stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
+        }
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          circle(200, 200, 90)
+    
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke r: 0, g: 0, b: 0, thickness: 2
+        }
+      end
       text(160, 40, 100) { # x, y, width
         string('Area Gallery') {
           font family: 'Times', size: 14

data/examples/area_gallery4.rb

@@ -96,30 +96,32 @@ window('Area Gallery', 400, 400) {
         fill r: 202, g: 102, b: 204, a: 0.5
         stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        arc {
-          x_center 400
-          y_center 220
-          radius 180
-          start_angle 90
-          sweep 90
-          is_negative false
+      unless OS.windows?
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          arc {
+            x_center 400
+            y_center 220
+            radius 180
+            start_angle 90
+            sweep 90
+            is_negative false
+          }
+    
+          # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
+          fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
+          stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
         }
-  
-        # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
-        fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
-        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
-      }
-      path { # a dynamic path is added semi-declaratively inside on_draw block
-        circle {
-          x_center 200
-          y_center 200
-          radius 90
+        path { # a dynamic path is added semi-declaratively inside on_draw block
+          circle {
+            x_center 200
+            y_center 200
+            radius 90
+          }
+    
+          fill r: 202, g: 102, b: 204, a: 0.5
+          stroke r: 0, g: 0, b: 0, thickness: 2
         }
-  
-        fill r: 202, g: 102, b: 204, a: 0.5
-        stroke r: 0, g: 0, b: 0, thickness: 2
-      }
+      end
       text {
         x 160
         y 40

data/examples/basic_table_button.rb

@@ -12,7 +12,7 @@ data = [
   %w[cow moo delete]
 ]
 
-window('Animal sounds', 300, 200) {
+window('Animal sounds', 400, 200) {
   horizontal_box {
     table {
       text_column('Animal')

data/examples/basic_table_checkbox.rb

@@ -12,7 +12,7 @@ data = [
   ['cow', 'moo', true]
 ]
 
-window('Animal sounds', 300, 200) {
+window('Animal sounds', 400, 200) {
   horizontal_box {
     table {
       text_column('Animal')

data/examples/basic_table_image.rb

@@ -14,6 +14,7 @@ IMAGE_ROWS = []
 50.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
   puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
   f = URI.open(url)
   canvas = ChunkyPNG::Canvas.from_io(f)
   f.close

data/examples/basic_table_image_text.rb

@@ -14,6 +14,7 @@ IMAGE_ROWS = []
 5.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
   puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
   f = URI.open(url)
   canvas = ChunkyPNG::Canvas.from_io(f)
   f.close

data/examples/{color_the_circles.rb → color_the_shapes.rb}

@@ -1,28 +1,29 @@
 require 'glimmer-dsl-libui'
 
-class ColorTheCircles
+class ColorTheShapes
   include Glimmer
   
   WINDOW_WIDTH = 800
   WINDOW_HEIGHT = 600
-  CIRCLE_MIN_RADIUS = 15
-  CIRCLE_MAX_RADIUS = 50
+  SHAPE_MIN_SIZE = 15
+  SHAPE_MAX_SIZE = 100
   MARGIN_WIDTH = 55
   MARGIN_HEIGHT = 155
   TIME_MAX_EASY = 4
   TIME_MAX_MEDIUM = 3
   TIME_MAX_HARD = 2
   TIME_MAX_INSANE = 1
+  SHAPES = ['square'] + (OS.windows? ? [] : ['circle'])
   
   attr_accessor :score
   
   def initialize
-    @circles_data = []
+    @shapes_data = []
     @score = 0
     @time_max = TIME_MAX_HARD
     @game_over = false
     register_observers
-    setup_circle_factory
+    setup_shape_factory
   end
   
   def register_observers
@@ -41,14 +42,14 @@ class ColorTheCircles
     observer.observe(self, :score) # automatically enhances self to become Glimmer::DataBinding::ObservableModel and notify observer on score attribute changes
   end
   
-  def setup_circle_factory
+  def setup_shape_factory
     consumer = Proc.new do
       unless @game_over
-        if @circles_data.empty?
-          # start with 3 circles to make more challenging
-          add_circle until @circles_data.size > 3
+        if @shapes_data.empty?
+          # start with 3 shapes to make more challenging
+          add_shape until @shapes_data.size > 3
         else
-          add_circle
+          add_shape
         end
       end
       delay = rand * @time_max
@@ -57,13 +58,13 @@ class ColorTheCircles
     Glimmer::LibUI.queue_main(&consumer)
   end
   
-  def add_circle
-    circle_x_center = rand * (WINDOW_WIDTH - MARGIN_WIDTH - CIRCLE_MAX_RADIUS) + CIRCLE_MAX_RADIUS
-    circle_y_center = rand * (WINDOW_HEIGHT - MARGIN_HEIGHT - CIRCLE_MAX_RADIUS) + CIRCLE_MAX_RADIUS
-    circle_radius = rand * (CIRCLE_MAX_RADIUS - CIRCLE_MIN_RADIUS) + CIRCLE_MIN_RADIUS
+  def add_shape
+    shape_x = rand * (WINDOW_WIDTH - MARGIN_WIDTH - SHAPE_MAX_SIZE) + SHAPE_MAX_SIZE
+    shape_y = rand * (WINDOW_HEIGHT - MARGIN_HEIGHT - SHAPE_MAX_SIZE) + SHAPE_MAX_SIZE
+    shape_size = rand * (SHAPE_MAX_SIZE - SHAPE_MIN_SIZE) + SHAPE_MIN_SIZE
     stroke_color = Glimmer::LibUI.x11_colors.sample
-    @circles_data << {
-      args: [circle_x_center, circle_y_center, circle_radius],
+    @shapes_data << {
+      args: [shape_x, shape_y, shape_size],
       fill: nil,
       stroke: stroke_color
     }
@@ -73,29 +74,29 @@ class ColorTheCircles
   
   def restart_game
     @score = 0 # update variable directly to avoid notifying observers
-    @circles_data.clear
+    @shapes_data.clear
     @game_over = false
   end
   
-  def color_circle(x, y)
-    clicked_circle_data = @circles_data.find do |circle_data|
-      circle_data[:fill].nil? && circle_data[:circle].include?(x, y)
+  def color_shape(x, y)
+    clicked_shape_data = @shapes_data.find do |shape_data|
+      shape_data[:fill].nil? && shape_data[:shape]&.include?(x, y)
     end
-    if clicked_circle_data
-      clicked_circle_data[:fill] = clicked_circle_data[:stroke]
-      push_colored_circle_behind_uncolored_circles(clicked_circle_data)
+    if clicked_shape_data
+      clicked_shape_data[:fill] = clicked_shape_data[:stroke]
+      push_colored_shape_behind_uncolored_shapes(clicked_shape_data)
       @area.queue_redraw_all
       self.score += 1 # notifies score observers automatically of change
     end
   end
   
-  def push_colored_circle_behind_uncolored_circles(colored_circle_data)
-    removed_colored_circle_data = @circles_data.delete(colored_circle_data)
-    last_colored_circle_data = @circles_data.select {|cd| cd[:fill]}.last
-    last_colored_circle_data_index = @circles_data.index(last_colored_circle_data) || -1
-    @circles_data.insert(last_colored_circle_data_index + 1, removed_colored_circle_data)
+  def push_colored_shape_behind_uncolored_shapes(colored_shape_data)
+    removed_colored_shape_data = @shapes_data.delete(colored_shape_data)
+    last_colored_shape_data = @shapes_data.select {|cd| cd[:fill]}.last
+    last_colored_shape_data_index = @shapes_data.index(last_colored_shape_data) || -1
+    @shapes_data.insert(last_colored_shape_data_index + 1, removed_colored_shape_data)
   end
-  
+
   def launch
     menu('Actions') {
       menu_item('Restart') {
@@ -138,12 +139,12 @@ class ColorTheCircles
     menu('Help') {
       menu_item('Instructions') {
         on_clicked do
-          msg_box('Instructions', "Score goes down as circles are added.\nIf it reaches -20, you lose!\n\nClick circles to color and score!\nOnce score reaches 0, you win!\n\nBeware of concealed light-colored circles!\nThey are revealed once darker circles intersect them.\n\nThere are four levels of difficulty.\nChange via difficulty menu if the game gets too tough.")
+          msg_box('Instructions', "Score goes down as shapes are added.\nIf it reaches -20, you lose!\n\nClick shapes to color and score!\nOnce score reaches 0, you win!\n\nBeware of concealed light-colored shapes!\nThey are revealed once darker shapes intersect them.\n\nThere are four levels of difficulty.\nChange via difficulty menu if the game gets too tough.")
         end
       }
     }
     
-    window('Color The Circles', WINDOW_WIDTH, WINDOW_HEIGHT) {
+    window('Color The Shapes', WINDOW_WIDTH, WINDOW_HEIGHT) {
       margined true
       
       grid {
@@ -157,13 +158,13 @@ class ColorTheCircles
           end
         }
         
-        label('Score goes down as circles are added. If it reaches -20, you lose!') {
+        label('Score goes down as shapes are added. If it reaches -20, you lose!') {
           left 0
           top 1
           halign :center
         }
         
-        label('Click circles to color and score! Once score reaches 0, you win!') {
+        label('Click shapes to color and score! Once score reaches 0, you win!') {
           left 0
           top 2
           halign :center
@@ -190,26 +191,26 @@ class ColorTheCircles
           vexpand true
           halign :fill
           valign :fill
-          
+
           on_draw do |area_draw_params|
             path {
               rectangle(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT)
-              
+
               fill :white
             }
-            
-            @circles_data.each do |circle_data|
+
+            @shapes_data.each do |shape_data|
               path {
-                circle_data[:circle] = circle(*circle_data[:args])
-                
-                fill circle_data[:fill]
-                stroke circle_data[:stroke]
+                shape_data[:shape] = send(SHAPES.sample, *shape_data[:args])
+
+                fill shape_data[:fill]
+                stroke shape_data[:stroke]
               }
             end
           end
-          
+
           on_mouse_down do |area_mouse_event|
-            color_circle(area_mouse_event[:x], area_mouse_event[:y])
+            color_shape(area_mouse_event[:x], area_mouse_event[:y])
           end
         }
       }
@@ -217,4 +218,4 @@ class ColorTheCircles
   end
 end
 
-ColorTheCircles.new.launch
+ColorTheShapes.new.launch

data/examples/control_gallery.rb

@@ -9,6 +9,7 @@ menu('File') {
     on_clicked do
       file = open_file
       puts file unless file.nil?
+      $stdout.flush # for Windows
     end
   }
 
@@ -16,6 +17,7 @@ menu('File') {
     on_clicked do
       file = save_file
       puts file unless file.nil?
+      $stdout.flush # for Windows
     end
   }
   
@@ -98,6 +100,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
 
               on_changed do |s|
                 puts "New Spinbox value: #{s.value}"
+                $stdout.flush # for Windows
               end
             }
 
@@ -107,6 +110,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
               on_changed do |s|
                 v = s.value
                 puts "New Slider value: #{v}"
+                $stdout.flush # for Windows
                 @progress_bar.value = v
               end
             }
@@ -125,6 +129,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
 
               on_selected do |c|
                 puts "New combobox selection: #{c.selected}"
+                $stdout.flush # for Windows
               end
             }
 
@@ -147,6 +152,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
 
                 on_changed do |e|
                   puts "Current textbox data: '#{e.text}'"
+                  $stdout.flush # for Windows
                 end
               }
             }

data/examples/meta_example.rb

@@ -48,6 +48,7 @@ class MetaExample
       f.each_line do |line|
         result << line
         puts line
+        $stdout.flush # for Windows
       end
     end
     msg_box('Error Running Example', result) if result.downcase.include?('error')

data/lib/glimmer/libui/attributed_string.rb

@@ -151,16 +151,26 @@ module Glimmer
           end
         end
         unless font.nil?
-          family_attribute = ::LibUI.new_family_attribute(font[:family])
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, family_attribute, @start, @start + @string.size)
-          size_attribute = ::LibUI.new_size_attribute(font[:size])
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, size_attribute, @start, @start + @string.size)
-          weight_attribute = ::LibUI.new_weight_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_weight, font[:weight]))
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, weight_attribute, @start, @start + @string.size)
-          italic_attribute = ::LibUI.new_italic_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_italic, font[:italic]))
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, italic_attribute, @start, @start + @string.size)
-          stretch_attribute = ::LibUI.new_stretch_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_stretch, font[:stretch]))
-          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, stretch_attribute, @start, @start + @string.size)
+          if font[:family]
+            family_attribute = ::LibUI.new_family_attribute(font[:family])
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, family_attribute, @start, @start + @string.size)
+          end
+          if font[:size]
+            size_attribute = ::LibUI.new_size_attribute(font[:size])
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, size_attribute, @start, @start + @string.size)
+          end
+          if font[:weight]
+            weight_attribute = ::LibUI.new_weight_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_weight, font[:weight]))
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, weight_attribute, @start, @start + @string.size)
+          end
+          if font[:italic]
+            italic_attribute = ::LibUI.new_italic_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_italic, font[:italic]))
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, italic_attribute, @start, @start + @string.size)
+          end
+          if font[:stretch]
+            stretch_attribute = ::LibUI.new_stretch_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_stretch, font[:stretch]))
+            ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, stretch_attribute, @start, @start + @string.size)
+          end
         end
         unless open_type_features.nil?
           open_type_features_attribute = ::LibUI.new_features_attribute(open_type_features.libui)

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

@@ -84,7 +84,7 @@ module Glimmer
             @cell_rows = rows
             @cell_rows.tap do
               @last_cell_rows = array_deep_clone(@cell_rows)
-              Glimmer::DataBinding::Observer.proc do
+              Glimmer::DataBinding::Observer.proc do |new_cell_rows|
                 if @cell_rows.size < @last_cell_rows.size && @last_cell_rows.include_all?(*@cell_rows)
                   @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |row|
                     ::LibUI.table_model_row_deleted(model, row)
@@ -103,6 +103,7 @@ module Glimmer
                     end
                   end
                 end
+                @last_last_cell_rows = array_deep_clone(@last_cell_rows)
                 @last_cell_rows = array_deep_clone(@cell_rows)
               end.observe(self, :cell_rows, recursive: true)
             end
@@ -112,7 +113,11 @@ module Glimmer
         alias set_cell_rows cell_rows
         
         def expanded_cell_rows
-          cell_rows.map do |row|
+          expand(cell_rows)
+        end
+        
+        def expand(cell_rows)
+          cell_rows.to_a.map do |row|
             row.flatten(1)
           end
         end
@@ -146,23 +151,39 @@ module Glimmer
               3
             end
           end
-          @model_handler.NumRows      = fiddle_closure_block_caller(4) { cell_rows.count }
+          @model_handler.NumRows      = fiddle_closure_block_caller(4) do
+            # Note: there is a double-delete bug in Windows when performing table_model_row_deleted, which requires pre-adding and extra empty row
+            cell_rows.count + (OS.windows? ? 1 : 0)
+          end
           @model_handler.CellValue    = fiddle_closure_block_caller(1, [1, 1, 4, 4]) do |_, _, row, column|
             the_cell_rows = expanded_cell_rows
             case @columns[column]
             when Column::TextColumnProxy, Column::ButtonColumnProxy, Column::TextColorColumnProxy, :text
               ::LibUI.new_table_value_string((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_s)
             when Column::ImageColumnProxy, Column::ImageTextColumnProxy, Column::ImageTextColorColumnProxy
-              ::LibUI.new_table_value_image((expanded_cell_rows[row] && (expanded_cell_rows[row][column].respond_to?(:libui) ? expanded_cell_rows[row][column].libui : expanded_cell_rows[row][column])))
+              if OS.windows? && row == cell_rows.count
+                ::LibUI.new_table_value_image((expanded_cell_rows[row - 1] && (expanded_cell_rows[row - 1][column].respond_to?(:libui) ? expanded_cell_rows[row - 1][column].libui : expanded_cell_rows[row - 1][column])))
+              else
+                ::LibUI.new_table_value_image((expanded_cell_rows[row] && (expanded_cell_rows[row][column].respond_to?(:libui) ? expanded_cell_rows[row][column].libui : expanded_cell_rows[row][column])))
+              end
             when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::CheckboxTextColorColumnProxy
-              ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column] == 1 || expanded_cell_rows[row][column].to_s.strip.downcase == 'true' ? 1 : 0)))
+              ::LibUI.new_table_value_int(((expanded_cell_rows[row] && (expanded_cell_rows[row][column] == 1 || expanded_cell_rows[row][column].to_s.strip.downcase == 'true' ? 1 : 0))) || 0)
             when Column::ProgressBarColumnProxy
-              ::LibUI.new_table_value_int((expanded_cell_rows[row] && (expanded_cell_rows[row][column].to_i)))
+              value = (expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_i
+              expanded_last_last_cell_rows = expand(@last_last_cell_rows)
+              old_value = (expanded_last_last_cell_rows[row] && expanded_last_last_cell_rows[row][column]).to_i
+              if OS.windows? && old_value == -1 && value >= 0
+                Glimmer::Config.logger.error('Switching a progress bar value from -1 to a positive value is not supported on Windows')
+                cell_rows[row][column] = -1
+                ::LibUI.new_table_value_int(old_value)
+              else
+                ::LibUI.new_table_value_int((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_i)
+              end
             when Column::BackgroundColorColumnProxy
-              background_color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              background_color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column]) || {r: 255, g: 255, b: 255}
               ::LibUI.new_table_value_color(background_color[:r] / 255.0, background_color[:g] / 255.0, background_color[:b] / 255.0, background_color[:a] || 1.0)
             when :color
-              color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column])
+              color = Glimmer::LibUI.interpret_color(expanded_cell_rows[row] && expanded_cell_rows[row][column]) || {r: 0, g: 0, b: 0}
               ::LibUI.new_table_value_color(color[:r] / 255.0, color[:g] / 255.0, color[:b] / 255.0, color[:a] || 1.0)
             end
           end
@@ -182,7 +203,6 @@ module Glimmer
               @cell_rows[row] ||= []
               @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
             end
-            on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
             on_edited.each {|listener| listener.call(row, @cell_rows[row])}
           end
           

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -193,9 +193,9 @@ dependencies:
 description: Glimmer DSL for LibUI - Prerequisite-Free Ruby Desktop Development GUI
   Library (No need to pre-install any prerequisites. Just install the gem and have
   platform-independent native GUI that just works! Glimmer DSL for LibUI aims to provide
-  declarative DSL syntax that visually maps to the GUI control hierarchy, convention
-  over configuration via smart defaults and automation of low-level details, requiring
-  the least amount of syntax possible to build GUI, and custom control support.)
+  declarative DSL syntax that visually maps to GUI control hierarchy, convention over
+  configuration via smart defaults, automation of low-level details, requiring the
+  least amount of syntax possible to build GUI, and custom control support.
 email: andy.am@gmail.com
 executables:
 - girb
@@ -233,7 +233,7 @@ files:
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
-- examples/color_the_circles.rb
+- examples/color_the_shapes.rb
 - examples/control_gallery.rb
 - examples/custom_draw_text.rb
 - examples/custom_draw_text2.rb