glimmer-dsl-libui 0.4.1 → 0.4.5

data/lib/glimmer/dsl/libui/data_binding_expression.rb

@@ -30,16 +30,14 @@ module Glimmer
       class DataBindingExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           args.size == 1 and
-            args[0].is_a?(DataBinding::ModelBinding)
+            args[0].is_a?(DataBinding::ModelBinding) and
+            parent.respond_to?(:data_bind)
         end
   
         def interpret(parent, keyword, *args, &block)
+          property = keyword
           model_binding = args[0]
-          model_attribute_observer = Glimmer::DataBinding::Observer.proc do
-            parent.send("#{keyword}=", model_binding.evaluate_property)
-          end
-          model_attribute_observer.observe(model_binding)
-          model_attribute_observer.call # initial update
+          parent.data_bind(property, model_binding)
         end
       end
     end

data/lib/glimmer/libui/attributed_string.rb

@@ -23,10 +23,13 @@ require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/parent'
 require 'glimmer/libui/control_proxy/transformable'
+require 'glimmer/libui/data_bindable'
 
 module Glimmer
   module LibUI
     class AttributedString
+      include DataBindable
+      
       attr_reader :keyword, :parent_proxy, :args
       attr_accessor :block
     

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

@@ -86,14 +86,17 @@ module Glimmer
         
         def post_add_content
           unless parent_proxy.is_a?(Box)
-            original_parent_proxy = @parent_proxy
-            @vertical_box_parent_proxy = ControlProxy.create('vertical_box', parent_proxy, []) {} # block prevents calling post add content
-            append_properties.each do |property|
-              @vertical_box_parent_proxy.append_property(property, append_property(property))
+            unless @content_added
+              original_parent_proxy = @parent_proxy
+              @vertical_box_parent_proxy = ControlProxy.create('vertical_box', parent_proxy, []) {} # block prevents calling post add content
+              append_properties.each do |property|
+                @vertical_box_parent_proxy.append_property(property, append_property(property))
+              end
+              @vertical_box_parent_proxy.post_add_content
+              @parent_proxy = @vertical_box_parent_proxy
+              @vertical_box_parent_proxy.post_initialize_child(self)
+              @content_added = true
             end
-            @vertical_box_parent_proxy.post_add_content
-            @parent_proxy = @vertical_box_parent_proxy
-            @vertical_box_parent_proxy.post_initialize_child(self)
           else
             super
           end
@@ -142,48 +145,51 @@ module Glimmer
         end
         
         def install_listeners
-          @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
-            area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
-            area_draw_params = area_draw_params_hash(area_draw_params)
-            AreaProxy.current_area_draw_params = area_draw_params
-            draw(area_draw_params)
-            AreaProxy.current_area_draw_params = nil
-          end
-          @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
-            area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
-            area_mouse_event = area_mouse_event_hash(area_mouse_event)
-            on_mouse_event.each { |listener| listener.call(area_mouse_event)}
-            on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
-            unless @last_area_mouse_event.nil?
-              on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
-              on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
-              on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
-              on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
-              on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+          unless @listeners_installed
+            @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
+              area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
+              area_draw_params = area_draw_params_hash(area_draw_params)
+              AreaProxy.current_area_draw_params = area_draw_params
+              draw(area_draw_params)
+              AreaProxy.current_area_draw_params = nil
             end
-            @last_area_mouse_event = area_mouse_event
-          end
-          @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
-            left = Glimmer::LibUI.integer_to_boolean(left)
-            on_mouse_crossed.each { |listener| listener.call(left) }
-            if left
-              on_mouse_exit.each { |listener| listener.call(left) }
-            else
-              on_mouse_enter.each { |listener| listener.call(left) }
+            @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
+              area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
+              area_mouse_event = area_mouse_event_hash(area_mouse_event)
+              on_mouse_event.each { |listener| listener.call(area_mouse_event)}
+              on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
+              unless @last_area_mouse_event.nil?
+                on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
+                on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
+                on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
+                on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
+                on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+              end
+              @last_area_mouse_event = area_mouse_event
             end
-          end
-          @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
-            on_drag_broken.each { |listener| listener.call }
-          end
-          @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
-            area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
-            area_key_event = area_key_event_hash(area_key_event)
-            on_key_event.each { |listener| listener.call(area_key_event) }
-            if area_key_event[:up]
-              on_key_up.each { |listener| listener.call(area_key_event) }
-            else
-              on_key_down.each { |listener| listener.call(area_key_event) }
+            @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
+              left = Glimmer::LibUI.integer_to_boolean(left)
+              on_mouse_crossed.each { |listener| listener.call(left) }
+              if left
+                on_mouse_exit.each { |listener| listener.call(left) }
+              else
+                on_mouse_enter.each { |listener| listener.call(left) }
+              end
+            end
+            @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
+              on_drag_broken.each { |listener| listener.call }
+            end
+            @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
+              area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
+              area_key_event = area_key_event_hash(area_key_event)
+              on_key_event.each { |listener| listener.call(area_key_event) }
+              if area_key_event[:up]
+                on_key_up.each { |listener| listener.call(area_key_event) }
+              else
+                on_key_down.each { |listener| listener.call(area_key_event) }
+              end
             end
+            @listeners_installed = true
           end
         end
         

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

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

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

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

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

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

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

@@ -0,0 +1,38 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/control_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI spinbox objects
+      #
+      # Follows the Proxy Design Pattern
+      class SpinboxProxy < ControlProxy
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_changed') { model_binding.call(value) } if property == 'value'
+        end
+      end
+    end
+  end
+end

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

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

data/lib/glimmer/libui/control_proxy.rb

@@ -19,6 +19,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'glimmer/libui/data_bindable'
+
 module Glimmer
   module LibUI
     # Proxy for LibUI control objects
@@ -101,6 +103,8 @@ module Glimmer
         end
       end
       
+      include DataBindable
+      
       KEYWORD_ALIASES = {
         'msg_box'       => 'message_box',
         'msg_box_error' => 'message_box_error',
@@ -136,7 +140,10 @@ module Glimmer
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
-        @parent_proxy&.post_initialize_child(self)
+        unless @content_added
+          @parent_proxy&.post_initialize_child(self)
+          @content_added = true
+        end
       end
       
       # Subclasses may override to perform post initialization work on an added child

data/lib/glimmer/libui/data_bindable.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+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
+      def data_bind(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
+        end
+        model_attribute_observer.observe(model_binding)
+        model_attribute_observer.call # initial update
+        model_attribute_observer
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape.rb

@@ -22,6 +22,7 @@
 require 'glimmer/libui/parent'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/control_proxy/path_proxy'
+require 'glimmer/libui/data_bindable'
 
 module Glimmer
   module LibUI
@@ -64,6 +65,7 @@ module Glimmer
       end
       
       include Parent
+      include DataBindable
       
       attr_reader :parent, :args, :keyword, :block
       
@@ -79,8 +81,11 @@ module Glimmer
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
-        @parent&.post_initialize_child(self)
-        @parent.post_add_content if implicit_path? && dynamic?
+        unless @content_added
+          @parent&.post_initialize_child(self)
+          @parent.post_add_content if implicit_path? && dynamic?
+          @content_added = true
+        end
       end
       
       def post_initialize_child(child, add_child: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.5
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -223,6 +223,7 @@ files:
 - examples/basic_draw_text.rb
 - examples/basic_draw_text2.rb
 - examples/basic_entry.rb
+- examples/basic_entry2.rb
 - examples/basic_image.rb
 - examples/basic_image2.rb
 - examples/basic_image3.rb
@@ -244,6 +245,7 @@ files:
 - examples/basic_transform2.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
+- examples/button_counter.rb
 - examples/color_button.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb
@@ -252,16 +254,26 @@ files:
 - examples/date_time_picker.rb
 - examples/dynamic_area.rb
 - examples/dynamic_area2.rb
+- examples/dynamic_area3.rb
+- examples/dynamic_area4.rb
 - examples/editable_column_table.rb
 - examples/editable_table.rb
 - examples/font_button.rb
 - examples/form.rb
+- examples/form2.rb
 - examples/form_table.rb
+- examples/form_table2.rb
 - examples/grid.rb
 - examples/histogram.rb
+- examples/histogram2.rb
 - examples/login.rb
+- examples/login2.rb
+- examples/login3.rb
+- examples/login4.rb
+- examples/login5.rb
 - examples/meta_example.rb
 - examples/method_based_custom_keyword.rb
+- examples/method_based_custom_keyword2.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
 - examples/snake.rb
@@ -280,6 +292,7 @@ files:
 - examples/tic_tac_toe/board.rb
 - examples/tic_tac_toe/cell.rb
 - examples/timer.rb
+- examples/timer2.rb
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
@@ -357,12 +370,14 @@ files:
 - lib/glimmer/libui/control_proxy/open_type_tag_proxy.rb
 - lib/glimmer/libui/control_proxy/path_proxy.rb
 - lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
+- lib/glimmer/libui/control_proxy/spinbox_proxy.rb
 - lib/glimmer/libui/control_proxy/tab_item_proxy.rb
 - lib/glimmer/libui/control_proxy/table_proxy.rb
 - lib/glimmer/libui/control_proxy/text_proxy.rb
 - lib/glimmer/libui/control_proxy/transformable.rb
 - lib/glimmer/libui/control_proxy/triple_column.rb
 - lib/glimmer/libui/control_proxy/window_proxy.rb
+- lib/glimmer/libui/data_bindable.rb
 - lib/glimmer/libui/image_path_renderer.rb
 - lib/glimmer/libui/parent.rb
 - lib/glimmer/libui/shape.rb