glimmer-dsl-swt 4.18.4.10 → 4.18.5.3

data/lib/glimmer/swt/expand_item_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
@@ -52,15 +52,19 @@ module Glimmer
         layout.marginWidth = 0
         layout.marginHeight = 0
         layout.spacing = 0
-        swt_widget.layout = layout        
-        @widget_proxy = SWT::WidgetProxy.new('expand_item', parent, style)
-        @swt_expand_item = @widget_proxy.swt_widget
-        @swt_expand_item.control = swt_widget        
-        @swt_expand_item.expanded = true
+        swt_widget.layout = layout
+        auto_exec do
+          @widget_proxy = SWT::WidgetProxy.new('expand_item', parent, style)
+          @swt_expand_item = @widget_proxy.swt_widget
+          @swt_expand_item.control = swt_widget
+          @swt_expand_item.expanded = true
+        end
       end
       
       def post_add_content
-        @swt_expand_item.setHeight(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]).y) unless @swt_expand_item.getHeight > 0
+        auto_exec do
+          @swt_expand_item.setHeight(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]).y) unless @swt_expand_item.getHeight > 0
+        end
       end
       
       def has_attribute?(attribute_name, *args)
@@ -88,9 +92,11 @@ module Glimmer
       end
       
       def dispose
-        swt_expand_item.setControl(nil)
-        swt_widget.dispose
-        swt_expand_item.dispose
+        auto_exec do
+          swt_expand_item.setControl(nil)
+          swt_widget.dispose
+          swt_expand_item.dispose
+        end
       end
     end
   end

data/lib/glimmer/swt/font_proxy.rb

@@ -54,13 +54,19 @@ module Glimmer
       # that is :normal, :bold, or :italic
       def initialize(widget_proxy = nil, font_properties)
         @widget_proxy = widget_proxy
-        @font_properties = font_properties
-        detect_invalid_font_property(font_properties)
-        font_properties[:style] = SWTProxy[*font_properties[:style]]
-        font_data_args = [:name, :height, :style].map do |font_property_name|
-          font_properties[font_property_name] || send(font_property_name)
+        if font_properties.is_a?(FontData)
+          font_datum = font_properties
+          @font_properties = {name: font_properties.name, height: font_properties.height, style: font_properties.style}
+        elsif font_properties.is_a?(Hash)
+          @font_properties = font_properties
+          detect_invalid_font_property(font_properties)
+          font_properties[:style] = SWTProxy[*font_properties[:style]]
+          # TODO consider supporting other properties like locale in the future
+          font_data_args = [:name, :height, :style].map do |font_property_name|
+            font_properties[font_property_name] || send(font_property_name)
+          end
+          font_datum = FontData.new(*font_data_args)
         end
-        font_datum = FontData.new(*font_data_args)
         @swt_font = Font.new(DisplayProxy.instance.swt_display, font_datum)
       end
 
@@ -79,7 +85,7 @@ module Glimmer
       private
 
       def font_datum
-        @font_datum ||= @widget_proxy ? @widget_proxy.swt_widget.getFont.getFontData[0] : FontData.new
+        @font_datum ||= DisplayProxy.instance.auto_exec { @widget_proxy ? @widget_proxy.swt_widget.getFont.getFontData[0] : FontData.new }
       end
 
       def detect_invalid_font_property(font_properties)

data/lib/glimmer/swt/image_proxy.rb

@@ -34,13 +34,24 @@ module Glimmer
       include Properties
             
       class << self
-        def create(*args)
+        include_package 'org.eclipse.swt.graphics'
+        
+        def create(*args, &content)
           if args.size == 1 && args.first.is_a?(ImageProxy)
             args.first
           else
-            new(*args)
+            new(*args, &content)
           end
         end
+        
+        def create_pixel_by_pixel(*args, &each_pixel_color)
+          image_proxy = create(*args)
+          options = args.last.is_a?(Hash) ? args.pop : {}
+          height = args[-1]
+          width = args[-2]
+          image_proxy.paint_pixel_by_pixel(width, height, &each_pixel_color)
+          image_proxy
+        end
       end
       
       include_package 'org.eclipse.swt.widgets'
@@ -88,7 +99,7 @@ module Glimmer
         # 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
-          super
+          super()
         end
         post_add_content if content.nil?
       end
@@ -121,7 +132,7 @@ module Glimmer
       end
 
       def scale_to(width, height)
-        return if @image_data.width == width && @image_data.height == height
+        return self if @image_data.width == width && @image_data.height == height
         scaled_image_data = @original_image_data.scaledTo(width, height)
         device = swt_image.device
         swt_image.dispose

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -47,15 +47,17 @@ module Glimmer
 
       # Inititalizes with owning widget proxy and layout data arguments
       def initialize(widget_proxy, args)
-        @widget_proxy = widget_proxy
-        args = SWTProxy.constantify_args(args)
-        begin
-          @swt_layout_data = swt_layout_data_class.new(*args)
-        rescue => e
-          Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
-          @swt_layout_data = args.first if args.count == 1
+        DisplayProxy.instance.auto_exec do
+          @widget_proxy = widget_proxy
+          args = SWTProxy.constantify_args(args)
+          begin
+            @swt_layout_data = swt_layout_data_class.new(*args)
+          rescue => e
+            Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+            @swt_layout_data = args.first if args.count == 1
+          end
+          @widget_proxy.swt_widget.setLayoutData(@swt_layout_data)
         end
-        @widget_proxy.swt_widget.setLayoutData(@swt_layout_data)
       end
 
       # This figures out the right SWT layout data class name
@@ -72,9 +74,11 @@ module Glimmer
       # - org.eclipse.swt.layout.GridData for org.eclipse.swt.layout.GridLayout
       #
       def swt_layout_data_class
-        parent_layout_class_name = @widget_proxy.swt_widget.getParent.getLayout.class.name
-        layout_data_class_name = parent_layout_class_name.sub(/Layout$/, 'Data')
-        eval(layout_data_class_name)
+        DisplayProxy.instance.auto_exec do
+          parent_layout_class_name = @widget_proxy.swt_widget.getParent.getLayout.class.name
+          layout_data_class_name = parent_layout_class_name.sub(/Layout$/, 'Data')
+          eval(layout_data_class_name)
+        end
       end
 
       def has_attribute?(attribute_name, *args)
@@ -82,10 +86,12 @@ module Glimmer
       end
 
       def set_attribute(attribute_name, *args)
-        args = SWTProxy.constantify_args(args)
-        if args.first != @swt_layout_data.send(attribute_getter(attribute_name))
-          @swt_layout_data.send(attribute_setter(attribute_name), *args)
-          @widget_proxy.swt_widget.getShell.pack
+        DisplayProxy.instance.auto_exec do
+          args = SWTProxy.constantify_args(args)
+          if args.first != @swt_layout_data.send(attribute_getter(attribute_name))
+            @swt_layout_data.send(attribute_setter(attribute_name), *args)
+            @widget_proxy.swt_widget.getShell.pack
+          end
         end
       end
 

data/lib/glimmer/swt/layout_proxy.rb

@@ -62,19 +62,21 @@ module Glimmer
       end
 
       def initialize(underscored_layout_name, widget_proxy, args)
-        @underscored_layout_name = underscored_layout_name
-        @widget_proxy = widget_proxy
-        args = SWTProxy.constantify_args(args)
-        @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
-        @swt_layout.marginWidth = 15 if @swt_layout.respond_to?(:marginWidth)
-        @swt_layout.marginHeight = 15 if @swt_layout.respond_to?(:marginHeight)
-        @swt_layout.marginTop = 0 if @swt_layout.respond_to?(:marginTop)
-        @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
+        DisplayProxy.instance.auto_exec do
+          @underscored_layout_name = underscored_layout_name
+          @widget_proxy = widget_proxy
+          args = SWTProxy.constantify_args(args)
+          @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
+          @swt_layout.marginWidth = 15 if @swt_layout.respond_to?(:marginWidth)
+          @swt_layout.marginHeight = 15 if @swt_layout.respond_to?(:marginHeight)
+          @swt_layout.marginTop = 0 if @swt_layout.respond_to?(:marginTop)
+          @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
       end
 
       def has_attribute?(attribute_name, *args)
@@ -82,11 +84,13 @@ module Glimmer
       end
 
       def set_attribute(attribute_name, *args)
-        apply_property_type_converters(attribute_name, args)
-        if args.first != @swt_layout.send(attribute_getter(attribute_name))
+        DisplayProxy.instance.auto_exec do
+          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.layout
           @widget_proxy.swt_widget.getShell.layout
+          end
         end
       end
 

data/lib/glimmer/swt/menu_proxy.rb

@@ -68,9 +68,9 @@ module Glimmer
         end
 
         if styles.include?(:bar)
-          parent.swt_widget.setMenuBar(swt_widget)
+          DisplayProxy.instance.auto_exec { parent.swt_widget.setMenuBar(swt_widget) }
         elsif styles.include?(:pop_up)
-          parent.swt_widget.setMenu(swt_widget)
+          DisplayProxy.instance.auto_exec { parent.swt_widget.setMenu(swt_widget) }
         end
       end
 

data/lib/glimmer/swt/message_box_proxy.rb

@@ -35,6 +35,7 @@ module Glimmer
       attr_reader :swt_widget
       
       def initialize(parent, style)
+        # TODO consider consolidating with DialogProxy if it makes sense
         if parent.nil?
           @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
         end
@@ -42,8 +43,10 @@ module Glimmer
       end
       
       def open
