glimmer-dsl-swt 4.18.4.0 → 4.18.4.5

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

@@ -129,9 +129,11 @@ module Glimmer
         end
         
         def post_add_content
-          amend_method_name_options_based_on_properties
-          setup_painting
-          @content_added = true
+          unless @content_added
+            amend_method_name_options_based_on_properties
+            setup_painting
+            @content_added = true
+          end
         end
         
         def apply_property_arg_conversions(method_name, property, args)

data/lib/glimmer/swt/date_time_proxy.rb

@@ -1,85 +1,85 @@
-# 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 'date'
-require 'glimmer/swt/widget_proxy'
-
-module Glimmer
-  module SWT
-    # Proxy for org.eclipse.swt.widgets.DateTime
-    #
-    # Follows the Proxy Design Pattern
-    class DateTimeProxy < WidgetProxy
-      CUSTOM_ATTRIBUTES = %w[date_time date time month]
-      
-      def date_time
-        DateTime.new(year, month, day, hours, minutes, seconds)
-      end
-      
-      def date_time=(date_time_value)
-        self.time = date_time_value.to_time
-      end
-      
-      def date
-        date_time.to_date
-      end
-      
-      def date=(date_value)
-        swt_widget.setDate(date_value.year, date_value.month - 1, date_value.day)
-      end
-      
-      def time
-        date_time.to_time
-      end
-      
-      def time=(time_value)
-        self.date = time_value.to_date
-        self.hours = time_value.hour
-        self.minutes = time_value.min
-        self.seconds = time_value.sec
-      end
-      
-      def month
-        swt_widget.month + 1
-      end
-      
-      def month=(new_value)
-        swt_widget.month = new_value - 1
-      end
-      
-      def set_attribute(attribute_name, *args)
-        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
-          send(ruby_attribute_setter(attribute_name), args.first)
-        else
-          super(attribute_name, *args)
-        end
-      end
- 
-      def get_attribute(attribute_name)
-        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
-          send(attribute_name)
-        else
-          super(attribute_name)
-        end
-      end
-    end
-  end
-end
+# 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 'date'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.DateTime
+    #
+    # Follows the Proxy Design Pattern
+    class DateTimeProxy < WidgetProxy
+      CUSTOM_ATTRIBUTES = %w[date_time date time month]
+      
+      def date_time
+        DateTime.new(year, month, day, hours, minutes, seconds)
+      end
+      
+      def date_time=(date_time_value)
+        self.time = date_time_value.to_time
+      end
+      
+      def date
+        date_time.to_date
+      end
+      
+      def date=(date_value)
+        swt_widget.setDate(date_value.year, date_value.month - 1, date_value.day)
+      end
+      
+      def time
+        date_time.to_time
+      end
+      
+      def time=(time_value)
+        self.date = time_value.to_date
+        self.hours = time_value.hour
+        self.minutes = time_value.min
+        self.seconds = time_value.sec
+      end
+      
+      def month
+        swt_widget.month + 1
+      end
+      
+      def month=(new_value)
+        swt_widget.month = new_value - 1
+      end
+      
+      def set_attribute(attribute_name, *args)
+        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
+          send(ruby_attribute_setter(attribute_name), args.first)
+        else
+          super(attribute_name, *args)
+        end
+      end
+ 
+      def get_attribute(attribute_name)
+        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
+          send(attribute_name)
+        else
+          super(attribute_name)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/directory_dialog_proxy.rb

@@ -1,65 +1,65 @@
-# 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/swt_proxy'
-require 'glimmer/swt/widget_proxy'
-require 'glimmer/swt/display_proxy'
-
-module Glimmer
-  module SWT
-    # Proxy for org.eclipse.swt.widgets.DirectoryDialog
-    #
-    # Automatically uses the current shell if one is open.
-    # Otherwise, it instantiates a new shell parent
-    #
-    # Optionally takes a shell as an argument
-    #
-    # Follows the Proxy Design Pattern
-    class DirectoryDialogProxy < WidgetProxy
-      # TODO write rspec tests
-      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]
-          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
-
-    end
-  end
-end
+# 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/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.DirectoryDialog
+    #
+    # Automatically uses the current shell if one is open.
+    # Otherwise, it instantiates a new shell parent
+    #
+    # Optionally takes a shell as an argument
+    #
+    # Follows the Proxy Design Pattern
+    class DirectoryDialogProxy < WidgetProxy
+      # TODO write rspec tests
+      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]
+          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
+
+    end
+  end
+end

data/lib/glimmer/swt/display_proxy.rb

@@ -81,15 +81,15 @@ module Glimmer
       end
       
       def async_exec(&block)
-        @swt_display.async_exec(&block)
+        @swt_display.asyncExec(&block)
       end
 
       def sync_exec(&block)
-        @swt_display.sync_exec(&block)
+        @swt_display.syncExec(&block)
       end
 
-      def timer_exec(&block)
-        @swt_display.timer_exec(&block)
+      def timer_exec(delay_in_millis, &block)
+        @swt_display.timerExec(delay_in_millis, &block)
       end
       
       def on_widget_disposed(&block)
@@ -137,12 +137,13 @@ module Glimmer
           add_swt_event_filter(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
-          if OBSERVED_MENU_ITEMS.include?(event_name)
-            if OS.mac?
-              system_menu = swt_display.getSystemMenu
-              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-              menu_item.addListener(SWTProxy[:Selection], &block)
-            end
+          if OBSERVED_MENU_ITEMS.include?(event_name) && OS.mac?
+            system_menu = swt_display.getSystemMenu
+            menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], &block)
+            # TODO enable this code and test on the Mac to ensure automatic cleanup of mac event registrations in custom widgets
+#             Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+            display_mac_event_registration
           end
         end
       end

data/lib/glimmer/swt/dnd_proxy.rb

@@ -1,51 +1,51 @@
-# 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/style_constantizable'
-
-module Glimmer
-  module SWT
-    # Proxy for org.eclipse.swt.dnd.DND
-    #
-    # Follows the Proxy Design Pattern
-    class DNDProxy
-      include StyleConstantizable
-
-      class << self
-        JAVA_IMPORT = 'org.eclipse.swt.dnd.DND'
-        
-        java_import JAVA_IMPORT
-        
-        def constant_java_import
-          JAVA_IMPORT
-        end
-
-        def constant_source_class
-          DND
-        end
-
-        def constant_value_none
-          DND::DROP_NONE
-        end
-      end
-    end
-  end
-end
+# 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/style_constantizable'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.dnd.DND
+    #
+    # Follows the Proxy Design Pattern
+    class DNDProxy
+      include StyleConstantizable
+
+      class << self
+        JAVA_IMPORT = 'org.eclipse.swt.dnd.DND'
+        
+        java_import JAVA_IMPORT
+        
+        def constant_java_import
+          JAVA_IMPORT
+        end
+
+        def constant_source_class
+          DND
+        end
+
+        def constant_value_none
+          DND::DROP_NONE
+        end
+      end
+    end
+  end
+end