glimmer-dsl-swt 4.18.3.2 → 4.18.4.1

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

@@ -29,17 +29,15 @@ module Glimmer
         end
         
         def clear_shapes
-          shapes.dup.each do |shape|
-            shape.paint_listener_proxy&.unregister
-            shapes.delete(shape)
-          end
+          shapes.dup.each(&:dispose)
         end
         
-        def resetup_shape_paint_listeners
+        def resetup_shape_painting
           # TODO consider performance optimization relating to order of shape rendering (affecting only further shapes not previous ones)
+          reset_gc if respond_to?(:reset_gc)
           shapes.each do |shape|
             shape.paint_listener_proxy&.unregister
-            shape.setup_paint_listener
+            shape.setup_painting
           end
         end
       end

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

@@ -30,7 +30,6 @@ module Glimmer
   module SWT
     module Custom
       # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
-      # 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
@@ -78,9 +77,21 @@ module Glimmer
           def flyweight_method_names
             @flyweight_method_names ||= {}
           end
+          
+          def pattern(*args)
+            found_pattern = flyweigh_patterns[args]
+            if found_pattern.nil? || found_pattern.is_disposed
+              found_pattern = flyweigh_patterns[args] = org.eclipse.swt.graphics.Pattern.new(*args)
+            end
+            found_pattern
+          end
+          
+          def flyweigh_patterns
+            @flyweigh_patterns ||= {}
+          end
         end
         
-        attr_reader :parent, :name, :args, :options, :swt_widget, :paint_listener_proxy
+        attr_reader :parent, :name, :args, :options, :paint_listener_proxy
         
         def initialize(parent, keyword, *args, &property_block)
           @parent = parent
@@ -88,7 +99,6 @@ module Glimmer
           @method_name = self.class.method_name(keyword, args)
           @options = self.class.arg_options(args, extract: true)
           @args = args
-          @swt_widget = parent.respond_to?(:swt_display) ? parent.swt_display : parent.swt_widget
           @properties = {}
           @parent.shapes << self
           post_add_content if property_block.nil?
@@ -110,8 +120,17 @@ module Glimmer
           @options[:round]
         end
         
+        def has_some_background?
+          @properties.keys.map(&:to_s).include?('background') || @properties.keys.map(&:to_s).include?('background_pattern')
+        end
+        
+        def has_some_foreground?
+          @properties.keys.map(&:to_s).include?('foreground') || @properties.keys.map(&:to_s).include?('foreground_pattern')
+        end
+        
         def post_add_content
-          setup_paint_listener
+          amend_method_name_options_based_on_properties
+          setup_painting
           @content_added = true
         end
         
@@ -147,7 +166,7 @@ module Glimmer
               end
             end
             new_args = [DisplayProxy.instance.swt_display] + args
-            args[0] = org.eclipse.swt.graphics.Pattern.new(*new_args)
+            args[0] = pattern(*new_args, type: method_name.to_s.match(/set(.+)Pattern/)[1])
             args[1..-1] = []
           end
           args
@@ -172,7 +191,7 @@ module Glimmer
             args[0] = ImageProxy.new(args[0])
           end
           if method_name.include?('image') && args.first.is_a?(ImageProxy)
-            args[0] = args[0].swt_image
+            @image = args[0] = args[0].swt_image
           end
         end
                 
@@ -186,6 +205,21 @@ module Glimmer
             args[the_java_method_arg_count..-1] = []
           end
         end
+        
+        def amend_method_name_options_based_on_properties
+          if has_some_background? && !has_some_foreground?
+            @options[:fill] = true
+          elsif !has_some_background? && has_some_foreground?
+            @options[:fill] = false
+          elsif @name == 'rectangle' && has_some_background? && has_some_foreground?
+            @options[:fill] = true
+            @options[:gradient] = true
+          end
+          if @name == 'rectangle' && @args.size > 4 && @args.last.is_a?(Numeric)
+            @options[:round] = true
+          end
+          @method_name = self.class.method_name(@name, @args + [@options])
+        end
                 
         def has_attribute?(attribute_name, *args)
           self.class.gc_instance_methods.include?(attribute_setter(attribute_name))
@@ -194,7 +228,7 @@ module Glimmer
         def set_attribute(attribute_name, *args)
           @properties[attribute_name] = args
           if @content_added && !@parent.is_disposed
