glimmer-dsl-swt 4.18.2.0 → 4.18.2.5

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

@@ -22,6 +22,7 @@
 require 'glimmer'
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module DSL
@@ -29,7 +30,7 @@ module Glimmer
       class WidgetExpression < Expression
         include ParentExpression
 
-        EXCLUDED_KEYWORDS = %w[shell display tab_item]
+        EXCLUDED_KEYWORDS = %w[shell display tab_item] + Glimmer::SWT::Custom::Shape.keywords - ['text']
 
         def can_interpret?(parent, keyword, *args, &block)
           result = !EXCLUDED_KEYWORDS.include?(keyword) &&

data/lib/glimmer/rake_task/package.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
@@ -27,7 +27,7 @@ module Glimmer
     module Package
       class << self
         attr_accessor :javapackager_extra_args
-        alias jpackage_extra_args :javapackager_extra_args
+        alias jpackage_extra_args javapackager_extra_args
         
         def clean
           require 'fileutils'
@@ -48,7 +48,7 @@ module Glimmer
           FileUtils.mkdir_p('vendor/jars')
           command = "lock_jars --vendor-dir vendor/jars"
           puts command
-          system command      
+          system command
         end
         
         def config
@@ -78,18 +78,18 @@ module Glimmer
             else
               puts 'Warbler executable "warble" is missing!'
             end
-          end      
+          end
         end
         
         def jar
           FileUtils.mkdir_p('dist')
           puts "Generating JAR with Warbler..."
           system "jruby -S gem install warbler -v2.0.5 --no-document" unless warbler_exists?
-          system('warble')      
+          system('warble')
         end
         
         def native(native_type=nil, native_extra_args)
-          puts "Generating native executable with javapackager/jpackage..."          
+          puts "Generating native executable with javapackager/jpackage..."
           java_version = `java -version`
           puts "WARNING! Glimmer Packaging Pre-Requisite Java Version 1.8.0_241 Is Not Found!" unless java_version.include?('1.8.0_241')
           require 'facets/string/titlecase'
@@ -125,7 +125,7 @@ module Glimmer
           command += " #{ENV['JAVAPACKAGER_EXTRA_ARGS']} " if ENV['JAVAPACKAGER_EXTRA_ARGS']
           command += " #{native_extra_args} " if native_extra_args
           puts command
-          system command      
+          system command
         end
         
         private

data/lib/glimmer/rake_task/scaffold.rb

@@ -42,6 +42,7 @@ module Glimmer
           *.gem
           *.rbc
           /.config
+          /.mvn/
           /coverage/
           /InstalledFiles
           /pkg/
@@ -97,9 +98,9 @@ module Glimmer
           .gladiator
           
           # Glimmer
-          dist
-          packages
-          vendor/jars
+          /dist/
+          /packages/
+          /vendor/jars/
         MULTI_LINE_STRING
     
         GEMFILE = <<~MULTI_LINE_STRING

data/lib/glimmer/swt/color_proxy.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
@@ -28,9 +28,20 @@ module Glimmer
     #
     # Invoking `#swt_color` returns the SWT Color object wrapped by this proxy
     #
-    # Follows the Proxy Design Pattern
+    # Follows the Proxy Design Pattern and Flyweight Design Pattern (caching memoization)
     class ColorProxy
       include_package 'org.eclipse.swt.graphics'
+      
+      class << self
+        def flyweight(*args)
+          flyweight_color_proxies[args] ||= new(*args)
+        end
+        
+        # Flyweight Design Pattern memoization cache. Can be cleared if memory is needed.
+        def flyweight_color_proxies
+          @flyweight_color_proxies ||= {}
+        end
+      end
 
       # Initializes a proxy for an SWT Color object
       #
@@ -49,6 +60,7 @@ module Glimmer
       #
       def initialize(*args)
         @args = args
+        ensure_arg_values_within_valid_bounds
       end
 
       def swt_color
