glimmer-dsl-swt 4.18.4.11 → 4.18.5.0

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

@@ -0,0 +1,73 @@
+# 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/custom/shape'
+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
+    module Custom
+      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
+      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
+      class Shape
+        class Text < Shape
+          def parameter_names
+            @parameter_names || text_parameter_names
+          end
+          
+          def possible_parameter_names
+            # TODO refactor and improve this method through meta-programming (and share across other shapes)
+            (text_parameter_names + text_transparent_parameter_names + text_flags_parameter_names).uniq
+          end
+          
+          def text_parameter_names
+            [:text, :x, :y]
+          end
+          
+          def text_transparent_parameter_names
+            [:text, :x, :y, :is_transparent]
+          end
+          
+          def text_flags_parameter_names
+            [:text, :x, :y, :flags]
+          end
+          
+          def set_parameter_attribute(attribute_name, *args)
+            return super if @parameter_names.to_a.map(&:to_s).include?(attribute_name.to_s)
+            if text_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = text_parameter_names
+            elsif text_transparent_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = text_transparent_parameter_names
+            elsif text_flags_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = text_flags_parameter_names
+            end
+            super
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/date_time_proxy.rb

@@ -43,7 +43,9 @@ module Glimmer
       end
       
       def date=(date_value)
-        swt_widget.setDate(date_value.year, date_value.month - 1, date_value.day)
+        auto_exec do
+          swt_widget.setDate(date_value.year, date_value.month - 1, date_value.day)
+        end
       end
       
       def time
@@ -58,11 +60,15 @@ module Glimmer
       end
       
       def month
-        swt_widget.month + 1
+        auto_exec do
+          swt_widget.month + 1
+        end
       end
       
       def month=(new_value)
-        swt_widget.month = new_value - 1
+        auto_exec do
+          swt_widget.month = new_value - 1
+        end
       end
       
       def set_attribute(attribute_name, *args)

data/lib/glimmer/swt/directory_dialog_proxy.rb

@@ -38,25 +38,27 @@ module Glimmer
       include_package 'org.eclipse.swt.widgets'
 
       def initialize(*args, swt_widget: nil)
-        if swt_widget
-          @swt_widget = swt_widget
-        else
-          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
-          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]
+        auto_exec do
+          if swt_widget
+            @swt_widget = swt_widget
+          else
+            style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+            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.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
+            parent = args[0]
+            @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
+            @swt_widget = DirectoryDialog.new(*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
-          parent = args[0]
-          @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
-          @swt_widget = DirectoryDialog.new(*args)
         end
       end
 

data/lib/glimmer/swt/display_proxy.rb

@@ -58,10 +58,16 @@ module Glimmer
         # Returns singleton instance
         def instance(*args)
           if @instance.nil? || @instance.swt_display.nil? || @instance.swt_display.isDisposed
+            @thread = Thread.current
             @instance = new(*args)
           end
           @instance
         end
+        
+        def thread
+          instance # ensure instance
+          @thread
+        end
       end
 
       # SWT Display object wrapped
@@ -71,6 +77,7 @@ module Glimmer
         Display.app_name ||= 'Glimmer'
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
+        @execs_in_progress = {}
         on_swt_Dispose {
           clear_shapes
         }
@@ -80,18 +87,71 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
       end
       
+      # asynchronously executes the block (required from threads other than first GUI thread)
+      # does not return the value produced by the block since it is async, running after the return
       def async_exec(&block)
-        @swt_display.asyncExec(&block)
+        @swt_display.asyncExec do
+          execs_in_progress << :async_exec
+          begin
+            result = block.call
+          ensure
+            execs_in_progress.pop
+          end
+        end
       end
 
+      # synchronously executes the block (required from threads other than first GUI thread)
+      # returns the value produced by the block
       def sync_exec(&block)
-        @swt_display.syncExec(&block)
+        result = nil
+        @swt_display.syncExec do
+          execs_in_progress << :sync_exec
+          begin
+            result = block.call
+          ensure
+            execs_in_progress.pop
+          end
+        end
+        result
       end
 
       def timer_exec(delay_in_millis, &block)
         @swt_display.timerExec(delay_in_millis, &block)
       end
       
+      # Indicates whether `sync_exec` is required because of running in a different thread from the GUI thread
+      # `async_exec` could be used as an alternative to `sync_exec` when required.
+      def sync_exec_required?
+        Thread.current != DisplayProxy.thread
+      end
+      
+      def async_exec_in_progress?
+        execs_in_progress.last == :async_exec
+      end
+      
+      def sync_exec_in_progress?
+        execs_in_progress.include?(:sync_exec)
+      end
+      
+      def execs_in_progress
+        @execs_in_progress[Thread.current] ||= []
+      end
+      
+      # Invoke block with `sync_exec` only when necessary (running from a separate thread)
+      # Override sync_exec as `true` to force using or `false` to force avoiding
+      # Override async_exec as `true` to force using or `:unless_in_progress` to force using only if no `async_exec` is in progress
+      # Disable auto execution of `sync_exec` via `Glimmer::Config.auto_sync_exec = false`
+      # Otherwise, runs normally, thus allowing SWT to decide how to batch/optimize GUI updates
+      def auto_exec(override_sync_exec: nil, override_async_exec: nil, &block)
+        if override_sync_exec || override_sync_exec.nil? && !override_async_exec && sync_exec_required? && Config.auto_sync_exec? && !sync_exec_in_progress? && !async_exec_in_progress?
+          sync_exec(&block)
+        elsif override_async_exec || override_async_exec.to_s == 'unless_in_progress' && !async_exec_in_progress?
+          async_exec(&block)
+        else
+          block.call
+        end
+      end
+
       def on_widget_disposed(&block)
         on_swt_Dispose(&block)
       end

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/file_dialog_proxy.rb

@@ -39,25 +39,27 @@ module Glimmer
       include_package 'org.eclipse.swt.widgets'
 
       def initialize(*args, swt_widget: nil)
-        if swt_widget
-          @swt_widget = swt_widget
-        else
-          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
-          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]
+        auto_exec do
+          if swt_widget
+            @swt_widget = swt_widget
+          else
+            style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+            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.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
+            parent = args[0]
+            @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
+            @swt_widget = FileDialog.new(*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
-          parent = args[0]
-          @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
-          @swt_widget = FileDialog.new(*args)
         end
       end
 

data/lib/glimmer/swt/font_proxy.rb

@@ -79,7 +79,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

@@ -132,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