-            @parent.resetup_shape_paint_listeners
+            @parent.resetup_shape_painting
             @parent.redraw
           end
         end
@@ -203,20 +237,43 @@ module Glimmer
           @properties.symbolize_keys[attribute_name.to_s.to_sym]
         end
         
-        def setup_paint_listener
+        def pattern(*args, type: nil)
+          instance_variable_name = "@#{type}_pattern"
+          the_pattern = instance_variable_get(instance_variable_name)
+          if the_pattern.nil?
+            the_pattern = self.class.pattern(*args)
+          end
+          the_pattern
+        end
+        
+        def dispose
+          paint_listener_proxy&.unregister
+          @background_pattern&.dispose
+          @background_pattern = nil
+          @foreground_pattern&.dispose
+          @foreground_pattern = nil
+          @image&.dispose
+          @image = nil
+          @parent.shapes.delete(self)
+        end
+        
+        def setup_painting
+          # TODO consider moving this method to parent (making the logic polymorphic)
           return if @parent.is_disposed
           if parent.respond_to?(:swt_display)
             @paint_listener_proxy = @parent.on_swt_paint(&method(:paint))
+          elsif parent.respond_to?(:swt_image)
+            paint(parent) # treat parent as paint event since you don't do repaints with images, it's a one time deal.
           elsif parent.respond_to?(:swt_widget)
             @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['transform'] = [nil] if !@properties.keys.map(&:to_s).include?('transform')
+          @properties['background'] = [@parent.background] if fill? && !has_some_background?
+          @properties['foreground'] = [@parent.foreground] if @parent.respond_to?(:foreground) && draw? && !has_some_foreground?
+          @properties['font'] = [@parent.font] if @parent.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
+          @properties['transform'] = [nil] if @parent.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)

data/lib/glimmer/swt/date_time_proxy.rb

@@ -43,9 +43,7 @@ module Glimmer
       end
       
       def date=(date_value)
-        self.year = date_value.year
-        self.month = date_value.month
-        self.day = date_value.day
+        swt_widget.setDate(date_value.year, date_value.month - 1, date_value.day)
       end
       
       def time

data/lib/glimmer/swt/display_proxy.rb

@@ -40,7 +40,7 @@ module Glimmer
       
       include Custom::Drawable
       
-      OBSERVED_MENU_ITEMS = ['about', 'preferences']
+      OBSERVED_MENU_ITEMS = ['about', 'preferences', 'quit']
       
       class FilterListener
         include org.eclipse.swt.widgets.Listener
@@ -71,6 +71,9 @@ module Glimmer
         Display.app_name ||= 'Glimmer'
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
+        on_swt_Dispose {
+          clear_shapes
+        }
       end
       
       def content(&block)
@@ -88,6 +91,14 @@ module Glimmer
       def timer_exec(&block)
         @swt_display.timer_exec(&block)
       end
+      
+      def on_widget_disposed(&block)
+        on_swt_Dispose(&block)
+      end
+      
+      def disposed?
+        @swt_display.isDisposed
+      end
 
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)

data/lib/glimmer/swt/font_proxy.rb

@@ -43,6 +43,7 @@ module Glimmer
 
       attr_reader :widget_proxy, :swt_font, :font_properties
 
+
       # Builds a new font proxy from passed in widget_proxy and font_properties hash,
       #
       # It begins with existing SWT widget font and amends it with font properties.

data/lib/glimmer/swt/image_proxy.rb

@@ -19,6 +19,9 @@
 # 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/swt/custom/drawable'
+require 'glimmer/swt/properties'
+
 module Glimmer
   module SWT
     # Proxy for org.eclipse.swt.graphics.Image
@@ -27,6 +30,9 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ImageProxy
+      include Custom::Drawable
+      include Properties
+      
       class << self
         def create(*args)
           if args.size == 1 && args.first.is_a?(ImageProxy)
@@ -37,6 +43,7 @@ module Glimmer
         end
       end
       
+      include_package 'org.eclipse.swt.widgets'
       include_package 'org.eclipse.swt.graphics'
       
       attr_reader :file_path, :jar_file_path, :image_data, :swt_image
@@ -46,8 +53,13 @@ module Glimmer
       # Takes the same args as the SWT Image class
       # Alternatively, takes a file path string or a uri:classloader file path string (generated by JRuby when invoking `File.expand_path` inside a JAR file)
       # and returns an image object.
-      def initialize(*args)
+      def initialize(*args, &content)
         @args = args
+        @parent_proxy = nil
+        if @args.first.is_a?(WidgetProxy)
+          @parent_proxy = @args.shift
+          @parent = @parent_proxy.swt_widget
+        end
         options = @args.last.is_a?(Hash) ? @args.delete_at(-1) : {}
         options[:swt_image] = @args.first if @args.size == 1 && @args.first.is_a?(Image)
         @file_path = @args.first if @args.size == 1 && @args.first.is_a?(String)
@@ -55,6 +67,9 @@ module Glimmer
         if options&.keys&.include?(:swt_image)
           @swt_image = options[:swt_image]
           @original_image_data = @image_data = @swt_image.image_data
+        elsif args.size == 1 && args.first.is_a?(ImageProxy)
+          @swt_image = @args.first.swt_image
+          @original_image_data = @image_data = @swt_image.image_data
         elsif @file_path
           @original_image_data = @image_data = ImageData.new(input_stream || @file_path)
           @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
@@ -64,9 +79,22 @@ module Glimmer
           width = (@image_data.width.to_f / @image_data.height.to_f)*height.to_f if !height.nil? && width.nil?
           scale_to(width, height) unless width.nil? || height.nil?
         else
+          @args.prepend(DisplayProxy.instance.swt_display) unless @args.first.is_a?(Display)
           @swt_image = Image.new(*@args)
           @original_image_data = @image_data = @swt_image.image_data
         end
+        @swt_image.singleton_class.alias_method(:dispose_without_glimmer, :dispose)
+        proxy = self
+        # TODO consider adding a get_data/set_data method to conform with other SWT widgets
+        @swt_image.singleton_class.define_method(:dispose) do
+          proxy.clear_shapes
+          dispose_without_glimmer
+        end
+        post_add_content if content.nil?
+      end
+      
+      def post_add_content
+        @parent&.image = swt_image
       end
       
       def input_stream
@@ -91,6 +119,56 @@ module Glimmer
         self
       end
       
+      def gc
+        @gc ||= reset_gc
+      end
+      
+      def reset_gc
+        @gc = org.eclipse.swt.graphics.GC.new(swt_image)
+      end
+      
+      def disposed?
+        @swt_image.isDisposed
+      end
+      
+      def has_attribute?(attribute_name, *args)
+        @swt_image.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
+      end
+
+      def set_attribute(attribute_name, *args)
+        # TODO consider refactoring/unifying this code with WidgetProxy and elsewhere
+        if args.count == 1
+          if args.first.is_a?(Symbol) || args.first.is_a?(String)
+            args[0] = ColorProxy.new(args.first).swt_color
+          end
+          if args.first.is_a?(ColorProxy)
+            args[0] = args.first.swt_color
+          end
+        end
+
+        if @swt_image.respond_to?(attribute_setter(attribute_name))
+          @swt_image.send(attribute_setter(attribute_name), *args) unless @swt_image.send(attribute_getter(attribute_name)) == args.first
+        elsif @swt_image.respond_to?(ruby_attribute_setter(attribute_name))
+          @swt_image.send(ruby_attribute_setter(attribute_name), args)
+        else
+          send(ruby_attribute_setter(attribute_name), args)
+        end
+      end
+
+      def get_attribute(attribute_name)
+        if @swt_image.respond_to?(attribute_getter(attribute_name))
+          @swt_image.send(attribute_getter(attribute_name))
+        elsif @swt_image.respond_to?(ruby_attribute_getter(attribute_name))
+          @swt_image.send(ruby_attribute_getter(attribute_name))
+        elsif @swt_image.respond_to?(attribute_name)
+          @swt_image.send(attribute_name)
+        elsif respond_to?(ruby_attribute_getter(attribute_name))
+          send(ruby_attribute_getter(attribute_name))
+        else
+          send(attribute_name)
+        end
+      end
+      
       def method_missing(method, *args, &block)
         swt_image.send(method, *args, &block)
       rescue => e

data/lib/glimmer/swt/layout_proxy.rb

@@ -72,7 +72,9 @@ module Glimmer
         @swt_layout.marginRight = 0 if @swt_layout.respond_to?(:marginRight)
         @swt_layout.marginBottom = 0 if @swt_layout.respond_to?(:marginBottom)
         @swt_layout.marginLeft = 0 if @swt_layout.respond_to?(:marginLeft)
+        old_layout = @widget_proxy.swt_widget.getLayout
         @widget_proxy.swt_widget.setLayout(@swt_layout)
+        @widget_proxy.swt_widget.layout if old_layout
       end
 
       def has_attribute?(attribute_name, *args)
@@ -83,7 +85,8 @@ module Glimmer
         apply_property_type_converters(attribute_name, args)
         if args.first != @swt_layout.send(attribute_getter(attribute_name))
           @swt_layout.send(attribute_setter(attribute_name), *args)
-          @widget_proxy.swt_widget.getShell.pack
+          @widget_proxy.swt_widget.layout
+          @widget_proxy.swt_widget.getShell.layout
         end
       end
 

data/lib/glimmer/swt/shell_proxy.rb

@@ -82,6 +82,9 @@ module Glimmer
             end
           end
         end
+        on_widget_disposed {
+          clear_shapes
+        }
         @display ||= @swt_widget.getDisplay
       end
 
@@ -124,8 +127,14 @@ module Glimmer
       end
       alias disposed disposed?
 
+      # Hides shell. Automatically checks if widget is disposed to avoid crashing.
       def hide
-        @swt_widget.setVisible(false)
+        @swt_widget.setVisible(false) unless @swt_widget.isDisposed
+      end
+      
+      # Closes shell. Automatically checks if widget is disposed to avoid crashing.
+      def close
+        @swt_widget.close unless @swt_widget.isDisposed
       end
 
       def visible?

data/lib/glimmer/swt/table_proxy.rb

@@ -273,6 +273,10 @@ module Glimmer
         swt_widget.data
       end
       
+      def table_items_binding
+        swt_widget.get_data('table_items_binding')
+      end
+      
       def sort_block=(comparator)
         @sort_block = comparator
       end
@@ -357,9 +361,9 @@ module Glimmer
         @additional_sort_properties = args unless args.empty?
       end
       
-      def sort!
+      def sort!(internal_sort: false)
         return unless sort_property && (sort_type || sort_block || sort_by_block)
-        array = model_binding.evaluate_property
+        original_array = array = model_binding.evaluate_property
         array = array.sort_by(&:hash) # this ensures consistent subsequent sorting in case there are equivalent sorts to avoid an infinite loop
         # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
         if sort_block
@@ -383,7 +387,12 @@ module Glimmer
           end
         end
         sorted_array = sorted_array.reverse if sort_direction == :descending
-        model_binding.call(sorted_array)
+        if model_binding.binding_options.symbolize_keys[:read_only_sort]
+          table_items_binding.call(sorted_array, internal_sort: true) unless internal_sort
+        else
+          model_binding.call(sorted_array)
+        end
+        sorted_array
       end
       
       def editor=(args)
@@ -448,7 +457,7 @@ module Glimmer
         edit_table_item(swt_widget.getSelection.first, column_index, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
       end
             
-      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
+      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil, write_on_cancel: false)
         return if table_item.nil?
         model = table_item.data
         property = column_properties[column_index]
@@ -467,18 +476,22 @@ module Glimmer
         widget_value_property = TableProxy::editors.symbolize_keys[editor_widget][:widget_value_property]
         
         @cancel_edit = lambda do |event=nil|
-          @cancel_in_progress = true
-          @table_editor_widget_proxy&.swt_widget&.dispose
-          @table_editor_widget_proxy = nil
-          if after_cancel&.arity == 0
-            after_cancel&.call
+          if write_on_cancel
+            @finish_edit.call(event)
           else
-            after_cancel&.call(table_item)
+            @cancel_in_progress = true
+            @table_editor_widget_proxy&.swt_widget&.dispose
+            @table_editor_widget_proxy = nil
+            if after_cancel&.arity == 0
+              after_cancel&.call
+            else
+              after_cancel&.call(table_item)
+            end
+            @edit_in_progress = false
+            @cancel_in_progress = false
+            @cancel_edit = nil
+            @edit_mode = false
           end
-          @edit_in_progress = false
-          @cancel_in_progress = false
-          @cancel_edit = nil
-          @edit_mode = false
         end
         
         @finish_edit = lambda do |event=nil|