@@ -64,7 +76,7 @@ module Glimmer
             end
           when 3..4
             red, green, blue, alpha = @args
-            @swt_color = Color.new(DisplayProxy.instance.swt_display, *[red, green, blue, alpha].compact)
+            @swt_color = Color.new(*[red, green, blue, alpha].compact)
           end
         end
         @swt_color
@@ -79,7 +91,17 @@ module Glimmer
       
       def respond_to?(method, *args, &block)
         super || swt_color.respond_to?(method, *args, &block)
-      end      
+      end
+      
+      private
+      
+      def ensure_arg_values_within_valid_bounds
+        if @args.to_a.size >= 3
+          @args = @args.map do |value|
+            [[value, 255].min, 0].max
+          end
+        end
+      end
     end
   end
 end

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

@@ -34,6 +34,14 @@ module Glimmer
             shapes.delete(shape)
           end
         end
+        
+        def resetup_shape_paint_listeners
+          # TODO consider performance optimizations relating to order of shape rendering (affecting only further shapes not previous ones)
+          shapes.each do |shape|
+            shape.paint_listener_proxy&.unregister
+            shape.setup_paint_listener
+          end
+        end
       end
       
     end

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

@@ -32,6 +32,7 @@ module Glimmer
       # swt_widget returns the parent (e.g. a `canvas` WidgetProxy), equivalent to `parent.swt_widget`
       # 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
         # TODO support textExtent sized shapes nested within text/string
         # TODO support a Pattern DSL for methods that take Pattern arguments
@@ -42,7 +43,17 @@ module Glimmer
           end
           
           def gc_instance_methods
-            org.eclipse.swt.graphics.GC.instance_methods.map(&:to_s)
+            @gc_instance_methods ||= org.eclipse.swt.graphics.GC.instance_methods.map(&:to_s)
+          end
+          
+          def keywords
+            @keywords ||= gc_instance_methods.select do |method_name|
+              !method_name.end_with?('=') && (method_name.start_with?('draw_') || method_name.start_with?('fill_'))
+            end.reject do |method_name|
+              gc_instance_methods.include?("#{method_name}=") || gc_instance_methods.include?("set_#{method_name}")
+            end.map do |method_name|
+              method_name.gsub(/(draw|fill|gradient|round)_/, '')
+            end.uniq.compact.to_a
           end
           
           def arg_options(args, extract: false)
@@ -52,11 +63,19 @@ module Glimmer
           end
           
           def method_name(keyword, args)
-            keyword = keyword.to_s
-            gradient = 'gradient_' if arg_options(args)[:gradient]
-            round = 'round_' if arg_options(args)[:round]
-            gc_instance_method_name_prefix = !['polyline', 'point', 'image', 'focus'].include?(keyword) && (arg_options(args)[:fill] || arg_options(args)[:gradient]) ? 'fill_' : 'draw_'
-            "#{gc_instance_method_name_prefix}#{gradient}#{round}#{keyword}"
+            method_arg_options = arg_options(args)
+            unless flyweight_method_names.keys.include?([keyword, method_arg_options])
+              keyword = keyword.to_s
+              gradient = 'gradient_' if method_arg_options[:gradient]
+              round = 'round_' if method_arg_options[:round]
+              gc_instance_method_name_prefix = !['polyline', 'point', 'image', 'focus'].include?(keyword) && (method_arg_options[:fill] || method_arg_options[:gradient]) ? 'fill_' : 'draw_'
+              flyweight_method_names[[keyword, method_arg_options]] = "#{gc_instance_method_name_prefix}#{gradient}#{round}#{keyword}"
+            end
+            flyweight_method_names[[keyword, method_arg_options]]
+          end
+          
+          def flyweight_method_names
+            @flyweight_method_names ||= {}
           end
         end
         
@@ -91,27 +110,11 @@ module Glimmer
         end
         
         def post_add_content
