glimmer-dsl-libui 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1256d99b9a792c92f657e9320af1264a275f26e7de5586d3f174daaf33b35f07
-  data.tar.gz: 5d8dcf4a6eb8870136579240d8d5337e72c6e2bac76b78fd506a3c1335ecd8a7
+  metadata.gz: 122c9e87c9613b6ebb29722c0c7d602b0850f369c613374b21df38699e61e669
+  data.tar.gz: fb156f42398d2c8d419de476dfe435fbdfe872545da343daadd035ed2667775c
 SHA512:
-  metadata.gz: 8c99de618602038c939715d95a03ac6b8296e6f46bff298808df977c161dead4859aa6e7cca1e7d72bac6216e2c4f6cbbc090e4648ab933db406aced2028cf14
-  data.tar.gz: ed6e9d34fe546651d72918f2e5895cfb0cfd13a6eb2ab0f5e55b78a5cf8ecbbff1bc362afb9356f0839a80852c7a5bf30e262ddd05ee76f750e98129ae980a25
+  metadata.gz: 0d9587a6a19b25436fb8b810034d4663d2bd6e6dd478ab7397727978b5cec3100016032a0b3b9787ffcdb7245c2df4826829fa3e0d0afd60b69a26f4e45fcdcd
+  data.tar.gz: 8793a26d3383e981db6654b2e5e2705e677436e89eb1f678ec8289d17328d825151cb06ab67eacd19a398092ef77bafc6baa3e729c5152df57cf73189d9ad40e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 0.4.8
+
+- Support `checkbox` `checked` bidirectional data-binding (with `<=>` sign)
+- Support `check_menu_item` `checked` bidirectional data-binding (with `<=>` sign)
+- Support `radio_menu_item` `checked` bidirectional data-binding (with `<=>` sign)
+- Support `radio_buttons` `selected` property bidirectional data-binding (with `<=>` sign)
+- Improve examples/tetris.rb with bidirectional data-binding for `check_menu_item`/`radio_menu_item` `checked`
+- Update default dimensions of Meta-Example to `1000x500`
+- Fix minor issue with Meta-Example selecting first radio button in Advanced examples despite it not being the truly selected example on launch of the app (now, it starts explicitly deselected)
+- Fix minor issue with Meta-Example showing basic examples as advanced
+
 ## 0.4.7
 
 - Support `date_time_picker`/`date_picker`/`time_picker` `time` bidirectional data-binding (with `<=>` sign)

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.7
+# [<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.8
 ## 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)