-        @swt_widget.open.tap do |result|
-          @temporary_parent&.dispose
+        DisplayProxy.instance.auto_exec do
+          @swt_widget.open.tap do |result|
+            @temporary_parent&.dispose
+          end
         end
       end
       
@@ -66,18 +69,29 @@ module Glimmer
       end
 
       def set_attribute(attribute_name, *args)
-        @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
+        DisplayProxy.instance.auto_exec do
+          @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
+        end
       end
 
       def get_attribute(attribute_name)
-        @swt_widget.send(attribute_getter(attribute_name))
+        DisplayProxy.instance.auto_exec do
+          @swt_widget.send(attribute_getter(attribute_name))
+        end
       end
       
       def method_missing(method, *args, &block)
-        swt_widget.send(method, *args, &block)
+        DisplayProxy.instance.auto_exec do
+          swt_widget.send(method, *args, &block)
+        end
       rescue => e
-        Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
-        super
+        begin
+          super
+        rescue Exception => inner_error
+          Glimmer::Config.logger.error {"Neither MessageBoxProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
+          Glimmer::Config.logger.error {e.full_message}
+          raise inner_error
+        end
       end
       
       def respond_to?(method, *args, &block)

data/lib/glimmer/swt/properties.rb

@@ -69,6 +69,9 @@ module Glimmer
         Glimmer::SWT::Properties.normalized_attribute(attribute_name)
       end
       alias ruby_attribute_getter normalized_attribute
+      
     end
+    
   end
+  
 end

data/lib/glimmer/swt/proxy_properties.rb

@@ -0,0 +1,145 @@
+# 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/swt/properties'
+
+module Glimmer
+  module SWT
+    # Provides a default implementation for proxy properties, that is
+    # properties that come from a proxy object source such as swt_widget
+    # having Java camelcase format
+    module ProxyProperties
+      include Properties
+      
+      # Subclasses must override to privde a proxy source if they want to take advantage of
+      # default implementation of attribute setters/getters
+      # It tries swt_widget, swt_display, swt_image, and swt_dialog by default.
+      def proxy_source_object
+        if respond_to?(:swt_widget)
+          swt_widget
+        elsif respond_to?(:swt_display)
+          swt_display
+        elsif respond_to?(:swt_image)
+          swt_image
+        elsif respond_to?(:swt_dialog)
+          swt_dialog
+        elsif respond_to?(:swt_transform)
+          swt_transform
+        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? && proxy_source_object&.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)
+      end
+
+      def has_attribute?(attribute_name, *args)
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          proxy_source_object&.respond_to?(attribute_setter(attribute_name), args) ||
+            respond_to?(ruby_attribute_setter(attribute_name), args)
+        end
+      end
+      
+      def set_attribute(attribute_name, *args)
+        swt_widget_operation = false
+        result = nil
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          result = if proxy_source_object&.respond_to?(attribute_setter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(attribute_setter(attribute_name), *args) unless proxy_source_object&.send(attribute_getter(attribute_name)) == args.first
+          elsif proxy_source_object&.respond_to?(ruby_attribute_setter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(ruby_attribute_setter(attribute_name), args)
+          end
+        end
+        unless swt_widget_operation
+          result = send(ruby_attribute_setter(attribute_name), args)
+        end
+        result
+      end
+
+      def get_attribute(attribute_name)
+        swt_widget_operation = false
+        result = nil
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          result = if proxy_source_object&.respond_to?(attribute_getter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(attribute_getter(attribute_name))
+          elsif proxy_source_object&.respond_to?(ruby_attribute_getter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(ruby_attribute_getter(attribute_name))
+          elsif proxy_source_object&.respond_to?(attribute_name)
+            swt_widget_operation = true
+            proxy_source_object&.send(attribute_name)
+          end
+        end
+        unless swt_widget_operation
+          result = if respond_to?(ruby_attribute_getter(attribute_name))
+            send(ruby_attribute_getter(attribute_name))
+          else
+            send(attribute_name)
+          end
+        end
+        result
+      end
+      
+      def method_missing(method, *args, &block)
+        if has_attribute_setter?(method, *args)
+          set_attribute(method, *args)
+        elsif has_attribute_getter?(method, *args)
+          get_attribute(method, *args)
+        else
+          Glimmer::SWT::DisplayProxy.instance.auto_exec do
+            proxy_source_object&.send(method, *args, &block)
+          end
+        end
+      rescue => e
+        begin
+          super
+        rescue Exception => inner_error
+          Glimmer::Config.logger.error { "Neither self.class.name nor #{proxy_source_object&.class.name} can handle the method ##{method}" }
+          Glimmer::Config.logger.error { e.full_message }
+          raise inner_error
+        end
+      end
+      
+      def respond_to?(method, *args, &block)
+        result = super
+        return true if result
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          proxy_source_object&.respond_to?(method, *args, &block)
+        end
+      end
+      
+    end
+    
+  end
+  
+end