glimmer-dsl-swt 4.18.4.9 → 4.18.5.2

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -26,7 +26,9 @@ module Glimmer
   module SWT
     class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy
       def post_initialize_child(child)
-        swt_widget.content = child.swt_widget
+        auto_exec do
+          swt_widget.content = child.swt_widget
+        end
         # TODO consider triggering this method in the future upon resizing of content with a listener (on_control_resized)
 #         child.on_control_resized do
 #           swt_widget.set_min_size(swt_widget.computeSize(child.bounds.width, child.bounds.height))
@@ -38,7 +40,9 @@ module Glimmer
       end
       
       def calculate_min_size
-        swt_widget.set_min_size(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]))
+        auto_exec do
+          swt_widget.set_min_size(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]))
+        end
       end
       alias recalculate_min_size calculate_min_size
     end

data/lib/glimmer/swt/shell_proxy.rb

@@ -42,60 +42,64 @@ module Glimmer
       # if swt_widget keyword arg was passed, then it is assumed the shell has already been instantiated
       # and the proxy wraps it instead of creating a new one.
       def initialize(*args, swt_widget: nil)
-        if swt_widget
-          @swt_widget = swt_widget
-        else
-          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)}.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)
-            args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
-          end
-          if args.first.nil? || (!args.first.is_a?(Display) && !args.first.is_a?(Shell))
-            @display = DisplayProxy.instance.swt_display
-            args = [@display] + args
-          end
-          args = args.compact
-          @swt_widget = Shell.new(*args)
-          @swt_widget.set_data('proxy', self)
-          @swt_widget.setLayout(FillLayout.new)
-          @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
-          # 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
-                @swt_widget.setActive unless @swt_widget.isDisposed
+        auto_exec do
+          if swt_widget
+            @swt_widget = swt_widget
+          else
+            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)}.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)
+              args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
+            end
+            if args.first.nil? || (!args.first.is_a?(Display) && !args.first.is_a?(Shell))
+              @display = DisplayProxy.instance.swt_display
+              args = [@display] + args
+            end
+            args = args.compact
+            @swt_widget = Shell.new(*args)
+            @swt_widget.set_data('proxy', self)
+            @swt_widget.setLayout(FillLayout.new)
+            @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
+            # 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
+                  @swt_widget.setActive unless @swt_widget.isDisposed
+                end
               end
             end
           end
+          on_widget_disposed {
+            clear_shapes
+          }
+          @display ||= @swt_widget.getDisplay
         end
-        on_widget_disposed {
-          clear_shapes
-        }
-        @display ||= @swt_widget.getDisplay
       end
 
       # Centers shell within monitor it is in
       def center_within_display
-        primary_monitor = @display.getPrimaryMonitor()
-        monitor_bounds = primary_monitor.getBounds()
-        shell_bounds = @swt_widget.getBounds()
-        location_x = monitor_bounds.x + (monitor_bounds.width - shell_bounds.width) / 2
-        location_y = monitor_bounds.y + (monitor_bounds.height - shell_bounds.height) / 2
-        @swt_widget.setLocation(location_x, location_y)
+        auto_exec do
+          primary_monitor = @display.getPrimaryMonitor()
+          monitor_bounds = primary_monitor.getBounds()
+          shell_bounds = @swt_widget.getBounds()
+          location_x = monitor_bounds.x + (monitor_bounds.width - shell_bounds.width) / 2
+          location_y = monitor_bounds.y + (monitor_bounds.height - shell_bounds.height) / 2
+          @swt_widget.setLocation(location_x, location_y)
+        end
       end
 
       # Opens shell and starts SWT's UI thread event loop
@@ -107,18 +111,22 @@ module Glimmer
       
       # Opens without starting the event loop.
       def open_only
-        if @opened_before
-          @swt_widget.setVisible(true)
-        else
-          @opened_before = true
-          @swt_widget.pack
-          center_within_display
-          @swt_widget.open
+        auto_exec do
+          if @opened_before
+            @swt_widget.setVisible(true)
+          else
+            @opened_before = true
+            @swt_widget.pack
+            center_within_display
+            @swt_widget.open
+          end
         end
       end
       
       def nested?
-        !swt_widget&.parent.nil?
+        auto_exec do
+          !swt_widget&.parent.nil?
+        end
       end
       alias nested nested?
       
@@ -129,16 +137,22 @@ module Glimmer
 
       # Hides shell. Automatically checks if widget is disposed to avoid crashing.
       def hide
-        @swt_widget.setVisible(false) unless @swt_widget.isDisposed
+        auto_exec do
+          @swt_widget.setVisible(false) unless @swt_widget.isDisposed
+        end
       end
       
       # Closes shell. Automatically checks if widget is disposed to avoid crashing.
       def close
-        @swt_widget.close unless @swt_widget.isDisposed
+        auto_exec do
+          @swt_widget.close unless @swt_widget.isDisposed
+        end
       end
 
       def visible?
-        @swt_widget.isDisposed ? false : @swt_widget.isVisible
+        auto_exec do
+          @swt_widget.isDisposed ? false : @swt_widget.isVisible
+        end
       end
       alias visible visible?
 
@@ -151,25 +165,23 @@ module Glimmer
         DisplayProxy.instance.focus_control&.shell == swt_widget
       end
 
-      def pack
-        @swt_widget.pack
-      end
-
       def pack_same_size
-        bounds = @swt_widget.getBounds
-        if OS.mac?
-          @swt_widget.pack
-          @swt_widget.setBounds(bounds)
-        elsif OS.windows? || OS::Underlying.windows?
-          minimum_size = @swt_widget.getMinimumSize
-          @swt_widget.setMinimumSize(bounds.width, bounds.height)
-          listener = on_control_resized { @swt_widget.setBounds(bounds) }
-          @swt_widget.layout(true, true)
-          @swt_widget.removeControlListener(listener.swt_listener)
-          @swt_widget.setMinimumSize(minimum_size)
-        elsif OS.linux?
-          @swt_widget.layout(true, true)
-          @swt_widget.setBounds(bounds)
+        auto_exec do
+          bounds = @swt_widget.getBounds
+          if OS.mac?
+            @swt_widget.pack
+            @swt_widget.setBounds(bounds)
+          elsif OS.windows? || OS::Underlying.windows?
+            minimum_size = @swt_widget.getMinimumSize
+            @swt_widget.setMinimumSize(bounds.width, bounds.height)
+            listener = on_control_resized { @swt_widget.setBounds(bounds) }
+            @swt_widget.layout(true, true)
+            @swt_widget.removeControlListener(listener.swt_listener)
+            @swt_widget.setMinimumSize(minimum_size)
+          elsif OS.linux?
+            @swt_widget.layout(true, true)
+            @swt_widget.setBounds(bounds)
+          end
         end
       end
 
@@ -184,11 +196,13 @@ module Glimmer
       # https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/Display.html
       # This method is not needed except in rare circumstances where there is a need to start the SWT Event Loop before opening the shell.
       def start_event_loop
-        until @swt_widget.isDisposed
-          begin
-            @display.sleep unless @display.readAndDispatch
-          rescue => e
-            Glimmer::Config.logger.info {e.full_message}
+        auto_exec do
+          until @swt_widget.isDisposed
+            begin
+              @display.sleep unless @display.readAndDispatch
+            rescue => e
+              Glimmer::Config.logger.info {e.full_message}
+            end
           end
         end
       end
@@ -209,6 +223,8 @@ module Glimmer
       
     end
     
+    WindowProxy = ShellProxy
+    
   end
   
 end

data/lib/glimmer/swt/swt_proxy.rb

@@ -49,10 +49,27 @@ module Glimmer
         def extra_styles
           EXTRA_STYLES
         end
+        
+        def cursor_styles
+          SWT.constants.select {|c| c.to_s.start_with?('CURSOR_')}
+        end
+        
+        def color_styles
+          SWT.constants.select {|c| c.to_s.start_with?('COLOR_')}
+        end
+        
+        def cursor_options
+          cursor_styles.map {|c| c.to_s.sub('CURSOR_', '').downcase}.map(&:to_sym)
+        end
+        
+        def color_options
+          color_styles.map {|c| c.to_s.sub('COLOR_', '').downcase}.map(&:to_sym)
+        end
       end
       
       EXTRA_STYLES = {
         NO_RESIZE: self[:shell_trim, :resize!, :max!],
+        WINDOW_TRIM: self[:shell_trim],
       }
     end
   end

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -83,9 +83,11 @@ module Glimmer
       end
       
       def dispose
