glimmer-dsl-swt 4.17.10.7 → 4.18.1.0

data/lib/glimmer/swt/custom/checkbox_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/custom/drawable.rb

@@ -0,0 +1,43 @@
+# 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.
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents SWT drawable controls (widgets like canvas) and display
+      module Drawable
+        def shapes
+          @shapes ||= []
+        end
+        
+        def clear_shapes
+          shapes.dup.each do |shape|
+            shape.paint_listener_proxy&.unregister
+            shapes.delete(shape)
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/custom/radio_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

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

@@ -0,0 +1,135 @@
+# 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
+    module Custom
+      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
+      # swt_widget returns the parent (e.g. a `canvas` WidgetProxy), equivalent to `parent.swt_widget`
+      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
+      class Shape
+        include Properties
+        # TODO support textExtent as an option
+        # TODO support a Pattern DSL for methods that take Pattern arguments
+        
+        class << self
+          def valid?(parent, keyword, *args, &block)
+            gc_instance_methods.include?(method_name(keyword, args))
+          end
+          
+          def gc_instance_methods
+            org.eclipse.swt.graphics.GC.instance_methods.map(&:to_s)
+          end
+          
+          def arg_options(args, extract: false)
+            arg_options_method = extract ? :pop : :last
+            options = args.send(arg_options_method) if args.last.is_a?(Hash)
+            options.nil? ? {} : options.symbolize_keys
+          end
+          
+          def method_name(keyword, args)
+            gc_instance_method_name_prefix = arg_options(args)[:fill] ? 'fill_' : 'draw_'
+            "#{gc_instance_method_name_prefix}#{keyword}"
+          end
+        end
+        
+        attr_reader :parent, :name, :args, :options, :swt_widget, :paint_listener_proxy
+        
+        def initialize(parent, keyword, *args)
+          @parent = parent
+          @name = keyword
+          @method_name = self.class.method_name(keyword, args)
+          @options = self.class.arg_options(args, extract: true)
+          @args = args
+          @swt_widget = parent.respond_to?(:swt_display) ? parent.swt_display : parent.swt_widget
+          @properties = {}
+          @parent.shapes << self
+        end
+        
+        def fill?
+          !draw?
+        end
+        
+        def draw?
+          !@options[:fill]
+        end
+        
+        def post_add_content
+          event_handler = lambda do |event|
+            @properties.each do |property, args|
+              method_name = attribute_setter(property)
+              handle_conversions(method_name, args)
+              event.gc.send(method_name, *args)
+            end
+            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
+        end
+        
+        def handle_conversions(method_name, args)
+          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
+              args[0] = ColorProxy.new(args[0])
+            end
+          end
+          if args.first.is_a?(ColorProxy)
+            args[0] = args[0].swt_color
+          end
+          if args.first.is_a?(Hash)
+            if the_java_method.parameter_types.first == Font.java_class
+              args[0] = FontProxy.new(args[0])
+            end
+          end
+          if args.first.is_a?(FontProxy)
+            args[0] = args[0].swt_font
+          end
+          
+          # TODO convert SWT style symbol to integer if method takes integer
+        end
+        
+        def has_attribute?(attribute_name, *args)
+          # TODO test that attribute getter responds too
+          self.class.gc_instance_methods.include?(attribute_setter(attribute_name))
+        end
+  
+        def set_attribute(attribute_name, *args)
+          # TODO special treatment for color symbols
+          @properties[attribute_name] = args
+        end
+  
+        def get_attribute(attribute_name)
+          @properties.symbolize_keys[attribute_name.to_s.to_sym]
+        end
+    
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/date_time_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/directory_dialog_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/display_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/widget_listener_proxy'
+require 'glimmer/swt/custom/drawable'
 
 module Glimmer
   module SWT
@@ -36,6 +37,8 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class DisplayProxy
       include_package 'org.eclipse.swt.widgets'
+      
+      include Custom::Drawable
 
       OBSERVED_MENU_ITEMS = ['about', 'preferences']
 
@@ -60,6 +63,18 @@ module Glimmer
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
       end
+      
+      def async_exec(&block)
+        @swt_display.async_exec(&block)
+      end
+
+      def sync_exec(&block)
+        @swt_display.sync_exec(&block)
+      end
+
+      def timer_exec(&block)
+        @swt_display.timer_exec(&block)
+      end
 
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)

data/lib/glimmer/swt/dnd_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/expand_item_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/file_dialog_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/font_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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

data/lib/glimmer/swt/image_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -54,9 +54,9 @@ module Glimmer
         @args = @args.first if @args.size == 1 && @args.first.is_a?(Array)
         if options&.keys&.include?(:swt_image)
           @swt_image = options[:swt_image]
-          @image_data = @swt_image.image_data
+          @original_image_data = @image_data = @swt_image.image_data
         elsif @file_path
-          @image_data = ImageData.new(input_stream || @file_path)
+          @original_image_data = @image_data = ImageData.new(input_stream || @file_path)
           @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
           width = options[:width]
           height = options[:height]
@@ -65,8 +65,8 @@ module Glimmer
           scale_to(width, height) unless width.nil? || height.nil?
         else
           @swt_image = Image.new(*@args)
-          @image_data = @swt_image.image_data
-        end        
+          @original_image_data = @image_data = @swt_image.image_data
+        end
       end
       
       def input_stream
@@ -77,12 +77,13 @@ module Glimmer
           file_input_stream = object.java_class.resource_as_stream(file_path)
         else
           file_input_stream = java.io.FileInputStream.new(@file_path)
-        end      
+        end
         java.io.BufferedInputStream.new(file_input_stream) if file_input_stream
       end
 
       def scale_to(width, height)
-        scaled_image_data = image_data.scaledTo(width, height)
+        return 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
         @swt_image = Image.new(device, scaled_image_data)
@@ -99,7 +100,7 @@ module Glimmer
       
       def respond_to?(method, *args, &block)
         super || swt_image.respond_to?(method, *args, &block)
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/layout_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -68,6 +68,10 @@ module Glimmer
         @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)
         @widget_proxy.swt_widget.setLayout(@swt_layout)
       end
 

data/lib/glimmer/swt/menu_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -75,7 +75,7 @@ module Glimmer
       end
 
       def has_attribute?(attribute_name, *args)
-        if attribute_name.to_s == "text"
+        if ['text', 'enabled'].include?(attribute_name.to_s)
           true
         else
           super(attribute_name, *args)
@@ -83,24 +83,29 @@ module Glimmer
       end
 
       def set_attribute(attribute_name, *args)
-        attribute_name
-        if attribute_name.to_s == "text"
+        if normalized_attribute(attribute_name) == 'text'
           text_value = args[0]
           @swt_menu_item.setText text_value
+        elsif normalized_attribute(attribute_name) == 'enabled'
+          value = args[0]
+          @swt_menu_item.setEnabled value
         else
           super(attribute_name, *args)
         end
       end
 
       def get_attribute(attribute_name)
-        if attribute_name.to_s == "text"
+        if normalized_attribute(attribute_name) == 'text'
           @swt_menu_item.getText
+        elsif normalized_attribute(attribute_name) == 'enabled'
+          @swt_menu_item.getEnabled
         else
           super(attribute_name)
         end
       end
       
       def can_handle_observation_request?(observation_request, super_only: false)
+        observation_request = observation_request.to_s
         super_result = super(observation_request)
         if observation_request.start_with?('on_') && !super_result && !super_only
           return menu_item_proxy.can_handle_observation_request?(observation_request)

data/lib/glimmer/swt/message_box_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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