glimmer-dsl-libui 0.11.2 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664a95631db2e2b9bf943f9843c6954df9dc55ba335e51214d721b376969094c
-  data.tar.gz: 61bc5b8242902e1273296c74dd74b470930a38cf9c34af48e296e14a91dce2e2
+  metadata.gz: 587e29f6be24b8a3f01a9872faa7f421531b36a9534fe4b241d52339dbca503c
+  data.tar.gz: d1fe047970b1c482aba434f9c1a3d010099aacca1d9ba320cf0ed07967ac3b83
 SHA512:
-  metadata.gz: 7045e3c06a6551286523e8f6564b6b57e86477d4c1693ba8b0852c4e259a69151caa0d945d05187cb9b1d0642274323dc6c5d7dcfe02e8481cc01f227a99e993
-  data.tar.gz: 5927641112ab6807a6f8f941f1e89d1927f85242bdadf79dd1ed9aa8d52f2707cf9607a702ed730a7f76f9594557fadb9f26415b4e87f6ee03b263740f013205
+  metadata.gz: 32da548dc373cef2214ce2af6ca329d01691cfdeeda8d9f6f5d85c6878c2d7b02ad1892d50e9f0a443256ef3e54932208c638635f8167e3906500af1eb328c28
+  data.tar.gz: 206732983531c55d879818e1ec92c3bba276a8430d5c2785dd80349078145dc3b8e961b31f3510cf10a7cdbfc1e57e15688858b03b91a80baa3bbe00a06b15c0

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.11.4
+
+- Fix issue with Content Data-Binding not working
+- Fix issue with not successfully processing layout properties (e.g. `stretchy`) when nested under custom controls/windows
+
+## 0.11.3
+
+- Support nesting `on_mouse_*` listeners under `text`
+
 ## 0.11.2
 
 - Fix issue with getting error when nesting property content under custom controls/shapes/windows (fixes `examples/basic_custom_shape.rb`)

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.11.2
+# [<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.11.4
 ## Prerequisite-Free Ruby Desktop Development Cross-Platform Native GUI Library  ([Fukuoka Award Winning](http://www.digitalfukuoka.jp/topics/187?locale=ja))
 ### The Quickest Way From Zero To GUI
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
@@ -431,7 +431,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.11.2'
+gem 'glimmer-dsl-libui', '~> 0.11.4'
 ```
 
 Test that installation worked by running the [Glimmer Meta-Example](#examples):

data/VERSION

@@ -1 +1 @@
-0.11.2
+0.11.4

data/examples/dynamic_form.rb

@@ -59,7 +59,9 @@ class DynamicForm
 
         button('Summarize') {
           on_clicked do
-            summary = @user.customizable_attributes.map { |attribute| @user.send(attribute) }.join(', ')
+            user_attribute_values = @user.customizable_attributes.map { |attribute| @user.send(attribute) }
+            non_blank_user_attribute_values = user_attribute_values.map(&:to_s).reject(&:empty?)
+            summary = non_blank_user_attribute_values.join(', ')
             msg_box('Summary', summary)
           end
         }

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

@@ -19,12 +19,12 @@
 # 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/dsl/static_expression'
+require 'glimmer/dsl/expression'
 
 module Glimmer
   module DSL
     module Libui
-      class ContentExpression < StaticExpression
+      class ContentExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           keyword == 'content' &&
             block_given? &&

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

@@ -38,7 +38,8 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          options = args.last.is_a?(Hash) ? args.last : {}
+          options[:post_add_content] = true if !options.include?(:post_add_content)
           super
           parent&.post_add_content if options[:post_add_content]
         end

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

@@ -44,7 +44,8 @@ module Glimmer
         end
   
         def add_content(custom_control, keyword, *args, &block)
-          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          options = args.last.is_a?(Hash) ? args.last : {}
+          options[:post_add_content] = true if !options.include?(:post_add_content)
           # TODO consider avoiding source_location
           if block.source_location == custom_control.content&.__getobj__&.source_location
             custom_control.content.call(custom_control) unless custom_control.content.called?

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

@@ -43,7 +43,8 @@ module Glimmer
         end
   
         def add_content(custom_shape, keyword, *args, &block)
-          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          options = args.last.is_a?(Hash) ? args.last : {}
+          options[:post_add_content] = true if !options.include?(:post_add_content)
           # TODO consider avoiding source_location
           if block.source_location == custom_shape.content&.__getobj__&.source_location
             custom_shape.content.call(custom_shape) unless custom_shape.content.called?

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

@@ -48,7 +48,8 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          options = args.last.is_a?(Hash) ? args.last : {}
+          options[:post_add_content] = true if !options.include?(:post_add_content)
           super
           parent&.post_add_content if options[:post_add_content]
         end

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

@@ -28,7 +28,8 @@ module Glimmer
     module Libui
       class ShineDataBindingExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
-          args.size == 0 and
+          keyword != 'content' and
+            args.size == 0 and
             block.nil? and
             parent.respond_to?(keyword, *args, &block)
         end

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

@@ -46,7 +46,8 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          options = args.last.is_a?(Hash) ? args.last : {}
+          options[:post_add_content] = true if !options.include?(:post_add_content)
           parent&.post_add_content(block) if options[:post_add_content]
         end
       end

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

@@ -32,8 +32,9 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class TextProxy < ControlProxy
         include Parent
+        include PerfectShaped
         prepend Transformable
-      
+        
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
           @parent_proxy = parent
@@ -156,6 +157,69 @@ module Glimmer
           @draw_text_layout_params
         end
         
+        def area_proxy
+          # TODO eventually reuse this method from Shape
+          find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::AreaProxy) }
+        end
+        
+        def find_parent_in_ancestors(&condition)
+          # TODO eventually reuse this method from Shape
+          found = self
+          until condition.call(found)
+            # TODO in the future, support nesting under composite shape where there is parent instead of parent_proxy
+#             found = found.respond_to?(:parent_proxy) ? found.parent_proxy : found.parent
+            found = found.parent_proxy
+          end
+          found
+        end
+      
+        def can_handle_listener?(listener_name)
+          area_proxy.can_handle_listener?(listener_name)
+        end
+        
+        def handle_listener(listener_name, &listener)
+          area_proxy.handle_listener(listener_name) do |event|
+            listener.call(event) if include?(event[:x], event[:y])
+          end
+        end
+        
+        def perfect_shape
+          the_perfect_shape_dependencies = perfect_shape_dependencies
+          if the_perfect_shape_dependencies != @perfect_shape_dependencies
+            absolute_x, absolute_y, width, height = @perfect_shape_dependencies = the_perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Rectangle.new(x: absolute_x, y: absolute_y, width: width, height: height)
+          end
+          @perfect_shape
+        end
+        
+        def perfect_shape_dependencies
+          # TODO support absolute_x and absolute_y with relative positioning in the future
+          absolute_x = x
+          absolute_y = y
+          [absolute_x, absolute_y, extent_width, extent_height]
+        end
+        
+        def extent_width
+          if @extent_width.to_f > 0
+            @extent_width
+          else
+            width
+          end
+        end
+        
+        def extent_height
+          if @extent_height.to_f > 0
+            @extent_height
+          else
+            children_max_size = children.map(&:font).map {|font| font[:size] if font.respond_to?(:[]) }.compact.max
+            if children_max_size.to_f > 0
+              children_max_size
+            else
+              @default_font[:size]
+            end
+          end
+        end
+        
         private
         
         def build_control
@@ -169,6 +233,16 @@ module Glimmer
           draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0
           draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha])
         end
+        
+        def calculate_extents
+          # TODO fix implementation once libui binding project responds about this
+          # as it always returns 0,0 right now
+          extent_width = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE*8)
+          extent_height = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE*8)
+          ::LibUI.draw_text_layout_extents(@libui, extent_width, extent_height)
+          @extent_width = extent_width[0, Fiddle::SIZEOF_DOUBLE*8].unpack1('i')
+          @extent_height = extent_height[0, Fiddle::SIZEOF_DOUBLE*8].unpack1('i')
+        end
       end
     end
   end

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

@@ -104,11 +104,11 @@ module Glimmer
         
         def content_size(*args)
           if args.empty?
-            width = Fiddle::Pointer.malloc(8)
-            height = Fiddle::Pointer.malloc(8)
+            width = Fiddle::Pointer.malloc(64)
+            height = Fiddle::Pointer.malloc(64)
             ::LibUI.window_content_size(@libui, width, height)
-            width = width[0, 8].unpack1('i')
-            height = height[0, 8].unpack1('i')
+            width = width[0, 64].unpack1('i')
+            height = height[0, 64].unpack1('i')
             [width, height]
           else
             args = args.first if args.size == 1 && args.first.is_a?(Array)

data/lib/glimmer/libui/control_proxy.rb

@@ -142,7 +142,10 @@ module Glimmer
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
         unless @content_added
-          @parent_proxy&.post_initialize_child(self)
+          if CustomControl.custom_controls_being_interpreted.last.nil? ||
+             CustomControl.custom_controls_being_interpreted.last.parent_proxy != @parent_proxy
+            @parent_proxy&.post_initialize_child(self)
+          end
           @content_added = true
         end
       end

data/lib/glimmer/libui/custom_control.rb

@@ -52,16 +52,6 @@ module Glimmer
           result ||= can_handle_listener?(method_name)
           result ||= @body_root.respond_to?(method_name, *args, &block)
         end
-
-        # Returns content block if used as an attribute reader (no args)
-        # Otherwise, if a block is passed, it adds it as content to this custom control
-        def content(&block)
-          if block_given?
-            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::CustomControlExpression.new, self.class.keyword, &block)
-          else
-            @content
-          end
-        end
       end
       
       super_module_included do |klass|
@@ -193,11 +183,16 @@ module Glimmer
         def after_body(&block)
           @after_body_block = block
         end
+        
+        def custom_controls_being_interpreted
+          @custom_controls_being_interpreted ||= []
+        end
       end
 
       attr_reader :body_root, :libui, :parent, :parent_proxy, :args, :keyword, :content, :options
 
       def initialize(keyword, parent, args, options, &content)
+        CustomControl.custom_controls_being_interpreted << self
         @parent_proxy = @parent = parent
         options ||= {}
         @options = self.class.options.merge(options)
@@ -220,7 +215,8 @@ module Glimmer
       end
 
       def post_add_content
-        # No Op by default
+        @parent_proxy&.post_initialize_child(@body_root)
+        Glimmer::LibUI::CustomControl.custom_controls_being_interpreted.pop
       end
       
       def observer_registrations
@@ -243,6 +239,21 @@ module Glimmer
           !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and
           !method(method_name)&.source_location&.first&.include?('glimmer/libui/control_proxy.rb')
       end
+
+      # Returns content block if used as an attribute reader (no args)
+      # Otherwise, if a block is passed, it adds it as content to this custom control
+      def content(*args, &block)
+        if args.empty?
+          if block_given?
+            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::CustomControlExpression.new, self.class.keyword, &block)
+          else
+            @content
+          end
+        else
+          # delegate to GUI DSL ContentExpression
+          super
+        end
+      end
       
       private
 

data/lib/glimmer/libui/custom_shape.rb

@@ -52,16 +52,6 @@ module Glimmer
           result ||= can_handle_listener?(method_name)
           result ||= @body_root.respond_to?(method_name, *args, &block)
         end
-
-        # Returns content block if used as an attribute reader (no args)
-        # Otherwise, if a block is passed, it adds it as content to this custom shape
-        def content(&block)
-          if block_given?
-            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::CustomShapeExpression.new, self.class.keyword, &block)
-          else
-            @content
-          end
-        end
       end
 
       super_module_included do |klass|
@@ -240,6 +230,21 @@ module Glimmer
           !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and
           !method(method_name)&.source_location&.first&.include?('glimmer/libui/shape.rb')
       end
+
+      # Returns content block if used as an attribute reader (no args)
+      # Otherwise, if a block is passed, it adds it as content to this custom shape
+      def content(*args, &block)
+        if args.empty?
+          if block_given?
+            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::CustomShapeExpression.new, self.class.keyword, &block)
+          else
+            @content
+          end
+        else
+          # delegate to GUI DSL ContentExpression
+          super
+        end
+      end
       
       private
 

data/lib/glimmer/libui/perfect_shaped.rb

@@ -15,13 +15,14 @@ module Glimmer
       # determining if a point lies on the outline (e.g. makes it easier to select
       # a shape by mouse)
       def contain?(*point, outline: false, distance_tolerance: 0)
+        # TODO inverse transform point with `uiDrawMatrixTransformPoint` before checking containment
         perfect_shape&.contain?(*point, outline: outline, distance_tolerance: distance_tolerance)
       end
       
       # Returns if shape includes point on the inside when filled
       # or if shape includes point on the outline when stroked
       def include?(*point)
-        if fill.empty?
+        if respond_to?(:fill) && fill.empty?
           # TODO check if distance_tolerance should be half the thickness in case it is checked against both sides of out and in
           contain?(*point, outline: true, distance_tolerance: ((stroke[:thickness] || 1) - 1))
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer