glimmer-dsl-swt 4.18.4.0 → 4.18.4.5

data/lib/glimmer/swt/tree_proxy.rb

@@ -1,145 +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/widget_proxy'
-
-module Glimmer
-  module SWT
-    class TreeProxy < Glimmer::SWT::WidgetProxy
-      include Glimmer
-      
-      attr_reader :tree_editor, :tree_editor_text_proxy
-      attr_accessor :tree_properties
-      
-      def initialize(underscored_widget_name, parent, args)
-        super
-        @tree_editor = TreeEditor.new(swt_widget)
-        @tree_editor.horizontalAlignment = SWTProxy[:left]
-        @tree_editor.grabHorizontal = true
-        @tree_editor.minimumHeight = 20
-      end
-    
-      # Performs depth first search for tree items matching block condition
-      # If no condition block is passed, returns all tree items
-      # Returns a Java TreeItem array to easily set as selection on org.eclipse.swt.Tree if needed
-      def depth_first_search(&condition)
-        found = []
-        recursive_depth_first_search(swt_widget.getItems.first, found, &condition)
-        found.to_java(TreeItem)
-      end
-      
-      # Returns all tree items including descendants
-      def all_tree_items
-        depth_first_search
-      end
-
-      def widget_property_listener_installers
-        super.merge({
-          Java::OrgEclipseSwtWidgets::Tree => {
-            selection: lambda do |observer|
-              on_widget_selected { |selection_event|
-                observer.call(@swt_widget.getSelection)
-              }
-            end
-          },
-        })
-      end
-      
-      def edit_in_progress?
-        !!@edit_in_progress
-      end
-      
-      def edit_selected_tree_item(before_write: nil, after_write: nil, after_cancel: nil)
-        edit_tree_item(swt_widget.getSelection.first, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
-      end
-            
-      def edit_tree_item(tree_item, before_write: nil, after_write: nil, after_cancel: nil)
-        return if tree_item.nil?
-        content {
-          @tree_editor_text_proxy = text {
-            focus true
-            text tree_item.getText
-            action_taken = false
-            cancel = lambda {
-              @tree_editor_text_proxy.swt_widget.dispose
-              @tree_editor_text_proxy = nil
-              after_cancel&.call
-              @edit_in_progress = false
-            }
-            action = lambda { |event|
-              begin
-                if !action_taken && !@edit_in_progress
-                  action_taken = true
-                  @edit_in_progress = true
-                  new_text = @tree_editor_text_proxy.swt_widget.getText
-                  if new_text == tree_item.getText
-                    cancel.call
-                  else
-                    before_write&.call
-                    tree_item.setText(new_text)
-                    model = tree_item.getData
-                    model.send("#{tree_properties[:text]}=", new_text) # makes tree update itself, so must search for selected tree item again
-                    edited_tree_item = depth_first_search { |ti| ti.getData == model }.first
-                    swt_widget.showItem(edited_tree_item)
-                    @tree_editor_text_proxy.swt_widget.dispose
-                    @tree_editor_text_proxy = nil
-                    after_write&.call(edited_tree_item)
-                    @edit_in_progress = false
-                  end
-                end
-              rescue => e
-                Glimmer::Config.logger.error {"Error encountered while editing tree item!\n#{e.full_message}"}
-              end
-            }
-            on_focus_lost(&action)
-            on_key_pressed { |key_event|
-              if key_event.keyCode == swt(:cr)
-                action.call(key_event)
-              elsif key_event.keyCode == swt(:esc)
-                cancel.call
-              end
-            }
-          }
-          @tree_editor_text_proxy.swt_widget.selectAll
-        }
-        @tree_editor.setEditor(@tree_editor_text_proxy.swt_widget, tree_item)
-      end
-      
-      private
-
-      def recursive_depth_first_search(tree_item, found, &condition)
-        return if tree_item.nil?
-        found << tree_item if condition.nil? || condition.call(tree_item)
-        tree_item.getItems.each do |child_tree_item|
-          recursive_depth_first_search(child_tree_item, found, &condition)
-        end
-      end
-      
-      def property_type_converters
-        super.merge({
-          selection: lambda do |value|
-            depth_first_search {|ti| ti.getData == value}
-          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/widget_proxy'
+
+module Glimmer
+  module SWT
+    class TreeProxy < Glimmer::SWT::WidgetProxy
+      include Glimmer
+      
+      attr_reader :tree_editor, :tree_editor_text_proxy
+      attr_accessor :tree_properties
+      
+      def initialize(underscored_widget_name, parent, args)
+        super
+        @tree_editor = TreeEditor.new(swt_widget)
+        @tree_editor.horizontalAlignment = SWTProxy[:left]
+        @tree_editor.grabHorizontal = true
+        @tree_editor.minimumHeight = 20
+      end
+    
+      # Performs depth first search for tree items matching block condition
+      # If no condition block is passed, returns all tree items
+      # Returns a Java TreeItem array to easily set as selection on org.eclipse.swt.Tree if needed
+      def depth_first_search(&condition)
+        found = []
+        recursive_depth_first_search(swt_widget.getItems.first, found, &condition)
+        found.to_java(TreeItem)
+      end
+      
+      # Returns all tree items including descendants
+      def all_tree_items
+        depth_first_search
+      end
+
+      def widget_property_listener_installers
+        super.merge({
+          Java::OrgEclipseSwtWidgets::Tree => {
+            selection: lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end
+          },
+        })
+      end
+      
+      def edit_in_progress?
+        !!@edit_in_progress
+      end
+      
+      def edit_selected_tree_item(before_write: nil, after_write: nil, after_cancel: nil)
+        edit_tree_item(swt_widget.getSelection.first, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
+      end
+            
+      def edit_tree_item(tree_item, before_write: nil, after_write: nil, after_cancel: nil)
+        return if tree_item.nil?
+        content {
+          @tree_editor_text_proxy = text {
+            focus true
+            text tree_item.getText
+            action_taken = false
+            cancel = lambda {
+              @tree_editor_text_proxy.swt_widget.dispose
+              @tree_editor_text_proxy = nil
+              after_cancel&.call
+              @edit_in_progress = false
+            }
+            action = lambda { |event|
+              begin
+                if !action_taken && !@edit_in_progress
+                  action_taken = true
+                  @edit_in_progress = true
+                  new_text = @tree_editor_text_proxy.swt_widget.getText
+                  if new_text == tree_item.getText
+                    cancel.call
+                  else
+                    before_write&.call
+                    tree_item.setText(new_text)
+                    model = tree_item.getData
+                    model.send("#{tree_properties[:text]}=", new_text) # makes tree update itself, so must search for selected tree item again
+                    edited_tree_item = depth_first_search { |ti| ti.getData == model }.first
+                    swt_widget.showItem(edited_tree_item)
+                    @tree_editor_text_proxy.swt_widget.dispose
+                    @tree_editor_text_proxy = nil
+                    after_write&.call(edited_tree_item)
+                    @edit_in_progress = false
+                  end
+                end
+              rescue => e
+                Glimmer::Config.logger.error {"Error encountered while editing tree item!\n#{e.full_message}"}
+              end
+            }
+            on_focus_lost(&action)
+            on_key_pressed { |key_event|
+              if key_event.keyCode == swt(:cr)
+                action.call(key_event)
+              elsif key_event.keyCode == swt(:esc)
+                cancel.call
+              end
+            }
+          }
+          @tree_editor_text_proxy.swt_widget.selectAll
+        }
+        @tree_editor.setEditor(@tree_editor_text_proxy.swt_widget, tree_item)
+      end
+      
+      private
+
+      def recursive_depth_first_search(tree_item, found, &condition)
+        return if tree_item.nil?
+        found << tree_item if condition.nil? || condition.call(tree_item)
+        tree_item.getItems.each do |child_tree_item|
+          recursive_depth_first_search(child_tree_item, found, &condition)
+        end
+      end
+      
+      def property_type_converters
+        super.merge({
+          selection: lambda do |value|
+            depth_first_search {|ti| ti.getData == value}
+          end,
+        })
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_listener_proxy.rb

@@ -1,64 +1,64 @@
-# 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
-    # Proxy for widget listeners
-    #
-    # Follows the Proxy Design Pattern
-    class WidgetListenerProxy
-
-      attr_reader :swt_widget, :swt_display, :swt_listener, :widget_add_listener_method, :swt_listener_class, :swt_listener_method, :event_type, :swt_constant
-
-      def initialize(swt_widget:nil, swt_display:nil, swt_listener:, widget_add_listener_method: nil, swt_listener_class: nil, swt_listener_method: nil, event_type: nil, swt_constant: nil, filter: false)
-        @swt_widget = swt_widget
-        @swt_display = swt_display
-        @filter = filter
-        @swt_listener = swt_listener
-        @widget_add_listener_method = widget_add_listener_method
-        @swt_listener_class = swt_listener_class
-        @swt_listener_method = swt_listener_method
-        @event_type = event_type
-        @swt_constant = swt_constant
-      end
-      
-      def widget_remove_listener_method
-        @widget_add_listener_method.sub('add', 'remove')
-      end
-      
-      def deregister
-        return if @swt_widget&.is_disposed || @swt_display&.is_disposed
-        if @swt_display
-          if @filter
-            @swt_display.removeFilter(@event_type, @swt_listener)
-          else
-            @swt_display.removeListener(@event_type, @swt_listener)
-          end
-        elsif @event_type
-          @swt_widget.removeListener(@event_type, @swt_listener)
-        else
-          @swt_widget.send(widget_remove_listener_method, @swt_listener)
-        end
-      end
-      alias unregister deregister # TODO consider dropping unregister (and in Observer too)
-    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.
+
+module Glimmer
+  module SWT
+    # Proxy for widget listeners
+    #
+    # Follows the Proxy Design Pattern
+    class WidgetListenerProxy
+
+      attr_reader :swt_widget, :swt_display, :swt_listener, :widget_add_listener_method, :swt_listener_class, :swt_listener_method, :event_type, :swt_constant
+
+      def initialize(swt_widget:nil, swt_display:nil, swt_listener:, widget_add_listener_method: nil, swt_listener_class: nil, swt_listener_method: nil, event_type: nil, swt_constant: nil, filter: false)
+        @swt_widget = swt_widget
+        @swt_display = swt_display
+        @filter = filter
+        @swt_listener = swt_listener
+        @widget_add_listener_method = widget_add_listener_method
+        @swt_listener_class = swt_listener_class
+        @swt_listener_method = swt_listener_method
+        @event_type = event_type
+        @swt_constant = swt_constant
+      end
+      
+      def widget_remove_listener_method
+        @widget_add_listener_method.sub('add', 'remove')
+      end
+      
+      def deregister
+        return if @swt_widget&.is_disposed || @swt_display&.is_disposed
+        if @swt_display
+          if @filter
+            @swt_display.removeFilter(@event_type, @swt_listener)
+          else
+            @swt_display.removeListener(@event_type, @swt_listener)
+          end
+        elsif @event_type
+          @swt_widget.removeListener(@event_type, @swt_listener)
+        else
+          @swt_widget.send(widget_remove_listener_method, @swt_listener)
+        end
+      end
+      alias unregister deregister # TODO consider dropping unregister (and in Observer too)
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -50,6 +50,7 @@ module Glimmer
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
         'button'              => [:push],
+        'canvas'              => [:double_buffered],
         'checkbox'            => [:check],
         'check'               => [:check],
         'drag_source'         => [:drop_copy],
@@ -165,6 +166,7 @@ module Glimmer
           DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
           @parent_proxy.post_initialize_child(self)
         end
+        @keyword = underscored_widget_name.to_s
         if respond_to?(:on_widget_disposed)
           on_widget_disposed {
             clear_shapes
@@ -177,7 +179,9 @@ module Glimmer
         # No Op by default
       end
 
-      # Subclasses may override to perform post add_content work
+      # Subclasses may override to perform post add_content work.
+      # Make sure its logic detects if it ran before since it could run multiple times
+      # when adding content multiple times post creation.
       def post_add_content
         # No Op by default
       end
@@ -543,6 +547,10 @@ module Glimmer
         DisplayProxy.instance.sync_exec(&block)
       end
 
+      def timer_exec(delay_in_millis, &block)
+        DisplayProxy.instance.timer_exec(delay_in_millis, &block)
+      end
+
       def has_style?(style)
         comparison = interpret_style(style)
         (@swt_widget.style & comparison) == comparison
@@ -564,9 +572,11 @@ module Glimmer
 
       # Used for data-binding only. Consider renaming or improving to avoid the confusion it causes
       def add_observer(observer, property_name)
-        property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
-        widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
-        widget_listener_installers.to_a.first&.call(observer)
+        if !observer.respond_to?(:binding_options) || !observer.binding_options[:read_only]
+          property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
+          widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
+          widget_listener_installers.to_a.first&.call(observer)
+        end
       end
 
       def remove_observer(observer, property_name)