glimmer-dsl-libui 0.4.6 → 0.4.10

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

@@ -54,8 +54,23 @@ module Glimmer
         alias set_items items
         alias items= items
         
-        def selected_item
-          items[selected]
+        def selected_item(value = nil)
+          if value.nil?
+            items[selected]
+          else
+            self.selected = items.index(value)
+          end
+        end
+        alias set_selected_item selected_item
+        alias selected_item= selected_item
+        
+        def data_bind_write(property, model_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

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

@@ -64,6 +64,10 @@ module Glimmer
           Fiddle.free @time unless @time.nil?
           super
         end
+        
+        def data_bind_write(property, model_binding)
+          handle_listener('on_changed') { model_binding.call(time) } if property == 'time'
+        end
       end
     end
   end

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

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

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class EntryProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
         end
         

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

@@ -65,7 +65,11 @@ module Glimmer
           super
         end
         
-        def data_bind(property, model_binding)
+        def data_bind_read(property, model_binding)
+          # No Op
+        end
+        
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(font) } if property == 'font'
         end
       end

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

@@ -29,6 +29,10 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckMenuItemProxy < MenuItemProxy
+          def data_bind_write(property, model_binding)
+            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,10 @@ module Glimmer
             end
           end
         
+          def data_bind_write(property, model_binding)
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class MultilineEntryProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
         end
         

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

@@ -39,6 +39,25 @@ 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_write(property, model_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/slider_proxy.rb

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class SliderProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(value) } if property == 'value'
         end
       end

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class SpinboxProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(value) } if property == 'value'
         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)

data/lib/glimmer/libui/data_bindable.rb

@@ -23,9 +23,25 @@ module Glimmer
   module LibUI
     # Parent controls and shapes who have children and add child post_initialize_child
     module DataBindable
-      # Data-binds model to update view.
-      # Subclasses can override to do inverse data-binding by observing view control for property changes and updating model binding accordingly
+      # Sets up read/write (bidirectional) data-binding
+      #
+      # classes are expected to implement `data_bind_write(property, model_binding)` to setup write data-binding
+      # by observing view property for changes and writing to model attribute via model binding accordingly
+      #
+      # classes can override data_bind_read to disable read data-binding in rare scenarios that might need it
+      #
+      # returns model attribute reading observer by default
       def data_bind(property, model_binding)
+        data_bind_read(property, model_binding).tap do
+          data_bind_write(property, model_binding) unless model_binding.binding_options[:read_only]
+        end
+      end
+      
+      # Sets up read data-binding (reading from model to update view)
+      #
+      # Default implementation observes model attribute for changes via model binding
+      # and updates view property accordingly
+      def data_bind_read(property, model_binding)
         model_attribute_observer = Glimmer::DataBinding::Observer.proc do
           new_value = model_binding.evaluate_property
           send("#{property}=", new_value) unless send(property) == new_value
@@ -34,6 +50,15 @@ module Glimmer
         model_attribute_observer.call # initial update
         model_attribute_observer
       end
+      
+      # Sets up write data-binding (writing to model from view)
+      #
+      # Has no implementation by default. Classes are expected
+      # to implement this method by observing view property
+      # for changes and writing them to model accordingly via model binding
+      def data_bind_write(property, model_binding)
+        # No Op by default
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.10
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -250,9 +250,11 @@ files:
 - examples/color_button2.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb
+- examples/cpu_percentage.rb
 - examples/custom_draw_text.rb
 - examples/custom_draw_text2.rb
 - examples/date_time_picker.rb
+- examples/date_time_picker2.rb
 - examples/dynamic_area.rb
 - examples/dynamic_area2.rb
 - examples/dynamic_area3.rb
@@ -277,6 +279,8 @@ files:
 - examples/method_based_custom_keyword.rb
 - examples/method_based_custom_keyword2.rb
 - examples/midi_player.rb
+- examples/midi_player2.rb
+- examples/midi_player3.rb
 - examples/simple_notepad.rb
 - examples/snake.rb
 - examples/snake/model/apple.rb
@@ -285,6 +289,7 @@ files:
 - examples/snake/model/vertebra.rb
 - examples/snake/presenter/cell.rb
 - examples/snake/presenter/grid.rb
+- examples/snake2.rb
 - examples/tetris.rb
 - examples/tetris/model/block.rb
 - examples/tetris/model/game.rb
@@ -293,6 +298,7 @@ files:
 - examples/tic_tac_toe.rb
 - examples/tic_tac_toe/board.rb
 - examples/tic_tac_toe/cell.rb
+- examples/tic_tac_toe2.rb
 - examples/timer.rb
 - examples/timer2.rb
 - glimmer-dsl-libui.gemspec