-          event_handler = lambda do |event|
-            @properties['background'] = [@parent.background] if fill? && !@properties.keys.map(&:to_s).include?('background')
-            @properties['foreground'] = [@parent.foreground] if draw? && !@properties.keys.map(&:to_s).include?('foreground')
-            @properties.each do |property, args|
-              method_name = attribute_setter(property)
-              apply_property_arg_conversions(method_name, args)
-              event.gc.send(method_name, *args)
-            end
-            apply_shape_arg_conversions(@method_name, @args)
-            apply_shape_arg_defaults(@method_name, @args)
-            tolerate_shape_extra_args(@method_name, @args)
-            event.gc.send(@method_name, *@args)
-          end
-          if parent.respond_to?(:swt_display)
-            @paint_listener_proxy = @parent.on_swt_paint(&event_handler)
-          else
-            @paint_listener_proxy = @parent.on_paint_control(&event_handler)
-          end
+          setup_paint_listener
+          @content_added = true
         end
         
-        def apply_property_arg_conversions(method_name, args)
+        def apply_property_arg_conversions(method_name, property, args)
           the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
           if (args.first.is_a?(Symbol) || args.first.is_a?(String))
             if the_java_method.parameter_types.first == Color.java_class
@@ -142,6 +145,7 @@ module Glimmer
             args[0] = org.eclipse.swt.graphics.Pattern.new(*new_args)
             args[1..-1] = []
           end
+          @properties[property] = args
         end
         
         def apply_shape_arg_conversions(method_name, args)
@@ -159,6 +163,12 @@ module Glimmer
           elsif (method_name.include?('text') || method_name.include?('string')) && !@properties.keys.map(&:to_s).include?('background') && args.size == 3
             args << true
           end
+          if method_name.include?('image') && args.first.is_a?(String)
+            args[0] = ImageProxy.new(args[0])
+          end
+          if method_name.include?('image') && args.first.is_a?(ImageProxy)
+            args[0] = args[0].swt_image
+          end
         end
                 
         # Tolerates shape extra args added by user by mistake
@@ -178,11 +188,38 @@ module Glimmer
   
         def set_attribute(attribute_name, *args)
           @properties[attribute_name] = args
+          if @content_added
+            @parent.resetup_shape_paint_listeners
+            @parent.redraw
+          end
         end
   
         def get_attribute(attribute_name)
           @properties.symbolize_keys[attribute_name.to_s.to_sym]
         end
+        
+        def setup_paint_listener
+          if parent.respond_to?(:swt_display)
+            @paint_listener_proxy = @parent.on_swt_paint(&method(:paint))
+          else
+            @paint_listener_proxy = @parent.on_paint_control(&method(:paint))
+          end
+        end
+        
+        def paint(paint_event)
+          @properties['background'] = [@parent.background] if fill? && !@properties.keys.map(&:to_s).include?('background')
+          @properties['foreground'] = [@parent.foreground] if draw? && !@properties.keys.map(&:to_s).include?('foreground')
+          @properties['font'] = [@parent.font] if draw? && !@properties.keys.map(&:to_s).include?('font')
+          @properties.each do |property, args|
+            method_name = attribute_setter(property)
+            apply_property_arg_conversions(method_name, property, args)
+            paint_event.gc.send(method_name, *args)
+          end
+          apply_shape_arg_conversions(@method_name, @args)
+          apply_shape_arg_defaults(@method_name, @args)
+          tolerate_shape_extra_args(@method_name, @args)
+          paint_event.gc.send(@method_name, *@args)
+        end
     
       end
       

data/lib/glimmer/swt/display_proxy.rb

@@ -45,7 +45,7 @@ module Glimmer
       class << self
         # Returns singleton instance
         def instance(*args)
-          if @instance.nil? || @instance.swt_display.isDisposed
+          if @instance.nil? || @instance.swt_display.nil? || @instance.swt_display.isDisposed
             @instance = new(*args)
           end
           @instance

data/lib/glimmer/swt/layout_data_proxy.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

data/lib/glimmer/swt/shell_proxy.rb

@@ -46,6 +46,7 @@ module Glimmer
           @swt_widget = swt_widget
         else
           if args.first.is_a?(ShellProxy)
+            @parent_proxy = args[0]
             args[0] = args[0].swt_widget
           end
           style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
@@ -78,7 +79,7 @@ module Glimmer
       end
 
       # Centers shell within monitor it is in
-      def center
+      def center_within_display
         primary_monitor = @display.getPrimaryMonitor()
         monitor_bounds = primary_monitor.getBounds()
         shell_bounds = @swt_widget.getBounds()
@@ -101,13 +102,13 @@ module Glimmer
         else
           @opened_before = true
           @swt_widget.pack
-          center
+          center_within_display
           @swt_widget.open
         end
       end
       
       def nested?
-        !parent.nil?
+        !swt_widget&.parent.nil?
       end
 
       def hide

data/lib/glimmer/swt/widget_proxy.rb

@@ -74,12 +74,10 @@ module Glimmer
 
       DEFAULT_INITIALIZERS = {
         composite: lambda do |composite|
-          if composite.get_layout.nil?
-            layout = GridLayout.new
-            layout.marginWidth = 15
-            layout.marginHeight = 15
-            composite.layout = layout
-          end
+          composite.layout = GridLayout.new if composite.get_layout.nil?
+        end,
+        canvas: lambda do |canvas|
+          canvas.layout = nil unless canvas.get_layout.nil?
         end,
         scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
@@ -160,7 +158,7 @@ module Glimmer
           underscored_widget_name = self.class.underscored_widget_name(@swt_widget)
           parent_proxy_class = self.class.widget_proxy_class(self.class.underscored_widget_name(@swt_widget.parent))
           parent = swt_widget.parent
-          @parent_proxy = parent.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
+          @parent_proxy = parent&.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
         end
         if @swt_widget&.get_data('proxy').nil?
           @swt_widget.set_data('proxy', self)
@@ -499,26 +497,37 @@ module Glimmer
 
       # This supports widgets in and out of basic SWT
       def self.swt_widget_class_for(underscored_widget_name)
-        underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
-        swt_widget_name = underscored_widget_name.camelcase(:upper)
-        swt_widget_class = eval(swt_widget_name)
-        # TODO fix issue with not detecting DateTime because it's conflicting with the Ruby DateTime
-        unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
-          swt_widget_class = swt_widget_class_manual_entries[underscored_widget_name]
-          if swt_widget_class.nil?
-            Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
-            return nil
+        # TODO clear memoization for a keyword if a custom widget was defined with that keyword
+        unless flyweight_swt_widget_classes.keys.include?(underscored_widget_name)
+          begin
+            underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
+            swt_widget_name = underscored_widget_name.camelcase(:upper)
+            swt_widget_class = eval(swt_widget_name)
+            # TODO fix issue with not detecting DateTime because it's conflicting with the Ruby DateTime
+            unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
+              swt_widget_class = swt_widget_class_manual_entries[underscored_widget_name]
+              if swt_widget_class.nil?
+                Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
+                return nil
+              end
+            end
+            flyweight_swt_widget_classes[underscored_widget_name] = swt_widget_class
+          rescue SyntaxError, NameError => e
+            Glimmer::Config.logger.debug {e.full_message}
+            # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+            nil
+          rescue => e
+            Glimmer::Config.logger.debug {e.full_message}
+            # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+            nil
           end
         end
-        swt_widget_class
-      rescue SyntaxError, NameError => e
-        Glimmer::Config.logger.debug {e.full_message}
-        # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
-        nil
-      rescue => e
-        Glimmer::Config.logger.debug {e.full_message}
-        # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
-        nil
+        flyweight_swt_widget_classes[underscored_widget_name]
+      end
+      
+      # Flyweight Design Pattern memoization cache. Can be cleared if memory is needed.
+      def self.flyweight_swt_widget_classes
+        @flyweight_swt_widget_classes ||= {}
       end
 
       def async_exec(&block)