-        swt_tab_item.setControl(nil)
-        swt_widget.dispose
-        swt_tab_item.dispose
+        auto_exec do
+          swt_tab_item.setControl(nil)
+          swt_widget.dispose
+          swt_tab_item.dispose
+        end
       end
     end
   end

data/lib/glimmer/swt/table_proxy.rb

@@ -266,15 +266,21 @@ module Glimmer
       end
 
       def items
-        swt_widget.get_items
+        auto_exec do
+          swt_widget.get_items
+        end
       end
 
       def model_binding
-        swt_widget.data
+        auto_exec do
+          swt_widget.data
+        end
       end
       
       def table_items_binding
-        swt_widget.get_data('table_items_binding')
+        auto_exec do
+          swt_widget.get_data('table_items_binding')
+        end
       end
       
       def sort_block=(comparator)
@@ -313,7 +319,10 @@ module Glimmer
       
       # Sorts by specified TableColumnProxy object. If nil, it uses the table default sort instead.
       def sort_by_column!(table_column_proxy=nil)
-        index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget) unless table_column_proxy.nil?
+        index = nil
+        auto_exec do
+          index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget) unless table_column_proxy.nil?
+        end
         new_sort_property = table_column_proxy.nil? ? @sort_property : table_column_proxy.sort_property || [column_properties[index]]
         return if table_column_proxy.nil? && new_sort_property.nil? && @sort_block.nil? && @sort_by_block.nil?
         if new_sort_property && table_column_proxy.nil? && new_sort_property.size == 1 && (index = column_sort_properties.index(new_sort_property))
@@ -330,12 +339,16 @@ module Glimmer
         end
         
         @sort_direction = @sort_direction.nil? || @sort_property.first != new_sort_property.first || @sort_direction == :descending ? :ascending : :descending
-        swt_widget.sort_direction = @sort_direction == :ascending ? SWTProxy[:up] : SWTProxy[:down]
+        auto_exec do
+          swt_widget.sort_direction = @sort_direction == :ascending ? SWTProxy[:up] : SWTProxy[:down]
+        end
         
         @sort_property = [new_sort_property].flatten.compact
         table_column_index = column_properties.index(new_sort_property.to_s.to_sym)
         table_column_proxy ||= table_column_proxies[table_column_index] if table_column_index
-        swt_widget.sort_column = table_column_proxy.swt_widget if table_column_proxy
+        auto_exec do
+          swt_widget.sort_column = table_column_proxy.swt_widget if table_column_proxy
+        end
                 
         if table_column_proxy
           @sort_by_block = nil
@@ -405,14 +418,18 @@ module Glimmer
       
       def cells
         column_count = @table.column_properties.size
-        swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
+        auto_exec do
+          swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
+        end
       end
             
       # Performs a search for table items matching block condition
       # If no condition block is passed, returns all table items
       # Returns a Java TableItem array to easily set as selection on org.eclipse.swt.Table if needed
       def search(&condition)
-        swt_widget.getItems.select {|item| condition.nil? || condition.call(item)}.to_java(TableItem)
+        auto_exec do
+          swt_widget.getItems.select {|item| condition.nil? || condition.call(item)}.to_java(TableItem)
+        end
       end
       
       # Returns all table items including descendants
@@ -454,7 +471,9 @@ module Glimmer
       end
       
       def edit_selected_table_item(column_index, before_write: nil, after_write: nil, after_cancel: nil)
-        edit_table_item(swt_widget.getSelection.first, column_index, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
+        auto_exec do
+          edit_table_item(swt_widget.getSelection.first, column_index, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
+        end
       end
             
       def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil, write_on_cancel: false)
@@ -512,7 +531,9 @@ module Glimmer
               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)
+              auto_exec do
+                swt_widget.showItem(edited_table_item)
+              end
               @table_editor_widget_proxy&.swt_widget&.dispose
               @table_editor_widget_proxy = nil
               if after_write&.arity == 0
