glimmer-dsl-swt 4.18.5.5 → 4.18.7.0

data/lib/glimmer/dsl/swt/animation_expression.rb

@@ -33,7 +33,7 @@ module Glimmer
           Glimmer::SWT::Custom::Animation.new(parent)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

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

@@ -0,0 +1,61 @@
+# Copyright (c) 2007-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'
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/ui/custom_shape'
+require 'glimmer/swt/custom/code_text'
+require 'glimmer/swt/custom/checkbox_group'
+
+module Glimmer
+  module DSL
+    module SWT
+      class CustomShapeExpression < Expression
+        # TODO Make custom shapes automatically generate static expressions
+        include ParentExpression
+        include TopLevelExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          !!UI::CustomShape.for(keyword)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.pop : {}
+            UI::CustomShape.for(keyword).new(parent, *args, options, &block).tap do |new_custom_shape|
+            new_custom_shape.body_root.paint_pixel_by_pixel(&block) if block&.parameters&.count == 2
+          end
+        end
+  
+        def add_content(parent, keyword, *args, &block)
+          # TODO consider avoiding source_location
+          return if block&.parameters&.count == 2
+          if block.source_location == parent.content&.__getobj__.source_location
+            parent.content.call(parent) unless parent.content.called?
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swt/custom_widget_expression.rb

@@ -51,7 +51,7 @@ module Glimmer
           end
         end
   
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           # TODO consider avoiding source_location
           return if block&.parameters&.count == 2
           if block.source_location == parent.content&.__getobj__.source_location

data/lib/glimmer/dsl/swt/dsl.rb

@@ -57,6 +57,7 @@ module Glimmer
           widget
           custom_widget
           shape
+          custom_shape
         ]
       )
     end

data/lib/glimmer/dsl/swt/expand_item_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-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
@@ -7,10 +7,10 @@
 # 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
@@ -49,7 +49,7 @@ module Glimmer
           Glimmer::SWT::ExpandItemProxy.new(parent, args)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

data/lib/glimmer/dsl/swt/image_expression.rb

@@ -57,7 +57,7 @@ module Glimmer
           end
         end
 
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           return if @create_pixel_by_pixel || block&.parameters&.count == 2
           super
           parent.post_add_content

data/lib/glimmer/dsl/swt/multiply_expression.rb

@@ -39,7 +39,7 @@ module Glimmer
           Glimmer::SWT::TransformProxy.new(parent, *args, multiply: true)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

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

@@ -40,7 +40,7 @@ module Glimmer
           Glimmer::SWT::Custom::Shape.create(parent, keyword, *args, &block)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

data/lib/glimmer/dsl/swt/transform_expression.rb

@@ -41,7 +41,7 @@ module Glimmer
           Glimmer::SWT::TransformProxy.new(parent, *args)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -46,7 +46,7 @@ module Glimmer
           end
         end
 
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           return if block&.parameters&.count == 2
           super
           parent.post_add_content
@@ -69,3 +69,4 @@ require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/sash_form_proxy'
 require 'glimmer/swt/styled_text_proxy'
 require 'glimmer/swt/date_time_proxy'
+require 'glimmer/swt/tab_folder_proxy'

data/lib/glimmer/swt/color_proxy.rb

@@ -99,7 +99,7 @@ module Glimmer
       def ensure_arg_values_within_valid_bounds
         if @args.to_a.size >= 3
           @args = @args.map do |value|
-            [[value, 255].min, 0].max
+            [[value.to_f, 255].min, 0].max
           end
         end
       end

data/lib/glimmer/swt/custom/shape.rb

@@ -60,7 +60,6 @@ module Glimmer
       # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
       # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
       class Shape
-        include Packages
         include Properties
         
         class << self
@@ -74,7 +73,9 @@ module Glimmer
           end
         
           def valid?(parent, keyword, *args, &block)
-            gc_instance_methods.include?(method_name(keyword, arg_options(args)))
+            return true if keyword.to_s == 'shape'
+            gc_instance_methods.include?(method_name(keyword, arg_options(args))) ||
+              constants.include?(keyword.to_s.camelcase(:upper).to_sym)
           end
           
           def gc_instance_methods
