glimmer-dsl-swt 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce119763646f3e3ccc0211534317572ed02c5d21b9820387dec34d83b714e50f
-  data.tar.gz: 1c4486c574ab3e8d30957133b9aab200dcfbdea10ea1c4aa0279a4991f80a0dd
+  metadata.gz: 8dda5c40a0a65d36e4615d40f3456b80d2d990121ed63fa9f447a1d110af3a93
+  data.tar.gz: 4bcdc319eda7a7c3542e0d1b8caeda9329726623ae20b87236be0690dbd263c4
 SHA512:
-  metadata.gz: cea6c2e7ac8920d4ae87e447f08c7a622fc8851827b76160dc07b36d8c725911bf94a772aa5f47e43465a24961f7dc38b1d974a164ec3704d159dee61deb7712
-  data.tar.gz: 8efbb95213218c052cbcc8165dc2305c41f26a42f1a374ba05fd9b5912c3a79bfbb99522a524c8cc0fa88b128c471ab22e03fb75a750b7dd31708617b4c6b4cf
+  metadata.gz: 12f2085517a77a30197dd499887e0ca55756b2a0d0ec26275be60b38d6b266722c6574256e3f9830e145763eec7cb74543b0df37932d9c751b0497c4ea277a38
+  data.tar.gz: bb174b6427e2814b02f4509dc4b31698ca2e28c460f2d18749c2505ec9cb0635641275a5300db0fbb7821d1fdb0cdc8474e9220d2718201073076d567b2865d0

data/README.md

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.3.1 (Desktop GUI)
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.4.0 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/glimmer/swt/color_proxy.rb

@@ -48,6 +48,17 @@ module Glimmer
         end
         @swt_color
       end
+      
+      def method_missing(method, *args, &block)
+        swt_color.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger&.debug "Neither ColorProxy nor #{swt_color.class.name} can handle the method ##{method}"
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || swt_color.respond_to?(method, *args, &block)
+      end      
     end
   end
 end

data/lib/glimmer/swt/display_proxy.rb

@@ -33,26 +33,28 @@ module Glimmer
 
       def initialize(*args)
         @swt_display = Display.new(*args)
+        @swt_display.set_data('proxy', self)
       end
 
       def dispose
         @swt_display.dispose
       end
 
-      # Executes code block asynchronously with respect to SWT UI thread
-      def async_exec(&block)
-        @swt_display.asyncExec(&block)
+      def method_missing(method, *args, &block)
+        swt_display.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger&.debug "Neither DisplayProxy nor #{swt_display.class.name} can handle the method ##{method}"
+        super
       end
-
-      # Executes code block synchronously with respect to SWT UI thread
-      def sync_exec(&block)
-        @swt_display.syncExec(&block)
+      
+      def respond_to?(method, *args, &block)
+        super || swt_display.respond_to?(method, *args, &block)
       end
 
       def can_handle_observation_request?(observation_request)
         observation_request = observation_request.to_s
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           SWTProxy.has_constant?(constant_name)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
@@ -63,8 +65,8 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')

data/lib/glimmer/swt/shell_proxy.rb

@@ -40,9 +40,10 @@ module Glimmer
           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)
-          on_event_show do
+          on_swt_show do
             Thread.new do      
               sleep(0.25)
               async_exec do
@@ -144,9 +145,9 @@ module Glimmer
           visibility_notifier = proc do
             observer.call(visible?)
           end
-          on_event_show(&visibility_notifier)
-          on_event_hide(&visibility_notifier)
-          on_event_close(&visibility_notifier)
+          on_swt_show(&visibility_notifier)
+          on_swt_hide(&visibility_notifier)
+          on_swt_close(&visibility_notifier)
         else
           super
         end

data/lib/glimmer/swt/table_proxy.rb

@@ -87,7 +87,7 @@ module Glimmer
         end
       end
       
-      attr_reader :table_editor, :table_editor_text_proxy, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor
+      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor
       attr_accessor :column_properties
       
       def initialize(underscored_widget_name, parent, args)
@@ -293,7 +293,7 @@ module Glimmer
         end
 
         content { 
-          @table_editor_widget_proxy = @table_editor_text_proxy = TableProxy::editors[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
+          @table_editor_widget_proxy = TableProxy::editors[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
         }
         @table_editor.setEditor(@table_editor_widget_proxy.swt_widget, table_item, column_index)
       rescue => e

data/lib/glimmer/swt/widget_proxy.rb

@@ -60,6 +60,7 @@ module Glimmer
         styles, extra_options = extract_args(underscored_widget_name, args)
         swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
         @swt_widget = swt_widget_class.new(parent.swt_widget, style(underscored_widget_name, styles), *extra_options)
+        @swt_widget.set_data('proxy', self)
         DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
         parent.post_initialize_child(self)
       end
@@ -176,44 +177,44 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
             end,
             :selection => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getSelection)
               }
             end,
             :selection_count => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
             end,
@@ -338,8 +339,8 @@ module Glimmer
 
       def can_handle_observation_request?(observation_request)
         observation_request = observation_request.to_s
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           SWTProxy.has_constant?(constant_name)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
@@ -357,6 +358,9 @@ module Glimmer
             @drag_source_proxy = nil
           end
         end
+      rescue => e
+        Glimmer::Config.logger&.debug(e.full_message)
+        false        
       end
 
       def can_handle_drop_observation_request?(observation_request)
@@ -372,8 +376,8 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
@@ -392,6 +396,17 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::WidgetExpression.new, &block)
       end
 
+      def method_missing(method, *args, &block)
+        swt_widget.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger&.debug "Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}"
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || swt_widget.respond_to?(method, *args, &block)
+      end
+
       private
 
       def style(underscored_widget_name, styles)
@@ -437,7 +452,7 @@ module Glimmer
       def add_listener(underscored_listener_name, &block)
         widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)        
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }        
+        safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }        
         listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
@@ -479,9 +494,9 @@ module Glimmer
             listener_class.define_method('initialize') do |event_method_block_mapping|
               @event_method_block_mapping = event_method_block_mapping
             end
-            listener_type.getMethods.each do |event_method|
-              listener_class.define_method(event_method.getName) do |event|
-                @event_method_block_mapping[event_method.getName]&.call(event)
+            listener_type.getMethods.each do |event_method|              
+              listener_class.define_method(event_method.getName) do |*args|
+                @event_method_block_mapping[event_method.getName]&.call(*args)
               end
             end
           end
@@ -492,7 +507,7 @@ module Glimmer
       def add_swt_event_listener(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
         @swt_widget.addListener(event_type, &safe_block)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
       end
@@ -579,7 +594,7 @@ module Glimmer
               end
               image_data = ImageData.new(value)
               # TODO in the future, look into unregistering this listener when no longer needed
-              on_event_Resize do |resize_event|
+              on_swt_Resize do |resize_event|
                 new_image_data = image_data.scaledTo(@swt_widget.getSize.x, @swt_widget.getSize.y)
                 @swt_widget.getBackgroundImage&.dispose
                 @swt_widget.setBackgroundImage(Image.new(@swt_widget.getDisplay, new_image_data))

data/lib/glimmer/ui/custom_shell.rb

@@ -8,6 +8,7 @@ module Glimmer
 
       def initialize(parent, *swt_constants, options, &content)
         super
+        @swt_widget.set_data('custom_shell', self)
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
       end
 

data/lib/glimmer/ui/custom_widget.rb

@@ -134,8 +134,9 @@ module Glimmer
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
         @body_root = instance_exec(&body_block)
-        execute_hooks('after_body')
         @swt_widget = @body_root.swt_widget
+        @swt_widget.set_data('custom_widget', self)
+        execute_hooks('after_body')
       end
       
       def can_handle_observation_request?(observation_request)
@@ -159,7 +160,7 @@ module Glimmer
       end
 
       def can_add_observer?(attribute_name)
-        has_instance_method?(attribute_name) || respond_to?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
+        has_instance_method?(attribute_name) || has_instance_method?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
       end
 
       def add_observer(observer, attribute_name)
@@ -171,12 +172,12 @@ module Glimmer
       end
 
       def has_attribute?(attribute_name, *args)
-        respond_to?(attribute_setter(attribute_name), args) ||
+        has_instance_method?(attribute_setter(attribute_name)) ||
           @body_root.has_attribute?(attribute_name, *args)
       end
 
       def set_attribute(attribute_name, *args)
-        if respond_to?(attribute_setter(attribute_name), args)
+        if has_instance_method?(attribute_setter(attribute_name))
           send(attribute_setter(attribute_name), *args)
         else
           @body_root.set_attribute(attribute_name, *args)
@@ -186,6 +187,7 @@ module Glimmer
       # This method ensures it has an instance method not coming from Glimmer DSL
       def has_instance_method?(method_name)
         respond_to?(method_name) && 
+          !swt_widget.respond_to?(method_name) &&
           !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') && 
           !method(method_name)&.source_location&.first&.include?('glimmer/swt/widget_proxy.rb')
       end
@@ -202,7 +204,6 @@ module Glimmer
         "#{attribute_name}="
       end
 
-
       def has_style?(style)
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
@@ -231,7 +232,8 @@ module Glimmer
       def method_missing(method, *args, &block)
         body_root.send(method, *args, &block)
       end
-      
+
+      alias local_respond_to? respond_to?      
       def respond_to?(method, *args, &block)
         super or
           body_root.respond_to?(method, *args, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement