glimmer-dsl-swt 4.18.2.4 → 4.18.3.3

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/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 optimization 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

@@ -24,6 +24,7 @@ require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
+require 'glimmer/swt/transform_proxy'
 
 module Glimmer
   module SWT
@@ -43,7 +44,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)
@@ -53,11 +64,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
         
@@ -92,27 +111,12 @@ 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)
+          args = args.dup
           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
@@ -131,6 +135,9 @@ module Glimmer
           if args.first.is_a?(FontProxy)
             args[0] = args[0].swt_font
           end
+          if args.first.is_a?(TransformProxy)
+            args[0] = args[0].swt_transform
+          end
           if ['setBackgroundPattern', 'setForegroundPattern'].include?(method_name.to_s)
             args.each_with_index do |arg, i|
               if arg.is_a?(Symbol) || arg.is_a?(String)
@@ -143,6 +150,7 @@ module Glimmer
             args[0] = org.eclipse.swt.graphics.Pattern.new(*new_args)
             args[1..-1] = []
           end
+          args
         end
         
         def apply_shape_arg_conversions(method_name, args)
@@ -185,11 +193,43 @@ module Glimmer
   
         def set_attribute(attribute_name, *args)
           @properties[attribute_name] = args
+          if @content_added && !@parent.is_disposed
+            @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
+          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_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.each do |property, args|
+            method_name = attribute_setter(property)
+            converted_args = apply_property_arg_conversions(method_name, property, args)
+            paint_event.gc.send(method_name, *converted_args)
+            if property == 'transform' && args.first.is_a?(TransformProxy)
+              args.first.swt_transform.dispose
+            end
+          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/directory_dialog_proxy.rb

@@ -47,13 +47,13 @@ module Glimmer
             style_arg_last_index = args.index(style_args.last)
             args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
           end
+          if args.first.respond_to?(:swt_widget) && args.first.swt_widget.is_a?(Shell)
+            args[0] = args[0].swt_widget
+          end
           if !args.first.is_a?(Shell)
             current_shell = DisplayProxy.instance.swt_display.shells.first
             args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
           end
-          if args.first.is_a?(ShellProxy)
-            args[0] = args[0].swt_widget
-          end
           parent = args[0]
           @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
           @swt_widget = DirectoryDialog.new(*args)

data/lib/glimmer/swt/display_proxy.rb

@@ -39,8 +39,20 @@ module Glimmer
       include_package 'org.eclipse.swt.widgets'
       
       include Custom::Drawable
-
-      OBSERVED_MENU_ITEMS = ['about', 'preferences']
+      
+      OBSERVED_MENU_ITEMS = ['about', 'preferences', 'quit']
+      
+      class FilterListener
+        include org.eclipse.swt.widgets.Listener
+        
+        def initialize(&listener_block)
+          @listener_block = listener_block
+        end
+        
+        def handleEvent(event)
+          @listener_block.call(event)
+        end
+      end
 
       class << self
         # Returns singleton instance
@@ -111,7 +123,7 @@ module Glimmer
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
-          add_swt_event_listener(constant_name, &block)
+          add_swt_event_filter(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
           if OBSERVED_MENU_ITEMS.include?(event_name)
@@ -124,10 +136,19 @@ module Glimmer
         end
       end
 
-      def add_swt_event_listener(swt_constant, &block)
+      def add_swt_event_filter(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_display.addFilter(event_type, &block)
+        @swt_display.addFilter(event_type, FilterListener.new(&block))
         #WidgetListenerProxy.new(@swt_display.getListeners(event_type).last)
+        WidgetListenerProxy.new(
+          swt_display: @swt_display,
+          event_type: event_type,
+          filter: true,
+          swt_listener: block,
+          widget_add_listener_method: 'addFilter',
+          swt_listener_class:  FilterListener,
+          swt_listener_method: 'handleEvent'
+        )
       end
     end
   end

data/lib/glimmer/swt/file_dialog_proxy.rb

@@ -48,13 +48,13 @@ module Glimmer
             style_arg_last_index = args.index(style_args.last)
             args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
           end
+          if args.first.respond_to?(:swt_widget) && args.first.swt_widget.is_a?(Shell)
+            args[0] = args[0].swt_widget
+          end
           if !args.first.is_a?(Shell)
             current_shell = DisplayProxy.instance.swt_display.shells.first
             args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
           end
-          if args.first.is_a?(ShellProxy)
-            args[0] = args[0].swt_widget
-          end
           parent = args[0]
           @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
           @swt_widget = FileDialog.new(*args)

data/lib/glimmer/swt/shell_proxy.rb

@@ -45,11 +45,17 @@ module Glimmer
         if swt_widget
           @swt_widget = swt_widget
         else
-          if args.first.is_a?(ShellProxy)
+          if args.first.respond_to?(:swt_widget) && args.first.swt_widget.is_a?(Shell)
             @parent_proxy = args[0]
             args[0] = args[0].swt_widget
           end
-          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}.map(&:to_sym)
+          fill_screen = nil
+          if style_args.include?(:fill_screen)
+            args.delete(:fill_screen)
+            style_args.delete(:fill_screen)
+            fill_screen = true
+          end
           if style_args.any?
             style_arg_start_index = args.index(style_args.first)
             style_arg_last_index = args.index(style_args.last)
@@ -67,6 +73,7 @@ module Glimmer
           # TODO make this an option not the default
           shell_swt_display = Glimmer::SWT::DisplayProxy.instance.swt_display
           on_swt_show do
+            @swt_widget.set_size(@display.bounds.width, @display.bounds.height) if fill_screen
             Thread.new do
               sleep(0.25)
               shell_swt_display.async_exec do
@@ -108,16 +115,29 @@ module Glimmer
       end
       
       def nested?
-        !parent.nil?
+        !swt_widget&.parent.nil?
+      end
+      alias nested nested?
+      
+      def disposed?
+        swt_widget.isDisposed
       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?
         @swt_widget.isDisposed ? false : @swt_widget.isVisible
       end
+      alias visible visible?
 
       # Setting to true opens/shows shell. Setting to false hides the shell.
       def visible=(visibility)

data/lib/glimmer/swt/table_proxy.rb

@@ -265,10 +265,18 @@ module Glimmer
         end
       end
 
+      def items
+        swt_widget.get_items
+      end
+
       def model_binding
         swt_widget.data
       end
       
+      def table_items_binding
+        swt_widget.get_data('table_items_binding')
+      end
+      
       def sort_block=(comparator)
         @sort_block = comparator
       end
@@ -353,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
@@ -379,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)
@@ -445,7 +458,6 @@ module Glimmer
       end
             
       def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
-        require 'facets/hash/symbolize_keys'
         return if table_item.nil?
         model = table_item.data
         property = column_properties[column_index]
@@ -467,7 +479,11 @@ module Glimmer
           @cancel_in_progress = true
           @table_editor_widget_proxy&.swt_widget&.dispose
           @table_editor_widget_proxy = nil
-          after_cancel&.call
+          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
@@ -484,14 +500,22 @@ module Glimmer
             if new_value == model.send(model_editing_property)
               @cancel_edit.call
             else
-              before_write&.call
+              if before_write&.arity == 0
+                before_write&.call
+              else
+                before_write&.call(edited_table_item)
+              end
               model.send("#{model_editing_property}=", new_value) # makes table update itself, so must search for selected table item again
               # Table refresh happens here because of model update triggering observers, so must retrieve table item again
               edited_table_item = search { |ti| ti.getData == model }.first
               swt_widget.showItem(edited_table_item)
               @table_editor_widget_proxy&.swt_widget&.dispose
               @table_editor_widget_proxy = nil
-              after_write&.call(edited_table_item)
+              if after_write&.arity == 0
+                after_write&.call
+              else
+                after_write&.call(edited_table_item)
+              end
               @edit_in_progress = false
             end
           end