glimmer-dsl-swt 4.18.4.10 → 4.18.5.3

data/lib/glimmer/swt/tree_proxy.rb

@@ -42,7 +42,8 @@ module Glimmer
       # Returns a Java TreeItem array to easily set as selection on org.eclipse.swt.Tree if needed
       def depth_first_search(&condition)
         found = []
-        recursive_depth_first_search(swt_widget.getItems.first, found, &condition)
+        first_item = DisplayProxy.instance.auto_exec { swt_widget.getItems.first }
+        recursive_depth_first_search(first_item, found, &condition)
         found.to_java(TreeItem)
       end
       
@@ -51,18 +52,6 @@ module Glimmer
         depth_first_search
       end
 
-      def widget_property_listener_installers
-        super.merge({
-          Java::OrgEclipseSwtWidgets::Tree => {
-            selection: lambda do |observer|
-              on_widget_selected { |selection_event|
-                observer.call(@swt_widget.getSelection)
-              }
-            end
-          },
-        })
-      end
-      
       def edit_in_progress?
         !!@edit_in_progress
       end
@@ -127,8 +116,10 @@ module Glimmer
 
       def recursive_depth_first_search(tree_item, found, &condition)
         return if tree_item.nil?
-        found << tree_item if condition.nil? || condition.call(tree_item)
-        tree_item.getItems.each do |child_tree_item|
+        found << tree_item if condition.nil? || DisplayProxy.instance.auto_exec {condition.call(tree_item)}
+#         return if found.any? && !has_style?(:multi) # TODO inspect if this is a good optimization when needed
+        tree_items = DisplayProxy.instance.auto_exec {tree_item.getItems}
+        tree_items.each do |child_tree_item|
           recursive_depth_first_search(child_tree_item, found, &condition)
         end
       end
@@ -136,7 +127,11 @@ module Glimmer
       def property_type_converters
         super.merge({
           selection: lambda do |value|
-            depth_first_search {|ti| ti.getData == value}
+            if value.is_a?(Array)
+              depth_first_search {|ti| value.include?(ti.getData) }
+            else
+              depth_first_search {|ti| ti.getData == value}
+            end
           end,
         })
       end

data/lib/glimmer/swt/widget_listener_proxy.rb

@@ -53,9 +53,13 @@ module Glimmer
             @swt_display.removeListener(@event_type, @swt_listener)
           end
         elsif @event_type
-          @swt_widget.removeListener(@event_type, @swt_listener)
+          DisplayProxy.instance.auto_exec do
+            @swt_widget.removeListener(@event_type, @swt_listener)
+          end
         else
-          @swt_widget.send(widget_remove_listener_method, @swt_listener)
+          DisplayProxy.instance.auto_exec do
+            @swt_widget.send(widget_remove_listener_method, @swt_listener)
+          end
         end
       end
       alias unregister deregister # TODO consider dropping unregister (and in Observer too)

data/lib/glimmer/swt/widget_proxy.rb

@@ -26,7 +26,7 @@ require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/dnd_proxy'
 require 'glimmer/swt/image_proxy'
-require 'glimmer/swt/properties'
+require 'glimmer/swt/proxy_properties'
 require 'glimmer/swt/custom/drawable'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
@@ -44,13 +44,13 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
-      include Properties
+      include ProxyProperties
       include Custom::Drawable
 
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
         'button'              => [:push],
-        'canvas'              => [:double_buffered],
+        'canvas'              => ([:double_buffered] unless OS.mac?),
         'checkbox'            => [:check],
         'check'               => [:check],
         'drag_source'         => [:drop_copy],
@@ -112,13 +112,15 @@ module Glimmer
         # Instantiates the right WidgetProxy subclass for passed in keyword
         # Args are: keyword, parent, swt_widget_args (including styles)
         def create(*init_args, swt_widget: nil)
-          return swt_widget.get_data('proxy') if swt_widget&.get_data('proxy')
-          keyword, parent, args = init_args
-          selected_widget_proxy_class = widget_proxy_class(keyword || underscored_widget_name(swt_widget))
-          if init_args.empty?
-            selected_widget_proxy_class.new(swt_widget: swt_widget)
-          else
-            selected_widget_proxy_class.new(*init_args)
+          DisplayProxy.instance.auto_exec do
+            return swt_widget.get_data('proxy') if swt_widget&.get_data('proxy')
+            keyword, parent, args = init_args
+            selected_widget_proxy_class = widget_proxy_class(keyword || underscored_widget_name(swt_widget))
+            if init_args.empty?
+              selected_widget_proxy_class.new(swt_widget: swt_widget)
+            else
+              selected_widget_proxy_class.new(*init_args)
+            end
           end
         end
         
@@ -149,31 +151,33 @@ module Glimmer
       #
       # Styles is a comma separate list of symbols representing SWT styles in lower case
       def initialize(*init_args, swt_widget: nil)
-        @image_double_buffered = !!(init_args&.last&.include?(:image_double_buffered) && init_args&.last&.delete(:image_double_buffered))
-        if swt_widget.nil?
-          underscored_widget_name, parent, args = init_args
-          @parent_proxy = parent
-          styles, extra_options = extract_args(underscored_widget_name, args)
-          swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
-          @swt_widget = swt_widget_class.new(@parent_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
-        else
-          @swt_widget = swt_widget
-          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)
-        end
-        if @swt_widget&.get_data('proxy').nil?
-          @swt_widget.set_data('proxy', self)
-          DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
-          @parent_proxy.post_initialize_child(self)
-        end
-        @keyword = underscored_widget_name.to_s
-        if respond_to?(:on_widget_disposed)
-          on_widget_disposed {
-            clear_shapes
-            deregister_shape_painting
-          }
+        auto_exec do
+          @image_double_buffered = !!(init_args&.last&.include?(:image_double_buffered) && init_args&.last&.delete(:image_double_buffered))
+          if swt_widget.nil?
+            underscored_widget_name, parent, args = init_args
+            @parent_proxy = parent
+            styles, extra_options = extract_args(underscored_widget_name, args)
+            swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
+            @swt_widget = swt_widget_class.new(@parent_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
+          else
+            @swt_widget = swt_widget
+            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)
+          end
+          if @swt_widget&.get_data('proxy').nil?
+            @swt_widget.set_data('proxy', self)
+            DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
+            @parent_proxy.post_initialize_child(self)
+          end
+          @keyword = underscored_widget_name.to_s
+          if respond_to?(:on_widget_disposed)
+            on_widget_disposed {
+              clear_shapes
+              deregister_shape_painting
+            }
+          end
         end
       end
       
@@ -219,81 +223,93 @@ module Glimmer
           [args, extra_options]
         end
       end
-
-      def has_attribute_getter?(attribute_getter_name, *args)
-        attribute_getter_name = attribute_getter_name.to_s.underscore
-        return false unless !attribute_getter_name.end_with?('=') && !attribute_getter_name.start_with?('set_')
-        args.empty? && swt_widget.respond_to?(attribute_getter_name)
-      end
       
-      def has_attribute_setter?(attribute_setter_name, *args)
-        attribute_setter_name = attribute_setter_name.to_s
-        underscored_attribute_setter_name = attribute_setter_name.underscore
-        return false unless attribute_setter_name.end_with?('=') || (attribute_setter_name.start_with?('set_') && !args.empty?)
-        attribute_name = underscored_attribute_setter_name.sub(/^set_/, '').sub(/=$/, '')
-        has_attribute?(attribute_name, *args)
+      def proxy_source_object
+        @swt_widget
       end
-      
+
       def has_attribute?(attribute_name, *args)
         # TODO test that attribute getter responds too
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
-        if widget_custom_attribute
-          @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
-        else
-          @swt_widget.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
+        auto_exec do
+          if widget_custom_attribute
+            @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
+          else
+            super
+          end
         end
       end
 
       def set_attribute(attribute_name, *args)
         # TODO Think about widget subclasses overriding set_attribute to add more attributes vs adding as Ruby attributes directly
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
-        apply_property_type_converters(normalized_attribute(attribute_name), args)
-        if widget_custom_attribute
-          widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
-        elsif @swt_widget.respond_to?(attribute_setter(attribute_name))
-          @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
-        elsif @swt_widget.respond_to?(ruby_attribute_setter(attribute_name))
-          @swt_widget.send(ruby_attribute_setter(attribute_name), args)
-        else
-          send(ruby_attribute_setter(attribute_name), args)
+        auto_exec do
+          apply_property_type_converters(normalized_attribute(attribute_name), args)
         end
+        swt_widget_operation = false
+        result = nil
+        auto_exec do
+          result = if widget_custom_attribute
+            swt_widget_operation = true
+            widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
+          end
+        end
+        result = super unless swt_widget_operation
+        result
       end
 
       def get_attribute(attribute_name)
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
-        if widget_custom_attribute
-          if widget_custom_attribute[:getter][:invoker]
-            widget_custom_attribute[:getter][:invoker].call(@swt_widget, [])
-          else
-            @swt_widget.send(widget_custom_attribute[:getter][:name])
+        swt_widget_operation = false
+        result = nil
+        auto_exec do
+          result = if widget_custom_attribute
+            swt_widget_operation = true
+            if widget_custom_attribute[:getter][:invoker]
+              widget_custom_attribute[:getter][:invoker].call(@swt_widget, [])
+            else
+              @swt_widget.send(widget_custom_attribute[:getter][:name])
+            end
           end
-        elsif @swt_widget.respond_to?(attribute_getter(attribute_name))
-          @swt_widget.send(attribute_getter(attribute_name))
-        elsif @swt_widget.respond_to?(ruby_attribute_getter(attribute_name))
-          @swt_widget.send(ruby_attribute_getter(attribute_name))
-        elsif @swt_widget.respond_to?(attribute_name)
-          @swt_widget.send(attribute_name)
-        elsif respond_to?(ruby_attribute_getter(attribute_name))
-          send(ruby_attribute_getter(attribute_name))
-        else
-          send(attribute_name)
         end
+        result = super unless swt_widget_operation
+        result
       end
 
       def pack_same_size
-        bounds = @swt_widget.getBounds
-        listener = on_control_resized {
-          @swt_widget.setSize(bounds.width, bounds.height)
-          @swt_widget.setLocation(bounds.x, bounds.y)
-        }
-        if @swt_widget.is_a?(Composite)
-          @swt_widget.layout(true, true)
-        else
-          @swt_widget.pack(true)
+        auto_exec do
+          bounds = @swt_widget.getBounds
+          listener = on_control_resized {
+            @swt_widget.setSize(bounds.width, bounds.height)
+            @swt_widget.setLocation(bounds.x, bounds.y)
+          }
+          if @swt_widget.is_a?(Composite)
+            @swt_widget.layout(true, true)
+          else
+            @swt_widget.pack(true)
+          end
+          @swt_widget.removeControlListener(listener.swt_listener)
         end
-        @swt_widget.removeControlListener(listener.swt_listener)
+      end
+      
+      def x
+        bounds.x
+      end
+
+      def y
+        bounds.y
+      end
+      
+      def width
+        bounds.width
+      end
+
+      def height
+        bounds.height
       end
 
+      # these work in tandem with the property_type_converters
+      # sometimes, they are specified in subclasses instead
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
           Java::OrgEclipseSwtWidgets::Control => {
@@ -334,6 +350,17 @@ module Glimmer
               }
             end,
           },
+          Java::OrgEclipseSwtWidgets::Tree => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                if has_style?(:multi)
+                  observer.call(@swt_widget.getSelection.map(&:get_data))
+                else
+                  observer.call(@swt_widget.getSelection.first&.get_data)
+                end
+              }
+            end,
+          },
           Java::OrgEclipseSwtWidgets::Text => {
             :text => lambda do |observer|
               on_modify_text { |modify_event|
@@ -546,25 +573,37 @@ module Glimmer
         @flyweight_swt_widget_classes ||= {}
       end
 
+      # delegates to DisplayProxy
       def async_exec(&block)
         DisplayProxy.instance.async_exec(&block)
       end
 
+      # delegates to DisplayProxy
       def sync_exec(&block)
         DisplayProxy.instance.sync_exec(&block)
       end
 
+      # delegates to DisplayProxy
       def timer_exec(delay_in_millis, &block)
         DisplayProxy.instance.timer_exec(delay_in_millis, &block)
       end
 
+      # delegates to DisplayProxy
+      def auto_exec(override_sync_exec: nil, override_async_exec: nil, &block)
+        DisplayProxy.instance.auto_exec(override_sync_exec: override_sync_exec, override_async_exec: override_async_exec, &block)
+      end
+
       def has_style?(style)
         comparison = interpret_style(style)
-        (@swt_widget.style & comparison) == comparison
+        auto_exec do
+          (@swt_widget.style & comparison) == comparison
+        end
       end
 
       def dispose
-        @swt_widget.dispose
+        auto_exec do
+          @swt_widget.dispose
+        end
       end
 
       def disposed?
@@ -574,15 +613,19 @@ module Glimmer
       # TODO Consider renaming these methods as they are mainly used for data-binding
 
       def can_add_observer?(property_name)
-        @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact.map(&:keys).flatten.map(&:to_s).include?(property_name.to_s)
+        auto_exec do
+          @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact.map(&:keys).flatten.map(&:to_s).include?(property_name.to_s)
+        end
       end
 
       # Used for data-binding only. Consider renaming or improving to avoid the confusion it causes
       def add_observer(observer, property_name)
         if !observer.respond_to?(:binding_options) || !observer.binding_options[:read_only]
-          property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
-          widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
-          widget_listener_installers.to_a.first&.call(observer)
+          auto_exec do
+            property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
+            widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
+            widget_listener_installers.to_a.first&.call(observer)
+          end
         end
       end
 
@@ -619,13 +662,15 @@ module Glimmer
       end
       
       def can_handle_drag_observation_request?(observation_request)
-        return false unless swt_widget.is_a?(Control)
-        potential_drag_source = @drag_source_proxy.nil?
-        ensure_drag_source_proxy
-        @drag_source_proxy.can_handle_observation_request?(observation_request).tap do |result|
-          if potential_drag_source && !result
-            @drag_source_proxy.swt_widget.dispose
-            @drag_source_proxy = nil
+        auto_exec do
+          return false unless swt_widget.is_a?(Control)
+          potential_drag_source = @drag_source_proxy.nil?
+          ensure_drag_source_proxy
+          @drag_source_proxy.can_handle_observation_request?(observation_request).tap do |result|
+            if potential_drag_source && !result
+              @drag_source_proxy.swt_widget.dispose
+              @drag_source_proxy = nil
+            end
           end
         end
       rescue => e
@@ -634,13 +679,15 @@ module Glimmer
       end
 
       def can_handle_drop_observation_request?(observation_request)
-        return false unless swt_widget.is_a?(Control)
-        potential_drop_target = @drop_target_proxy.nil?
-        ensure_drop_target_proxy
-        @drop_target_proxy.can_handle_observation_request?(observation_request).tap do |result|
-          if potential_drop_target && !result
-            @drop_target_proxy.swt_widget.dispose
-            @drop_target_proxy = nil
+        auto_exec do
+          return false unless swt_widget.is_a?(Control)
+          potential_drop_target = @drop_target_proxy.nil?
+          ensure_drop_target_proxy
+          @drop_target_proxy.can_handle_observation_request?(observation_request).tap do |result|
+            if potential_drop_target && !result
+              @drop_target_proxy.swt_widget.dispose
+              @drop_target_proxy = nil
+            end
           end
         end
       end
@@ -664,30 +711,26 @@ module Glimmer
       end
 
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::WidgetExpression.new, &block)
+        auto_exec do
+          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::WidgetExpression.new, &block)
+        end
       end
 
       def method_missing(method, *args, &block)
+        # TODO push most of this logic down to Properties (and perhaps create Listeners module as well)
         if can_handle_observation_request?(method)
           handle_observation_request(method, &block)
-        elsif has_attribute_setter?(method, *args)
-          set_attribute(method, *args)
-        elsif has_attribute_getter?(method, *args)
-          get_attribute(method, *args)
         else
-          swt_widget.send(method, *args, &block)
+          super
         end
-      rescue => e
-        Glimmer::Config.logger.debug { "Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}" }
-        Glimmer::Config.logger.debug { e.full_message }
-        super
-        # TODO consider get_attribute too
       end
       
       def respond_to?(method, *args, &block)
-        super ||
-          can_handle_observation_request?(method) ||
-          swt_widget.respond_to?(method, *args, &block)
+        result = super
+        return true if result
+        auto_exec do
+          can_handle_observation_request?(method)
+        end
       end
       
       private
@@ -713,22 +756,26 @@ module Glimmer
       # add_listener knowing it will be called for sure afterwards
 
       def can_add_listener?(underscored_listener_name)
-        !self.class.find_listener(@swt_widget.getClass, underscored_listener_name).empty?
+        auto_exec do
+          !self.class.find_listener(@swt_widget.getClass, underscored_listener_name).empty?
+        end
       end
 
       def add_listener(underscored_listener_name, &block)
-        widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)
-        widget_listener_proxy = nil
-        safe_block = lambda do |*args|
-          begin
-            block.call(*args) unless @swt_widget.isDisposed
-          rescue => e
-            Glimmer::Config.logger.error {e}
+        auto_exec do
+          widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)
+          widget_listener_proxy = nil
+          safe_block = lambda do |*args|
+            begin
+              block.call(*args) unless @swt_widget.isDisposed
+            rescue => e
+              Glimmer::Config.logger.error {e}
+            end
           end
+          listener = listener_class.new(listener_method => safe_block)
+          @swt_widget.send(widget_add_listener_method, listener)
+          WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
         end
-        listener = listener_class.new(listener_method => safe_block)
-        @swt_widget.send(widget_add_listener_method, listener)
-        WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
       end
 
       # Looks through SWT class add***Listener methods till it finds one for which
@@ -778,11 +825,13 @@ module Glimmer
       end
 
       def add_swt_event_listener(swt_constant, &block)
-        event_type = SWTProxy[swt_constant]
-        widget_listener_proxy = nil
-        safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
-        @swt_widget.addListener(event_type, &safe_block)
-        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
+        auto_exec do
+          event_type = SWTProxy[swt_constant]
+          widget_listener_proxy = nil
+          safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
+          @swt_widget.addListener(event_type, &safe_block)
+          widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
+        end
       end
 
       def widget_custom_attribute_mapping
@@ -867,6 +916,8 @@ module Glimmer
         color_converter = lambda do |value|
           if value.is_a?(Symbol) || value.is_a?(String)
             ColorProxy.new(value).swt_color
+          elsif value.is_a?(RGB)
+            ColorProxy.new(value.red, value.green, value.blue).swt_color
           else
             value
           end
@@ -905,7 +956,7 @@ module Glimmer
                 while last_image_number != image_number
                   last_image_number = image_number
                   sync_exec {
-                    redraw
+                    redraw unless disposed?
                   }
                   delayTime = loader.data[image_number].delayTime.to_f / 100.0
                   sleep(delayTime)
@@ -936,7 +987,7 @@ module Glimmer
           foreground: color_converter,
           link_foreground: color_converter,
           font: lambda do |value|
-            if value.is_a?(Hash)
+            if value.is_a?(Hash) || value.is_a?(FontData)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
             else
@@ -954,6 +1005,10 @@ module Glimmer
           items: lambda do |value|
             value.to_java :string
           end,
+          selection: lambda do |value|
+            value = value.to_f if swt_widget.is_a?(Spinner)
+            value
+          end,
           text: lambda do |value|
             value.to_s
           end,