@@ -126,7 +127,7 @@ module Glimmer
           end
         end
         
-        attr_reader :drawable, :parent, :name, :args, :options, :shapes
+        attr_reader :drawable, :parent, :name, :args, :options, :shapes, :properties
         attr_accessor :extent
         
         def initialize(parent, keyword, *args, &property_block)
@@ -134,7 +135,7 @@ module Glimmer
           @drawable = @parent.is_a?(Drawable) ? @parent : @parent.drawable
           @name = keyword
           @options = self.class.arg_options(args, extract: true)
-          @method_name = self.class.method_name(keyword, @options)
+          @method_name = self.class.method_name(keyword, @options) unless keyword.to_s == 'shape'
           @args = args
           @properties = {}
           @shapes = [] # nested shapes
@@ -225,6 +226,13 @@ module Glimmer
           end
         end
         
+        def content(&block)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec do
+            Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::ShapeExpression.new, @name, &block)
+            calculated_args_changed!(children: false)
+          end
+        end
+        
         def has_some_background?
           @properties.keys.map(&:to_s).include?('background') || @properties.keys.map(&:to_s).include?('background_pattern')
         end
@@ -234,18 +242,19 @@ module Glimmer
         end
         
         def post_add_content
-          unless @content_added
-            amend_method_name_options_based_on_properties!
+          amend_method_name_options_based_on_properties!
+          if !@content_added || @method_name != @original_method_name
             @drawable.setup_shape_painting unless @drawable.is_a?(ImageProxy)
             @content_added = true
           end
         end
         
-        def apply_property_arg_conversions(method_name, property, args)
+        def apply_property_arg_conversions(property, args)
+          method_name = attribute_setter(property)
           args = args.dup
           the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
           return args if the_java_method.nil?
-          if the_java_method.parameter_types.first == Color.java_class && args.first.is_a?(RGB)
+          if the_java_method.parameter_types.first == org.eclipse.swt.graphics.Color.java_class && args.first.is_a?(org.eclipse.swt.graphics.RGB)
             args[0] = [args[0].red, args[0].green, args[0].blue]
           end
           if ['setBackground', 'setForeground'].include?(method_name.to_s) && args.first.is_a?(Array)
@@ -255,10 +264,23 @@ module Glimmer
             args[0] = args.dup
             args[1..-1] = []
           end
+          if method_name.to_s == 'setAntialias' && [nil, true, false].include?(args.first)
+            args[0] = case args.first
+            when true
+              args[0] = :on
+            when false
+              args[0] = :off
+            when nil
+              args[0] = :default
+            end
+          end
           if args.first.is_a?(Symbol) || args.first.is_a?(::String)
-            if the_java_method.parameter_types.first == Color.java_class
+            if the_java_method.parameter_types.first == org.eclipse.swt.graphics.Color.java_class
               args[0] = ColorProxy.new(args[0])
             end
+            if method_name.to_s == 'setLineStyle'
+              args[0] = "line_#{args[0]}" if !args[0].to_s.downcase.start_with?('line_')
+            end
             if the_java_method.parameter_types.first == Java::int.java_class
               args[0] = SWTProxy.constant(args[0])
             end
@@ -266,7 +288,7 @@ module Glimmer
           if args.first.is_a?(ColorProxy)
             args[0] = args[0].swt_color
           end
-          if (args.first.is_a?(Hash) || args.first.is_a?(FontData)) && the_java_method.parameter_types.first == Font.java_class
+          if (args.first.is_a?(Hash) || args.first.is_a?(org.eclipse.swt.graphics.FontData)) && the_java_method.parameter_types.first == org.eclipse.swt.graphics.Font.java_class
             args[0] = FontProxy.new(args[0])
           end
           if args.first.is_a?(FontProxy)
@@ -279,7 +301,7 @@ module Glimmer
             @drawable.requires_shape_disposal = true
             args = args.first if args.first.is_a?(Array)
             args.each_with_index do |arg, i|
-              arg = ColorProxy.new(arg.red, arg.green, arg.blue) if arg.is_a?(RGB)
+              arg = ColorProxy.new(arg.red, arg.green, arg.blue) if arg.is_a?(org.eclipse.swt.graphics.RGB)
               arg = ColorProxy.new(arg) if arg.is_a?(Symbol) || arg.is_a?(::String)
               arg = arg.swt_color if arg.is_a?(ColorProxy)
               args[i] = arg
@@ -328,10 +350,16 @@ module Glimmer
         end
         
         def apply_shape_arg_defaults!
-          self.x = :default if current_parameter_name?(:x) && x.nil?
-          self.y = :default if current_parameter_name?(:y) && y.nil?
-          self.dest_x = :default if current_parameter_name?(:dest_x) && dest_x.nil?
-          self.dest_y = :default if current_parameter_name?(:dest_y) && dest_y.nil?
+          if current_parameter_name?(:dest_x) && dest_x.nil?
+            self.dest_x = :default
+          elsif parameter_name?(:x) && x.nil?
+            self.x = :default
+          end
+          if current_parameter_name?(:dest_y) && dest_y.nil?
+            self.dest_y = :default
+          elsif parameter_name?(:y) && y.nil?
+            self.y = :default
+          end
           self.width = :default if current_parameter_name?(:width) && width.nil?
           self.height = :default if current_parameter_name?(:height) && height.nil?
           if @name.include?('rectangle') && round? && @args.size.between?(4, 5)
@@ -358,6 +386,7 @@ module Glimmer
         end
         
         def amend_method_name_options_based_on_properties!
+          @original_method_name = @method_name
           return if @name == 'point'
           if @name != 'text' && @name != 'string' && has_some_background? && !has_some_foreground?
             @options[:fill] = true
@@ -375,7 +404,7 @@ module Glimmer
         
         # parameter names for arguments to pass to SWT GC.xyz method for rendering shape (e.g. draw_image(image, x, y) yields :image, :x, :y parameter names)
         def parameter_names
-          []
+          [:x, :y, :width, :height]
         end
         
         # subclasses may override to specify location parameter names if different from x and y (e.g. all polygon points are location parameters)
@@ -425,6 +454,11 @@ module Glimmer
           end
           if @content_added && perform_redraw && !drawable.is_disposed
             @calculated_paint_args = false
+            if is_a?(PathSegment)
+              root_path&.calculated_path_args = @calculated_path_args = false
+              calculated_args_changed!
+              root_path&.calculated_args_changed!
+            end
             attribute_name = ruby_attribute_getter(attribute_name)
             if location_parameter_names.map(&:to_s).include?(attribute_name)
               @calculated_args = nil
@@ -490,7 +524,8 @@ module Glimmer
           pattern_args(type: 'foreground')
         end
         
-        def dispose(dispose_images: true, dispose_patterns: true)
+        def dispose(dispose_images: true, dispose_patterns: true, redraw: true)
+          shapes.each { |shape| shape.is_a?(Shape::Path) && shape.dispose }
           if dispose_patterns
             @background_pattern&.dispose
             @background_pattern = nil
@@ -502,10 +537,42 @@ module Glimmer
             @image = nil
           end
           @parent.shapes.delete(self)
+          drawable.redraw if redraw && !drawable.is_a?(ImageProxy)
+        end
+        
+        # Indicate if this is a shape composite (meaning a shape bag that just contains nested shapes, but doesn't render anything of its own)
+        def shape_composite?
+          @name == 'shape'
+        end
+        
+        # ordered from closest to farthest parent
+        def parent_shapes
+          current_parent = parent
+          the_parent_shapes = []
+          until current_parent.is_a?(Drawable)
+            the_parent_shapes << current_parent
+            current_parent = current_parent.parent
+          end
+          the_parent_shapes
+        end
+        
+        # ordered from closest to farthest parent
+        def parent_shape_composites
+          parent_shapes.select(&:shape_composite?)
+        end
+        
+        def all_parent_properties
+          # TODO consider providing a converted property version of this ready for consumption
+          @all_parent_properties ||= parent_shape_composites.reverse.reduce({}) do |all_properties, parent_shape|
+            parent_properties = parent_shape.properties
+            parent_properties.each do |property, args|
+              parent_properties[property] = apply_property_arg_conversions(property, args)
+            end
+            all_properties.merge(parent_properties)
+          end
         end
         
         def paint(paint_event)
-          # pre-paint children an extra-time first when default width/height need to be calculated for defaults
           paint_children(paint_event) if default_width? || default_height?
           paint_self(paint_event)
           # re-paint children from scratch in the special case of pre-calculating parent width/height to re-center within new parent dimensions
@@ -518,28 +585,33 @@ module Glimmer
         
         def paint_self(paint_event)
           @painting = true
-          calculate_paint_args!
-          @original_properties_backup = {}
-          @properties.each do |property, args|
-            method_name = attribute_setter(property)
-            @original_properties_backup[method_name] = paint_event.gc.send(method_name.sub('set', 'get')) rescue nil
-            paint_event.gc.send(method_name, *args)
-            if property == 'transform' && args.first.is_a?(TransformProxy)
-              args.first.swt_transform.dispose
+          unless shape_composite?
+            calculate_paint_args!
+            @original_gc_properties = {} # this stores GC properties before making calls to updates TODO avoid using in pixel graphics
+            @original_properties = @properties # this stores original shape attributes like background/foreground/font
+            @properties.merge(all_parent_properties).each do |property, args|
+              method_name = attribute_setter(property)
+              @original_gc_properties[method_name] = paint_event.gc.send(method_name.sub('set', 'get')) rescue nil
+              paint_event.gc.send(method_name, *args)
+              if property == 'transform' && args.first.is_a?(TransformProxy)
+                args.first.swt_transform.dispose
+              end
             end
+            ensure_extent(paint_event)
           end
-          ensure_extent(paint_event)
           if !@calculated_args || parent_shape_absolute_location_changed?
             @calculated_args = calculated_args
           end
-          # paint unless parent's calculated args are not calculated yet, meaning it is about to get painted and trigger a paint on this child anyways
-          paint_event.gc.send(@method_name, *@calculated_args) unless parent.is_a?(Shape) && !parent.calculated_args?
-          @original_properties_backup.each do |method_name, value|
-            paint_event.gc.send(method_name, value)
+          unless shape_composite?
+            # paint unless parent's calculated args are not calculated yet, meaning it is about to get painted and trigger a paint on this child anyways
+            paint_event.gc.send(@method_name, *@calculated_args) unless (parent.is_a?(Shape) && !parent.calculated_args?)
+            @original_gc_properties.each do |method_name, value|
+              paint_event.gc.send(method_name, value)
+            end
           end
           @painting = false
         rescue => e
-          Glimmer::Config.logger.error {"Error encountered in painting shape (#{self.inspect}) with calculated args (#{@calculated_args}) and args (#{@args})"}
+          Glimmer::Config.logger.error {"Error encountered in painting shape (#{self.inspect}) with method (#{@method_name}) calculated args (#{@calculated_args}) and args (#{@args})"}
           Glimmer::Config.logger.error {e.full_message}
         ensure
           @painting = false
@@ -620,11 +692,19 @@ module Glimmer
           end
           if default_width?
             original_width = width
-            self.width = default_width + default_width_delta
+            self.width = default_width + width_delta
           end
           if default_height?
             original_height = height
-            self.height = default_height + default_height_delta
+            self.height = default_height + height_delta
+          end
+          if max_width?
+            original_width = width
+            self.width = max_width + width_delta
+          end
+          if max_height?
+            original_height = height
+            self.height = max_height + height_delta
           end
           if default_x?
             original_x = x
@@ -679,6 +759,16 @@ module Glimmer
           (height.nil? || height == :default || height == 'default' || (height.is_a?(Array) && (height.first.to_s == :default || height.first.to_s == 'default')))
         end
         
+        def max_width?
+          current_parameter_name?(:width) and
+            (width.nil? || width.to_s == 'max' || (width.is_a?(Array) && width.first.to_s == 'max'))
+        end
+        
+        def max_height?
+          current_parameter_name?(:height) and
+            (height.nil? || height.to_s == 'max' || (height.is_a?(Array) && height.first.to_s == 'max'))
+        end
+        
         def default_x
           result = ((parent.size.x - size.x) / 2)
           result += parent.bounds.x - parent.absolute_x if parent.is_a?(Shape) && parent.irregular?
@@ -694,29 +784,61 @@ module Glimmer
         def default_width
           # TODO consider caching
           x_ends = shapes.map do |shape|
-            shape_width = shape.calculated_width.to_f
-            shape_x = shape.default_x? ? 0 : shape.x.to_f
-            shape_x + shape_width
+            if shape.max_width?
+              0
+            else
+              shape_width = shape.calculated_width.to_f
+              shape_x = shape.default_x? ? 0 : shape.x.to_f
+              shape_x + shape_width
+            end
+          end
+          if shapes.size == 1 && shapes.first.max_width?
+            self.parent.size.x
+          else
+            x_ends.max.to_f
           end
-          x_ends.max.to_f
         end
         
         def default_height
           # TODO consider caching
           y_ends = shapes.map do |shape|
-            shape_height = shape.calculated_height.to_f
-            shape_y = shape.default_y? ? 0 : shape.y.to_f
-            shape_y + shape_height
+            if shape.max_height?
+              0
+            else
+              shape_height = shape.calculated_height.to_f
+              shape_y = shape.default_y? ? 0 : shape.y.to_f
+              shape_y + shape_height
+            end
+          end
+          if shapes.size == 1 && shapes.first.max_height?
+            self.parent.size.y
+          else
+            y_ends.max.to_f
           end
-          y_ends.max.to_f
+        end
+        
+        def max_width
+          # consider caching
+          parent.is_a?(Drawable) ? parent.size.x : parent.calculated_width
+        end
+        
+        def max_height
+          # consider caching
+          parent.is_a?(Drawable) ? parent.size.y : parent.calculated_height
         end
         
         def calculated_width
-          default_width? ? (default_width + default_width_delta) : width
+          result_width = width
+          result_width = (default_width + width_delta) if default_width?
+          result_width = (max_width + width_delta) if max_width?
+          result_width
         end
         
         def calculated_height
-          default_height? ? (default_height + default_height_delta) : height
+          result_height = height
+          result_height = (default_height + height_delta) if default_height?
+          result_height = (max_height + height_delta) if max_height?
+          result_height
         end
         
         def default_x_delta
@@ -729,12 +851,12 @@ module Glimmer
           y[1].to_f
         end
         
-        def default_width_delta
+        def width_delta
           return 0 unless default_width? && width.is_a?(Array)
           width[1].to_f
         end
         
-        def default_height_delta
+        def height_delta
           return 0 unless default_height? && height.is_a?(Array)
           height[1].to_f
         end
@@ -749,12 +871,12 @@ module Glimmer
           self.y = [:default, delta]
         end
         
-        def default_width_delta=(delta)
+        def width_delta=(delta)
           return unless default_width?
           self.width = [:default, delta]
         end
         
-        def default_height_delta=(delta)
+        def height_delta=(delta)
           return unless default_height?
           self.height = [:default, delta]
         end
@@ -801,7 +923,7 @@ module Glimmer
             if @name == 'pixel'
               @name = 'point'
               # optimized performance calculation for pixel points
-              if !@properties[:foreground].is_a?(Color)
+              if !@properties[:foreground].is_a?(org.eclipse.swt.graphics.Color)
                 if @properties[:foreground].is_a?(Array)
                   @properties[:foreground] = ColorProxy.new(@properties[:foreground], ensure_bounds: false)
                 end
@@ -818,13 +940,11 @@ module Glimmer
               # TODO regarding alpha, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes
               @properties['alpha'] ||= [255]
               @properties['font'] = [@drawable.font] if @drawable.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
-              # TODO regarding transform, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes
+              # TODO regarding transform, make sure to reset it to parent stored transform once we allow setting shape properties on parents directly without shapes
               # Also do that with all future-added properties
               @properties['transform'] = [nil] if @drawable.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
               @properties.each do |property, args|
-                method_name = attribute_setter(property)
-                converted_args = apply_property_arg_conversions(method_name, property, args)
-                @properties[property] = converted_args
+                @properties[property] = apply_property_arg_conversions(property, args)
               end
               apply_shape_arg_conversions!
               apply_shape_arg_defaults!