@@ -524,7 +545,7 @@ module Glimmer
             end
           end
         end
-
+        
         content {
           @table_editor_widget_proxy = TableProxy::editors.symbolize_keys[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
         }

data/lib/glimmer/swt/transform_proxy.rb

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/display_proxy'
-require 'glimmer/swt/properties'
+require 'glimmer/swt/proxy_properties'
 require 'glimmer/swt/custom/shape'
 
 module Glimmer
@@ -29,7 +29,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TransformProxy
-      include Properties
+      include ProxyProperties
       
       include_package 'org.eclipse.swt.graphics'
       include_package 'org.eclipse.swt.widgets'
@@ -37,32 +37,36 @@ module Glimmer
       attr_reader :swt_transform, :parent
       
       def initialize(parent, *args, swt_transform: nil, multiply: false)
-        @parent = parent
-        @multiply = multiply
-        if swt_transform.nil?
-          if !args.first.is_a?(Display) && !args.first.is_a?(DisplayProxy)
-            args.prepend DisplayProxy.instance.swt_display
-          end
-          if args.first.is_a?(DisplayProxy)
-            args[0] = args[0].swt_display
-          end
-          if args.last.is_a?(TransformProxy)
-            args[-1] = args[-1].swt_transform
-          end
-          if args.last.nil? || args.last.is_a?(Transform)
-            @swt_transform = args.last
-            @parent&.set_attribute('transform', self)
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          @parent = parent
+          @multiply = multiply
+          if swt_transform.nil?
+            if !args.first.is_a?(Display) && !args.first.is_a?(DisplayProxy)
+              args.prepend DisplayProxy.instance.swt_display
+            end
+            if args.first.is_a?(DisplayProxy)
+              args[0] = args[0].swt_display
+            end
+            if args.last.is_a?(TransformProxy)
+              args[-1] = args[-1].swt_transform
+            end
+            if args.last.nil? || args.last.is_a?(Transform)
+              @swt_transform = args.last
+              @parent&.set_attribute('transform', self)
+            else
+              @swt_transform = Transform.new(*args)
+            end
           else
-            @swt_transform = Transform.new(*args)
+            @swt_transform = swt_transform
           end
-        else
-          @swt_transform = swt_transform
         end
       end
       
       def post_add_content
         if @multiply
-          @parent.multiply(@swt_transform)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec {
+            @parent.multiply(@swt_transform)
+          }
         else
           @parent&.set_attribute('transform', self)
         end
@@ -72,32 +76,32 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::TransformExpression.new, &block)
       end
       
+      def proxy_source_object
+        @swt_transform
+      end
+      
       def has_attribute?(attribute_name, *args)
-        @swt_transform.respond_to?(attribute_name) || @swt_transform.respond_to?(attribute_setter(attribute_name))
+        Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.respond_to?(attribute_name) } || super
       end
 
       def set_attribute(attribute_name, *args)
         if @swt_transform.respond_to?(attribute_name)
-          @swt_transform.send(attribute_name, *args)
-        elsif @swt_transform.respond_to?(attribute_setter(attribute_name))
-          @swt_transform.send(attribute_setter(attribute_name), *args)
-        end
-      end
-
-      def get_attribute(attribute_name)
-        if @swt_transform.respond_to?(attribute_getter(attribute_name))
-          @swt_transform.send(attribute_getter(attribute_name))
+          Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(attribute_name, *args) }
         else
-          @swt_transform.send(attribute_name)
+          super
         end
       end
       
       def method_missing(method_name, *args, &block)
-        result = @swt_transform.send(method_name, *args, &block)
+        result = Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(method_name, *args, &block) }
         result.nil? ? self : result
       rescue => e
-        Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{@swt_transform.class.name} can handle the method ##{method}"}
-        super
+        begin
+          super
+        rescue Exception => inner_e
+          Glimmer::Config.logger.error {"Neither TransformProxy nor #{@swt_transform.class.name} can handle the method ##{method}"}
+          Glimmer::Config.logger.error {e.full_message}
+        end
       end
       
       def respond_to?(method, *args, &block)