@@ -373,7 +373,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.4.7'
+gem 'glimmer-dsl-libui', '~> 0.4.8'
 ```
 
 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.
@@ -1382,6 +1382,8 @@ Data-binding supports utilizing the [MVP (Model View Presenter)](https://en.wiki
 ![MVP](https://www.researchgate.net/profile/Gilles-Perrouin/publication/320249584/figure/fig8/AS:668260987068418@1536337243385/Model-view-presenter-architecture.png)
 
 [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) supports bidirectional (two-way) data-binding of the following controls/properties via the `<=>` operator (indicating data is moving in both directions between View and Model):
+- `checkbox`: `checked`
+- `check_menu_item`: `checked`
 - `color_button`: `color`
 - `combobox`: `selected`, `selected_item`
 - `date_picker`: `time`
@@ -1391,6 +1393,8 @@ Data-binding supports utilizing the [MVP (Model View Presenter)](https://en.wiki
 - `font_button`: `font`
 - `multiline_entry`: `text`
 - `non_wrapping_multiline_entry`: `text`
+- `radio_buttons`: `selected`
+- `radio_menu_item`: `checked`
 - `search_entry`: `text`
 - `slider`: `value`
 - `spinbox`: `value`
@@ -5043,7 +5047,8 @@ class ButtonCounter
   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.
+        # data-bind button text to self count, converting to string on read.
+        text <= [self, :count, on_read: ->(count) {"Count: #{count}"}]
         
         on_clicked do
           self.count += 1
@@ -7965,7 +7970,7 @@ class TinyMidiPlayer
           }
         }
 
-        combobox { |c|
+        combobox {
           items @midi_files.map { |path| File.basename(path) }
           # data-bind selected item (String) to self.selected_file with on-read/on-write converters and after_write operation
           selected_item <=> [self, :selected_file, on_read: ->(f) {File.basename(f.to_s)}, on_write: ->(f) {File.join(@music_directory, f)}, after_write: -> { play_midi if @th&.alive? }]
@@ -8051,7 +8056,7 @@ class TinyMidiPlayer
           }
         }
 
-        combobox { |c|
+        combobox {
           items @midi_files.map { |path| File.basename(path) }
           # data-bind selected index (Integer) to self.selected_file with on-read/on-write converters and after_write operation
           selected <=> [self, :selected_file, on_read: ->(f) {@midi_files.index(f)}, on_write: ->(i) {@midi_files[i]}, after_write: -> { play_midi if @th&.alive? }]
@@ -8392,22 +8397,23 @@ class Tetris
     menu('Game') {
       @pause_menu_item = check_menu_item('Pause') {
         enabled false
-        
-        on_clicked do
-          @game.paused = @pause_menu_item.checked?
-        end
+        checked <=> [@game, :paused]
       }
+      
       menu_item('Restart') {
         on_clicked do
           @game.restart!
         end
       }
+      
       separator_menu_item
+      
       menu_item('Exit') {
         on_clicked do
           exit(0)
         end
       }
+      
       quit_menu_item if OS.mac?
     }
     
@@ -8417,6 +8423,7 @@ class Tetris
           show_high_scores
         end
       }
+      
       menu_item('Clear High Scores') {
         on_clicked {
           @game.clear_high_scores!
@@ -8425,22 +8432,16 @@ class Tetris
     }
 
     menu('Options') {
-      radio_menu_item('Instant Down on Up Arrow') {
-        on_clicked do
-          @game.instant_down_on_up = true
-        end
+      radio_menu_item('Instant Down on Up Arrow') { |r|
+        checked <=> [@game, :instant_down_on_up]
       }
-      radio_menu_item('Rotate Right on Up Arrow') {
-        on_clicked do
-          @game.rotate_right_on_up = true
-        end
+      
+      radio_menu_item('Rotate Right on Up Arrow') { |r|
+        checked <=> [@game, :rotate_right_on_up]
       }
-      radio_menu_item('Rotate Left on Up Arrow') {
-        checked true
-
-        on_clicked do
-          @game.rotate_left_on_up = true
-        end
+      
+      radio_menu_item('Rotate Left on Up Arrow') { |r|
+        checked <=> [@game, :rotate_left_on_up]
       }
     }
 
@@ -8452,6 +8453,7 @@ class Tetris
           end
         }
       end
+      
       menu_item('About') {
         on_clicked do
           show_about_dialog

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/examples/button_counter.rb

@@ -13,7 +13,8 @@ class ButtonCounter
     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.
+          # data-bind button text to self count, converting to string on read.
+          text <= [self, :count, on_read: ->(count) {"Count: #{count}"}]
           
           on_clicked do
             self.count += 1

data/examples/meta_example.rb

@@ -24,18 +24,28 @@ class MetaExample
     @examples
   end
   
+  def basic_examples
+    examples.select {|example| example.start_with?('Basic') || ADDITIONAL_BASIC_EXAMPLES.include?(example) }
+  end
+  
+  def advanced_examples
+    examples - basic_examples
+  end
+  
   def examples_with_versions
-    examples.map do |example|
-      version_count_for(example) > 1 ? "#{example} (#{version_count_for(example)} versions)" : example
-    end
+    append_versions(examples)
   end
   
   def basic_examples_with_versions
-    examples_with_versions.select {|example| example.start_with?('Basic') || ADDITIONAL_BASIC_EXAMPLES.include?(example) }
+    append_versions(basic_examples)
   end
   
   def advanced_examples_with_versions
-    examples_with_versions - basic_examples_with_versions
+    append_versions(advanced_examples)
+  end
+  
+  def append_versions(examples)
+    examples.map { |example| version_count_for(example) > 1 ? "#{example} (#{version_count_for(example)} versions)" : example }
   end
   
   def file_path_for(example)
@@ -72,7 +82,7 @@ class MetaExample
   end
   
   def launch
-    window('Meta-Example', 700, 500) {
+    window('Meta-Example', 1000, 500) {
       margined true
       
       horizontal_box {
@@ -107,6 +117,7 @@ class MetaExample
                 @advanced_example_radio_buttons = radio_buttons {
                   stretchy false
                   items advanced_examples_with_versions
+                  selected -1
                   
                   on_selected do
                     @selected_example_index = examples_with_versions.index(advanced_examples_with_versions[@advanced_example_radio_buttons.selected])

data/examples/midi_player.rb

@@ -70,7 +70,7 @@ class TinyMidiPlayer
           }
         }
 
-        combobox { |c|
+        combobox {
           items @midi_files.map { |path| File.basename(path) }
           # data-bind selected item (String) to self.selected_file with on-read/on-write converters and after_write operation
           selected_item <=> [self, :selected_file, on_read: ->(f) {File.basename(f.to_s)}, on_write: ->(f) {File.join(@music_directory, f)}, after_write: -> { play_midi if @th&.alive? }]

data/examples/tetris.rb

@@ -109,22 +109,23 @@ class Tetris
     menu('Game') {
       @pause_menu_item = check_menu_item('Pause') {
         enabled false
-        
-        on_clicked do
-          @game.paused = @pause_menu_item.checked?
-        end
+        checked <=> [@game, :paused]
       }
+      
       menu_item('Restart') {
         on_clicked do
           @game.restart!
         end
       }
+      
       separator_menu_item
+      
       menu_item('Exit') {
         on_clicked do
           exit(0)
         end
       }
+      
       quit_menu_item if OS.mac?
     }
     
@@ -134,6 +135,7 @@ class Tetris
           show_high_scores
         end
       }
+      
       menu_item('Clear High Scores') {
         on_clicked {
           @game.clear_high_scores!
@@ -142,22 +144,16 @@ class Tetris
     }
 
     menu('Options') {
-      radio_menu_item('Instant Down on Up Arrow') {
-        on_clicked do
-          @game.instant_down_on_up = true
-        end
+      radio_menu_item('Instant Down on Up Arrow') { |r|
+        checked <=> [@game, :instant_down_on_up]
       }
-      radio_menu_item('Rotate Right on Up Arrow') {
-        on_clicked do
-          @game.rotate_right_on_up = true
-        end
+      
+      radio_menu_item('Rotate Right on Up Arrow') { |r|
+        checked <=> [@game, :rotate_right_on_up]
       }
-      radio_menu_item('Rotate Left on Up Arrow') {
-        checked true
-
-        on_clicked do
-          @game.rotate_left_on_up = true
-        end
+      
+      radio_menu_item('Rotate Left on Up Arrow') { |r|
+        checked <=> [@game, :rotate_left_on_up]
       }
     }
 
@@ -169,6 +165,7 @@ class Tetris
           end
         }
       end
+      
       menu_item('About') {
         on_clicked do
           show_about_dialog

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

@@ -29,6 +29,11 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class CheckboxProxy < ControlProxy
         DEFAULT_TEXT = ''
+      
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_toggled') { model_binding.call(checked) } if property == 'checked'
+        end
         
         private
         

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

@@ -65,7 +65,7 @@ module Glimmer
         alias selected_item= selected_item
         
         def data_bind(property, model_binding)
-          super
+          super # model to view data-binding
           case property
           when 'selected'
             handle_listener('on_selected') { model_binding.call(selected) }

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

@@ -39,11 +39,11 @@ module Glimmer
         end
         alias set_items items
         alias items= items
-      end
-      
-      def data_bind(property, model_binding)
-        super
-        handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
+        
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb

@@ -29,6 +29,11 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckMenuItemProxy < MenuItemProxy
+          def data_bind(property, model_binding)
+            super
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

data/lib/glimmer/libui/control_proxy/menu_item_proxy/radio_menu_item_proxy.rb

@@ -29,15 +29,23 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class RadioMenuItemProxy < MenuItemProxy
+          def initialize(keyword, parent, args, &block)
+            @last_checked = nil
+            super
+          end
+        
           def checked(value = nil)
-            if !value.nil?
-              if Glimmer::LibUI.integer_to_boolean(value) != checked?
-                super
+            if value.nil?
+              super()
+            else
+              super
+              if Glimmer::LibUI.integer_to_boolean(value, allow_nil: false) != Glimmer::LibUI.integer_to_boolean(@last_checked, allow_nil: false)
                 if Glimmer::LibUI.integer_to_boolean(value)
                   (@parent_proxy.children - [self]).select {|c| c.is_a?(MenuItemProxy)}.each do |menu_item|
                     menu_item.checked = false
                   end
                 end
+                @last_checked = checked
               end
             end
           end
@@ -48,7 +56,7 @@ module Glimmer
           def handle_listener(listener_name, &listener)
             if listener_name.to_s == 'on_clicked'
               radio_listener = Proc.new do
-                self.checked = true if !checked?
+                self.checked = true
                 listener.call(self)
               end
               super(listener_name, &radio_listener)
@@ -57,6 +65,11 @@ module Glimmer
             end
           end
         
+          def data_bind(property, model_binding)
+            super
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

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

@@ -39,6 +39,26 @@ module Glimmer
         end
         alias set_items items
         alias items= items
+        
+        def selected_item(value = nil)
+          if value.nil?
+            items[selected]
+          else
+            self.selected = items.index(value) || -1
+          end
+        end
+        alias set_selected_item selected_item
+        alias selected_item= selected_item
+        
+        def data_bind(property, model_binding)
+          super # model to view data-binding
+          case property
+          when 'selected'
+            handle_listener('on_selected') { model_binding.call(selected) }
+          when 'selected_item'
+            handle_listener('on_selected') { model_binding.call(selected_item) }
+          end
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy.rb

@@ -245,8 +245,8 @@ module Glimmer
           args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
           args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
           if property.to_s == 'checked'
-            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui))
-            new_value = Glimmer::LibUI.integer_to_boolean(args[0])
+            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui), allow_nil: false)
+            new_value = Glimmer::LibUI.integer_to_boolean(args[0], allow_nil: false)
             ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args) if new_value != current_value
           else
             ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args)

metadata

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