glimmer-dsl-libui 0.3.3 → 0.4.1

data/lib/glimmer/libui/attributed_string.rb

@@ -27,7 +27,8 @@ require 'glimmer/libui/control_proxy/transformable'
 module Glimmer
   module LibUI
     class AttributedString
-      attr_reader :block, :keyword, :parent_proxy, :args
+      attr_reader :keyword, :parent_proxy, :args
+      attr_accessor :block
     
       def initialize(keyword, parent_proxy, args, &block)
         @keyword = keyword
@@ -115,10 +116,14 @@ module Glimmer
       alias open_type_features= open_type_features
       alias set_open_type_features open_type_features
       
-      def post_add_content
-        block_result = @block&.call
-        @string = block_result if block_result.is_a?(String)
-        @parent_proxy&.post_initialize_child(self)
+      def post_add_content(block = nil)
+        block ||= @block
+        block_result = block&.call
+        unless @content_added
+          @string = block_result if block_result.is_a?(String)
+          @parent_proxy&.post_initialize_child(self)
+          @content_added = true
+        end
       end
       
       def post_initialize_child(child)
@@ -185,12 +190,20 @@ module Glimmer
       end
       
       def redraw
-        area_proxy&.queue_redraw_all
+        area_proxy&.redraw
+      end
+      
+      def request_auto_redraw
+        area_proxy&.request_auto_redraw
       end
       
       def area_proxy
         @parent_proxy.parent_proxy
       end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::StringExpression.new, @keyword, &block)
+      end
     end
   end
 end

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

@@ -31,8 +31,43 @@ module Glimmer
         class ScrollingAreaProxy < AreaProxy
           def build_control
             @area_handler = ::LibUI::FFI::AreaHandler.malloc
+            @args[0] ||= Glimmer::LibUI::ControlProxy.main_window_proxy.width
+            @args[1] ||= Glimmer::LibUI::ControlProxy.main_window_proxy.height
             @libui    = ::LibUI.new_scrolling_area(@area_handler, *@args)
           end
+          
+          def width(value = nil)
+            if value.nil?
+              @args[0]
+            else
+              @args[0] = value
+              set_size(width, height)
+            end
+          end
+          alias width= width
+          alias set_width width
+          
+          def height(value = nil)
+            if value.nil?
+              @args[1]
+            else
+              @args[1] = value
+              set_size(width, height)
+            end
+          end
+          alias height= height
+          alias set_height height
+          
+          def set_size(width, height)
+            @args[0] = width
+            @args[1] = height
+            super(width, height)
+          end
+          
+          def scroll_to(scroll_x, scroll_y, scroll_width = nil, scroll_height = nil)
+            scroll_width, scroll_height = Glimmer::LibUI::ControlProxy.main_window_proxy.content_size
+            super(scroll_x, scroll_y, scroll_width, scroll_height)
+          end
         end
       end
     end

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

@@ -113,6 +113,26 @@ module Glimmer
         alias content_size= content_size
         alias set_content_size content_size
         
+        def width(value = nil)
+          if value.nil?
+            content_size.first
+          else
+            set_content_size(value, height)
+          end
+        end
+        alias width= width
+        alias set_width width
+        
+        def height(value = nil)
+          if value.nil?
+            content_size.last
+          else
+            set_content_size(width, value)
+          end
+        end
+        alias height= height
+        alias set_height height
+        
         def resizable(value = nil)
           if value.nil?
             @resizable = true if @resizable.nil?

data/lib/glimmer/libui/shape.rb

@@ -91,13 +91,18 @@ module Glimmer
         end
       end
       
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::ShapeExpression.new, @keyword, &block)
+        request_auto_redraw
+      end
+      
       # Subclasses must override to perform draw work and call super afterwards to ensure calling destroy when semi-declarative in an on_draw method
       def draw(area_draw_params)
         destroy if area_proxy.nil?
       end
       
       def redraw
-        area_proxy&.auto_redraw
+        area_proxy&.redraw
       end
       
       def request_auto_redraw

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,8 @@ files:
 - examples/area_gallery4.rb
 - examples/basic_area.rb
 - examples/basic_area2.rb
+- examples/basic_area3.rb
+- examples/basic_area4.rb
 - examples/basic_button.rb
 - examples/basic_draw_text.rb
 - examples/basic_draw_text2.rb
@@ -226,6 +228,7 @@ files:
 - examples/basic_image3.rb
 - examples/basic_image4.rb
 - examples/basic_image5.rb
+- examples/basic_scrolling_area.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
 - examples/basic_table_checkbox.rb
@@ -280,14 +283,18 @@ files:
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
+- lib/glimmer/dsl/libui/bind_expression.rb
 - lib/glimmer/dsl/libui/control_expression.rb
+- lib/glimmer/dsl/libui/data_binding_expression.rb
 - lib/glimmer/dsl/libui/dsl.rb
 - lib/glimmer/dsl/libui/file_expression.rb
 - lib/glimmer/dsl/libui/listener_expression.rb
+- lib/glimmer/dsl/libui/observe_expression.rb
 - lib/glimmer/dsl/libui/open_file_expression.rb
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
 - lib/glimmer/dsl/libui/shape_expression.rb
+- lib/glimmer/dsl/libui/shine_data_binding_expression.rb
 - lib/glimmer/dsl/libui/string_expression.rb
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/fiddle_consumer.rb