glimmer-dsl-libui 0.3.2 → 0.4.0

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

@@ -0,0 +1,35 @@
+# 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/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/observe_expression'
+
+module Glimmer
+  module DSL
+    module SWT
+      class ObserveExpression < StaticExpression
+        include TopLevelExpression
+        include Glimmer::DSL::ObserveExpression
+      end
+    end
+  end
+end

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

@@ -21,6 +21,9 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
+require 'glimmer/libui/control_proxy/path_proxy'
+require 'glimmer/libui/shape'
+require 'glimmer/libui/control_proxy/area_proxy'
 
 module Glimmer
   module DSL
@@ -32,7 +35,9 @@ module Glimmer
           Glimmer::LibUI::Shape.exists?(keyword) and
             (
               parent.is_a?(Glimmer::LibUI::ControlProxy::PathProxy) or
-                parent.is_a?(Glimmer::LibUI::Shape)
+              parent.is_a?(Glimmer::LibUI::Shape) or
+              parent.is_a?(Glimmer::LibUI::ControlProxy::AreaProxy) or
+              (parent.nil? && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params)
             )
         end
   

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

@@ -0,0 +1,42 @@
+# 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/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/shine'
+
+module Glimmer
+  module DSL
+    module Libui
+      class ShineDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 0 and
+            block.nil? and
+            parent.respond_to?(keyword, *args, &block)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::DataBinding::Shine.new(parent, keyword)
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,6 @@
 # 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/parent_expression'
 require 'glimmer/libui/control_proxy/text_proxy'
 require 'glimmer/libui/attributed_string'
@@ -27,14 +26,14 @@ require 'glimmer/libui/attributed_string'
 module Glimmer
   module DSL
     module Libui
-      class StringExpression < StaticExpression
+      class StringExpression < Expression
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
-          super and
+          keyword == 'string' and
             (
               parent.is_a?(Glimmer::LibUI::ControlProxy::TextProxy) or
-              parent.is_a?(Glimmer::LibUI::AttributedString)
+              (parent.is_a?(Glimmer::LibUI::AttributedString) and !args.empty?)
             )
         end
   
@@ -47,7 +46,7 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          parent.post_add_content
+          parent.post_add_content(block)
         end
       end
     end

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

@@ -73,12 +73,27 @@ module Glimmer
         @args = args
         @block = block
         set_parameter_defaults
+        build_control if implicit_path?
         post_add_content if @block.nil?
       end
       
       # 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?
+      end
+      
+      def post_initialize_child(child, add_child: true)
+        if child.is_a?(ControlProxy::MatrixProxy)
+          path_proxy.post_initialize_child(child, add_child: add_child)
+        else
+          super(child, add_child: add_child)
+        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
@@ -87,7 +102,7 @@ module Glimmer
       end
       
       def redraw
-        area_proxy&.auto_redraw
+        area_proxy&.redraw
       end
       
       def request_auto_redraw
@@ -105,6 +120,24 @@ module Glimmer
       def path_proxy
         find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::PathProxy) }
       end
+    
+      def fill(*args)
+        path_proxy.fill(*args)
+      end
+      alias fill= fill
+      alias set_fill fill
+      
+      def stroke(*args)
+        path_proxy.stroke(*args)
+      end
+      alias stroke= stroke
+      alias set_stroke stroke
+      
+      def transform(matrix = nil)
+        path_proxy.transform(matrix)
+      end
+      alias transform= transform
+      alias set_transform transform
       
       def respond_to?(method_name, *args, &block)
         self.class.parameters.include?(method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym) or
@@ -117,6 +150,7 @@ module Glimmer
           method_name = method_name.to_s
           parameter_index = self.class.parameters.index(method_name_parameter)
           if method_name.start_with?('set_') || method_name.end_with?('=') || !args.empty?
+            args = [args] if args.size > 1
             if args.first != @args[parameter_index]
               @args[parameter_index] = args.first
               request_auto_redraw
@@ -124,13 +158,27 @@ module Glimmer
           else
             @args[parameter_index]
           end
-        else
+        else # TODO consider if there is a need to redirect anything to path proxy or delete this TODO
           super
         end
       end
       
       private
       
+      def build_control
+        block = Proc.new {} if dynamic?
+        @parent = Glimmer::LibUI::ControlProxy::PathProxy.new('path', @parent, [], &block)
+      end
+      
+      # indicates if nested directly under area or on_draw event (having an implicit path not an explicit path parent)
+      def implicit_path?
+        @implicit_path ||= !!(@parent.is_a?(Glimmer::LibUI::ControlProxy::AreaProxy) || (@parent.nil? && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params))
+      end
+      
+      def dynamic?
+        ((@parent.nil? || (@parent.is_a?(ControlProxy::PathProxy) && @parent.parent_proxy.nil?)) && Glimmer::LibUI::ControlProxy::AreaProxy.current_area_draw_params)
+      end
+      
       def set_parameter_defaults
         self.class.parameter_defaults.each_with_index do |default, i|
           @args[i] ||= default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -238,6 +241,7 @@ files:
 - examples/basic_table_image_text2.rb
 - examples/basic_table_progress_bar.rb
 - examples/basic_transform.rb
+- examples/basic_transform2.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
@@ -279,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
@@ -394,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI