glimmer-dsl-libui 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3089dc0655a6c58f1b514e61ee7994ad1e51949ac79556228832fea732302fea
-  data.tar.gz: edeada4eafa026c2f1f6c4d10d581d8e2c416d87c66f142e9225aa809c72322a
+  metadata.gz: 9be2fa52f18acfaf245110441ec7c6d728cffd361f995b71f58a8e9e235c0846
+  data.tar.gz: b6f3cd15b385edc1839ff0da45cd22677723f1b8a91d947ad773a23a317f88bf
 SHA512:
-  metadata.gz: 1a3b4bb480862eee93488bc703c7a32f4c21e7d7a80c2668f262833d8eed3600d7b6169e2c3670666cb030cd94b547b3055df79289679f87618ff411cc8dc729
-  data.tar.gz: '0294d1117c0fbfec011f358d2570adb3ea78b95cd656e9b5803467d9eef8e7f9e6e8f615220a1b46c094779b634106ccd31965d00e9dc9365e305d710a5d7c4d'
+  metadata.gz: 6f6ad39350772e169b0500fcb727567d884c5fab0f06945eb7e25a20c45322083d70f7b9ad8b636b7dfef12ede12afce87dce480e819567a414ad20dbf77904c
+  data.tar.gz: 25eabc97ed6588b7ba74d97bd352bb80a41afbcecb2e4f8d7f26f101753b81062fcfc2503d61292997ee82f856d8a5bc0b3786fd227b8a6f248da36d40a82aac

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 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`)
+
 ## 0.11.1
 
 - Refactor `examples/dynamic_form.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.1
+# [<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.3
 ## 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.1'
+gem 'glimmer-dsl-libui', '~> 0.11.3'
 ```
 
 Test that installation worked by running the [Glimmer Meta-Example](#examples):
@@ -636,6 +636,8 @@ Mac | Windows | Linux
 
 Application scaffolding enables automatically generating the directories/files of a new desktop GUI application that follows the MVC architecture and can be packaged as a Ruby gem that includes an executable script for running the app conveniently. It also ensures that software engineers follow the recommended Glimmer DSL for LibUI conventions and best practices. Application Scaffolding greatly improves software engineering productivity when building desktop applications with [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui).
 
+Application Scaffolding relies on the [juwelier](https://rubygems.org/gems/juwelier) Ruby gem, which expects having a local Git config (global settings in `~/.gitconfig`) of [`user.name`](https://docs.github.com/en/get-started/getting-started-with-git/setting-your-username-in-git#setting-your-git-username-for-every-repository-on-your-computer), [`user.email`](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address#setting-your-email-address-for-every-repository-on-your-computer), and `github.user`.
+
 Scaffold Glimmer DSL for LibUI application with this command:
 
 ```

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.3

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/custom_control.rb

@@ -52,6 +52,16 @@ 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|
@@ -233,16 +243,6 @@ 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(&block)
-        if block_given?
-          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::CustomControlExpression.new, self.class.keyword, &block)
-        else
-          @content
-        end
-      end
       
       private
 

data/lib/glimmer/libui/custom_shape.rb

@@ -52,6 +52,16 @@ 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|
@@ -230,16 +240,6 @@ 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(&block)
-        if block_given?
-          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::CustomShapeExpression.new, self.class.keyword, &block)
-        else
-          @content
-        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.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer