glimmer-dsl-libui 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ec966c5f1dcd6315fe94455e2a8257df7ed6274ada0d74419e53b9abeab99bb
-  data.tar.gz: 5f1f410e8a239735c1188d4a7bdad00f9fed6e34ba71ba5c2ac65f01b8f49037
+  metadata.gz: ff8ac26765985f2d93ed15a035403682dde9010f50af001cd55c0215f3128745
+  data.tar.gz: 243cf87d1941e447b794c5997b7695aa7ab5b87cb64e395ccaba2e28a6d7d923
 SHA512:
-  metadata.gz: 574718284c8933f27d088777e9ffd77a37922f3f51ec90e85026f1d86f572c84bea4d86141fc3b67bb5192769ac03e13dca791b3ce6b8d2ae88235008ba4cbcf
-  data.tar.gz: 87656800ed048be0ffc15520e5988b911fac60bcdb73db16fd962e5820d2d2c948a08a14c1c22aaef4543623d8f2c803c7d10e0c106bc40c13942bddaf83cfda
+  metadata.gz: c916c2ba39da007082665789575009dc9e8140bd1910d512f15fccacaf4636143de2bc890fa77d6af1a91a4a7eba2cb938173005ac1a5b6f915837bc1005da11
+  data.tar.gz: 9b82de74cfd12131ef5d09429276b360d3c910b580323f98907b68e9e462d7996d84bfb0a4fd75bdc9fce06326b1b76ff3f8b8e65a21d920a57b167a1758ddd4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.5.14
+
+- Basic Child Window example
+- Modify default window closing behavior to autodetect if the window is a child window (not the main window), and if closed, ensure that does not quit the app.
+- Accept `true` and `false` as return values for `on_closing` window listener as aliases to `1` and `0`
+
 ## 0.5.13
 
 - Fix issue with rendering table content changes when having many rows

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.5.13
+# [<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.5.14
 ## 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)
@@ -385,6 +385,7 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
   - [Examples](#examples)
     - [Basic Examples](#basic-examples)
       - [Basic Window](#basic-window)
+      - [Basic Child Window](#basic-child-window)
       - [Basic Button](#basic-button)
       - [Basic Entry](#basic-entry)
       - [Simple Notepad](#simple-notepad)
@@ -435,6 +436,7 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
     - [i3off Gtk Ruby](#i3off-gtk-ruby)
     - [Chess](#chess)
     - [RubyCrumbler](#rubycrumbler)
+    - [Rubio-Radio](#rubio-radio)
   - [Process](#process)
   - [Resources](#resources)
   - [Help](#help)
@@ -581,7 +583,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.5.13'
+gem 'glimmer-dsl-libui', '~> 0.5.14'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -1615,8 +1617,7 @@ SpinnerExample.new.launch
 - All controls nested under a `horizontal_box`, `vertical_box`, and `form` have `stretchy` property (fill maximum space) as `true` by default (passed to `box_append`/`form_append` method)
 - If an event listener is repeated under a control (e.g. two `on_clicked {}` listeners under `button`), it does not overwrite the previous listener, yet it is added to an `Array` of listeners for the event. [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) provides multiple-event-listener support unlike [LibUI](https://github.com/kojix2/LibUI)
 - `window` instatiation args can be left off, having the following defaults when unspecified: `title` as `''`, `width` as `190`, `height` as `150`, and `has_menubar` as `true`)
-- `window` has an `on_closing` listener by default that quits application upon hitting the close button (can be overridden with a manual `on_closing` implementation that returns integer `1` for closing and `0` for remaining open). When creating/showing a child window other than the main window and then closing it, the entire app closes by default unless you implement an `on_closing` listener on the secondary child window that returns `1` at the end.
-
+- `window` has an `on_closing` listener by default that quits application upon hitting close button if window is the main window, not a child window (the behavior can be overridden with a manual `on_closing` implementation that returns integer `1`/`true` for closing and `0`/`false` for remaining open).
 - `group` has `title` property default to `''` if not specified in instantiation args, so it can be instantiated without args with `title` property specified in nested block (e.g. `group {title 'Address'; ...}`)
 - `button`, `checkbox`, and `label` have `text` default to `''` if not specified in instantiation args, so they can be instantiated without args with `text` property specified in nested block (e.g. `button {text 'Greet'; on_clicked {puts 'Hello'}}`)
 - `quit_menu_item` has an `on_clicked` listener by default that quits application upon selecting the quit menu item (can be overridden with a manual `on_clicked` implementation that returns integer `0` for success)
@@ -1905,7 +1906,7 @@ Learn more from custom keyword usage in [Method-Based Custom Keyword](#method-ba
 
 The [Observer Design Pattern](https://en.wikipedia.org/wiki/Observer_pattern) (a.k.a. Observer Pattern) is fundamental to building GUIs (Graphical User Interfaces) following the [MVC (Model View Controller) Architectural Pattern](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) or any of its variations like [MVP (Model View Presenter)](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93presenter). In the original Smalltalk-MVC, the View observes the Model for changes and updates itself accordingly.
 
-![MVC - Model View Controller](https://www.researchgate.net/profile/Danny-Weyns/publication/269303611/figure/fig2/AS:858133056462866@1581606272800/Smalltalk80-MVC-pattern-View-and-Controller-work-as-a-pair-allowing-the-user-to-interact.ppm)
+![MVC - Model View Controller](https://developer.mozilla.org/en-US/docs/Glossary/MVC/model-view-controller-light-blue.png)
 
 [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) supports the [Observer Design Pattern](https://en.wikipedia.org/wiki/Observer_pattern) via the `observe(model, attribute_or_key=nil)` keyword, which can observe `Object` models with attributes, `Hash`es with keys, and `Array`s. It automatically enhances objects as needed to support automatically notifying observers of changes via `observable#notify_observers(attribute_or_key = nil)` method:
 - `Object` becomes `Glimmer::DataBinding::ObservableModel`, which supports observing specified `Object` model attributes.
@@ -1936,7 +1937,7 @@ Data-binding automatically takes advantage of the [Observer Pattern](#observer-p
 
 Data-binding supports utilizing the [MVP (Model View Presenter)](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93presenter) flavor of [MVC](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) by observing both the View and a Presenter for changes and updating the opposite side upon encountering them. This enables writing more decoupled cleaner code that keeps View code and Model code disentangled and highly maintainable. For example, check out the Snake game presenters for [Grid](/examples/snake/presenter/grid.rb) and [Cell](/examples/snake/presenter/cell.rb), which act as proxies for the actual Snake game models [Snake](/examples/snake/model/snake.rb) and [Apple](/examples/snake/model/apple.rb), mediating synchronization of data between them and the [Snake View GUI](/examples/snake.rb).
 
-![MVP](https://www.researchgate.net/profile/Gilles-Perrouin/publication/320249584/figure/fig8/AS:668260987068418@1536337243385/Model-view-presenter-architecture.png)
+![MVP](https://upload.wikimedia.org/wikipedia/commons/d/dc/Model_View_Presenter_GUI_Design_Pattern.png)
 
 #### Bidirectional (Two-Way) Data-Binding
 
@@ -2643,6 +2644,50 @@ window { # first 3 args can be set via properties with 4th arg has_menubar=true
 }.show
 ```
 
+#### Basic Child Window
+
+[examples/basic_child_window.rb](examples/basic_child_window.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/basic_child_window.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/basic_child_window.rb'"
+```
+
+Mac | Windows | Linux
+----|---------|------
+![glimmer-dsl-libui-mac-basic-child-window.png](images/glimmer-dsl-libui-mac-basic-child-window.png) ![glimmer-dsl-libui-mac-basic-child-window-open.png](images/glimmer-dsl-libui-mac-basic-child-window-open.png) | ![glimmer-dsl-libui-windows-basic-child-window.png](images/glimmer-dsl-libui-windows-basic-child-window.png) ![glimmer-dsl-libui-windows-basic-child-window-open.png](images/glimmer-dsl-libui-windows-basic-child-window-open.png) | ![glimmer-dsl-libui-linux-basic-child-window.png](images/glimmer-dsl-libui-linux-basic-child-window.png) ![glimmer-dsl-libui-linux-basic-child-window-open.png](images/glimmer-dsl-libui-linux-basic-child-window-open.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Main Window') {
+  button('Spawn Child Window') {
+    on_clicked do
+      window('Child Window') {
+        on_closing do
+          puts 'Child window is closing'
+        end
+      }.show
+    end
+  }
+  
+  on_closing do
+    puts 'Main window is closing'
+  end
+}.show
+```
+
 #### Basic Button
 
 [examples/basic_button.rb](examples/basic_button.rb)
@@ -11239,6 +11284,12 @@ MacOS | Windows | Linux
 | :---: | :---: | :---:
 ![mac_31](https://user-images.githubusercontent.com/72874215/159339948-b7ae1bf2-60c1-4dae-ac1a-4e13a6048ef0.gif)|![windows_4](https://user-images.githubusercontent.com/72874215/160242473-c38439be-0955-4e89-9f3f-b3d0567531fd.gif)|![rubycrumbler_linux](https://user-images.githubusercontent.com/72874215/160242460-99af1c8c-b43f-458d-bd69-1274a0bd9814.gif)
 
+### Rubio-Radio
+
+https://github.com/kojix2/rubio-radio
+
+![rubio radio screenshot](https://user-images.githubusercontent.com/5798442/171986696-24bedc38-3811-4c62-a5ad-89c09d015c8a.png)
+
 ## Process
 
 [Glimmer Process](https://github.com/AndyObtiva/glimmer/blob/master/PROCESS.md)

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.5.14

data/examples/basic_child_window.rb

@@ -0,0 +1,19 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Main Window') {
+  button('Spawn Child Window') {
+    on_clicked do
+      window('Child Window') {
+        on_closing do
+          puts 'Child window is closing'
+        end
+      }.show
+    end
+  }
+  
+  on_closing do
+    puts 'Main window is closing'
+  end
+}.show

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

@@ -304,32 +304,36 @@ module Glimmer
           @cell_rows_observer = 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.each_with_index do |old_row_data, row|
-                if old_row_data != @cell_rows[row]
-                  ::LibUI.table_model_row_changed(model, row) if model && row
+                if old_row_data != @cell_rows[row] && model
+                  ::LibUI.table_model_row_changed(model, row)
                   notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
                 end
               end
               (@last_cell_rows.size - @cell_rows.size).times do |n|
                 row = @last_cell_rows.size - n - 1
-                ::LibUI.table_model_row_deleted(model, row) if model && row
-                notify_custom_listeners('on_changed', row, :deleted, @last_cell_rows[row])
+                if model
+                  ::LibUI.table_model_row_deleted(model, row)
+                  notify_custom_listeners('on_changed', row, :deleted, @last_cell_rows[row])
+                end
               end
             elsif @cell_rows.size > @last_cell_rows.size && @cell_rows.include_all?(*@last_cell_rows)
               (@cell_rows.size - @last_cell_rows.size).times do |n|
                 row = @last_cell_rows.size + n
-                ::LibUI.table_model_row_inserted(model, row) if model && row
-                notify_custom_listeners('on_changed', row, :inserted, @cell_rows[row])
+                if model
+                  ::LibUI.table_model_row_inserted(model, row)
+                  notify_custom_listeners('on_changed', row, :inserted, @cell_rows[row])
+                end
               end
               @cell_rows.each_with_index do |new_row_data, row|
-                if new_row_data != @last_cell_rows[row]
-                  ::LibUI.table_model_row_changed(model, row) if model && row
+                if new_row_data != @last_cell_rows[row] && model
+                  ::LibUI.table_model_row_changed(model, row)
                   notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
                 end
               end
             elsif @cell_rows != @last_cell_rows
               @cell_rows.each_with_index do |new_row_data, row|
-                if new_row_data != @last_cell_rows[row]
-                  ::LibUI.table_model_row_changed(model, row) if model && row
+                if new_row_data != @last_cell_rows[row] && model
+                  ::LibUI.table_model_row_changed(model, row)
                   notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
                 end
               end

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

@@ -80,10 +80,14 @@ module Glimmer
               return_value = nil
               @on_closing_listeners.each do |l|
                 return_value = l.call(self)
-                break if return_value.is_a?(Numeric)
+                break if return_value.is_a?(Numeric) || return_value.is_a?(TrueClass) || return_value.is_a?(FalseClass)
               end
               if return_value.is_a?(Numeric)
                 return_value
+              elsif return_value.is_a?(TrueClass) || return_value.is_a?(FalseClass)
+                return_value ? 1 : 0
+              elsif self != ControlProxy.main_window_proxy
+                1
               else
                 destroy
                 ::LibUI.quit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -285,6 +285,7 @@ files:
 - examples/basic_area3.rb
 - examples/basic_area4.rb
 - examples/basic_button.rb
+- examples/basic_child_window.rb
 - examples/basic_code_area.rb
 - examples/basic_draw_text.rb
 - examples/basic_draw_text2.rb
@@ -511,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI