glimmer-dsl-swt 4.18.4.10 → 4.18.5.3

data/lib/glimmer/data_binding/widget_binding.rb

@@ -32,36 +32,30 @@ module Glimmer
       include Observer
 
       attr_reader :widget, :property
-      def initialize(widget, property, translator = nil, sync_exec: false, async_exec: false)
+      def initialize(widget, property, sync_exec: nil, async_exec: nil)
         @widget = widget
         @property = property
-        @translator = translator || proc {|value| value} #TODO check on this it doesn't seem used
         @sync_exec = sync_exec
         @async_exec = async_exec
-
-        if @widget.respond_to?(:on_widget_disposed)
-          @widget.on_widget_disposed do |dispose_event|
-            unregister_all_observables
+        SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @sync_exec, override_async_exec: @async_exec) do
+          if @widget.respond_to?(:on_widget_disposed)
+            @widget.on_widget_disposed do |dispose_event|
+              unregister_all_observables
+            end
           end
         end
       end
       
       def call(value)
-        converted_value = translated_value = @translator.call(value)
-      
-        update_operation = lambda do
+        SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @sync_exec, override_async_exec: @async_exec) do
           if @widget.respond_to?(:disposed?) && @widget.disposed?
             unregister_all_observables
             return
           end
-          @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
-        end
-        if @sync_exec || Config.auto_sync_exec? && Config.require_sync_exec?
-          SWT::DisplayProxy.instance.sync_exec(&update_operation)
-        elsif @async_exec
-          SWT::DisplayProxy.instance.async_exec(&update_operation)
-        else
-          update_operation.call
+          # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
+          unless ((value == evaluate_property) rescue false) # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
+            @widget.set_attribute(@property, value)
+          end
         end
       end
       
@@ -70,16 +64,7 @@ module Glimmer
           unregister_all_observables
           return
         end
-        read_operation = lambda do
-          @widget.get_attribute(@property)
-        end
-        if @sync_exec || Config.auto_sync_exec? && Config.require_sync_exec?
-          SWT::DisplayProxy.instance.sync_exec(&read_operation)
-        elsif @async_exec
-          SWT::DisplayProxy.instance.async_exec(&read_operation)
-        else
-          read_operation.call
-        end
+        @widget.get_attribute(@property)
       end
     end
   end

data/lib/glimmer/dsl/swt/{file_dialog_expression.rb → auto_exec_expression.rb}

@@ -20,28 +20,16 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
-require 'glimmer/dsl/top_level_expression'
-require 'glimmer/swt/file_dialog_proxy'
+require 'glimmer/dsl/swt/exec_expression'
 
 module Glimmer
   module DSL
     module SWT
-      class FileDialogExpression < StaticExpression
-        include TopLevelExpression
-        include ParentExpression
-        
-        include_package 'org.eclipse.swt.widgets'
-
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'file_dialog' and
-            (parent.nil? or parent.is_a?(Shell) or parent.is_a?(Glimmer::SWT::ShellProxy))
-        end
-  
-        def interpret(parent, keyword, *args, &block)
-          args = [parent] + args unless parent.nil?
-          Glimmer::SWT::FileDialogProxy.send(:new, *args)
-        end
+      # Automatically executes code block against the SWT Event Loop
+      # with sync_exec if needed (inside a thread other than GUI thread)
+      # to manipulate SWT UI objects on the UI thread safely
+      class AutoExecExpression < StaticExpression
+        include ExecExpression
       end
     end
   end

data/lib/glimmer/dsl/swt/checkbox_group_selection_data_binding_expression.rb

@@ -22,6 +22,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/widget_binding'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -36,23 +37,25 @@ module Glimmer
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_options_property.is_a?(Array)
         end
-  
+
         def interpret(parent, keyword, *args, &block)
           model_binding = args[0]
   
           #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
           # TODO consider delegating some of this work
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_options_property)
           model = model_binding.base_model
           widget_binding.observe(model, model_binding.options_property_name)
   
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_property)
-          widget_binding.observe(model, model_binding.property_name_expression)
+          widget_binding.observe(model_binding)
   
-          parent.on_widget_selected do
-            model_binding.call(widget_binding.evaluate_property)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec(override_sync_exec: model_binding.binding_options[:sync_exec], override_async_exec: model_binding.binding_options[:async_exec]) do
+            parent.on_widget_selected do
+              model_binding.call(widget_binding.evaluate_property)
+            end
           end
         end
       end

data/lib/glimmer/dsl/swt/color_expression.rb

@@ -32,7 +32,7 @@ module Glimmer
         include_package 'org.eclipse.swt.widgets'
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::ColorProxy.flyweight(*args)
+          Glimmer::SWT::ColorProxy.create(*args)
         end
       end
     end

data/lib/glimmer/dsl/swt/combo_selection_data_binding_expression.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
@@ -22,6 +22,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/widget_binding'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -44,21 +45,22 @@ module Glimmer
   
           #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
           # TODO consider delegating some of this work
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_options_property)
-          model = model_binding.base_model
-          widget_binding.observe(model, model_binding.options_property_name)
+          widget_binding.observe(model_binding.model, model_binding.options_property_name)
   
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'text')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'text', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_property)
-          widget_binding.observe(model, model_binding.property_name_expression)
+          widget_binding.observe(model_binding)
   
-          parent.on_widget_selected do
-            model_binding.call(widget_binding.evaluate_property)
-          end
-          
-          parent.on_modify_text do
-            model_binding.call(widget_binding.evaluate_property)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec(override_sync_exec: model_binding.binding_options[:sync_exec], override_async_exec: model_binding.binding_options[:async_exec]) do
+            parent.on_widget_selected do
+              model_binding.call(widget_binding.evaluate_property)
+            end
+            
+            parent.on_modify_text do
+              model_binding.call(widget_binding.evaluate_property)
+            end
           end
         end
       end

data/lib/glimmer/dsl/swt/custom_widget_expression.rb

@@ -46,11 +46,14 @@ module Glimmer
   
         def interpret(parent, keyword, *args, &block)
           options = args.last.is_a?(Hash) ? args.pop : {}
-          UI::CustomWidget.for(keyword).new(parent, *args, options, &block)
+          UI::CustomWidget.for(keyword).new(parent, *args, options, &block).tap do |new_custom_widget|
+            new_custom_widget.body_root.paint_pixel_by_pixel(&block) if block&.parameters&.count == 2
+          end
         end
   
         def add_content(parent, &block)
           # TODO consider avoiding source_location
+          return if block&.parameters&.count == 2
           if block.source_location == parent.content&.__getobj__.source_location
             parent.content.call(parent) unless parent.content.called?
           else

data/lib/glimmer/dsl/swt/data_binding_expression.rb

@@ -42,8 +42,7 @@ module Glimmer
   
         def interpret(parent, keyword, *args, &block)
           model_binding = args[0]
-          widget_binding_parameters = [parent, keyword, {async_exec: model_binding.binding_options[:async_exec], sync_exec: model_binding.binding_options[:sync_exec]}]
-          widget_binding = DataBinding::WidgetBinding.new(*widget_binding_parameters)
+          widget_binding = DataBinding::WidgetBinding.new(parent, keyword, sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_property)
           #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
           widget_binding.observe(model_binding)

data/lib/glimmer/dsl/swt/dialog_expression.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
@@ -23,24 +23,33 @@ require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/swt/shell_proxy'
+require 'glimmer/swt/dialog_proxy'
 
 module Glimmer
   module DSL
     module SWT
-      class DialogExpression < StaticExpression
+      class DialogExpression < Expression
         include TopLevelExpression
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'dialog' and
-            (parent.nil? or parent.is_a?(Glimmer::SWT::ShellProxy))
+          (
+            (keyword == 'dialog') or
+            (keyword.to_s.end_with?('dialog') and Glimmer::SWT::DialogProxy.dialog_class(keyword))
+          ) and
+            (parent.nil? or parent.is_a?(org.eclipse.swt.widgets.Shell) or parent.is_a?(Glimmer::SWT::ShellProxy))
         end
   
         def interpret(parent, keyword, *args, &block)
           # TODO reconcile this with the actual org.eclipse.swt.widgets.Dialog widget (maybe rename this as dialog_shell)
-          args = [parent] + args unless parent.nil?
-          args += [:dialog_trim, :application_modal]
-          Glimmer::SWT::ShellProxy.send(:new, *args)
+          if keyword == 'dialog'
+            args = [parent] + args unless parent.nil?
+            args += [:dialog_trim, :application_modal]
+            Glimmer::SWT::ShellProxy.new(*args)
+          else
+            args = [parent] + args unless parent.nil?
+            Glimmer::SWT::DialogProxy.new(keyword, *args)
+          end
         end
       end
     end

data/lib/glimmer/dsl/swt/dsl.rb

@@ -53,6 +53,7 @@ module Glimmer
           multiply
           property
           block_property
+          dialog
           widget
           custom_widget
           shape

data/lib/glimmer/dsl/swt/exec_expression.rb

@@ -41,7 +41,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::DisplayProxy.instance.swt_display.send(exec_operation, *args) do |*args|
+          Glimmer::SWT::DisplayProxy.instance.send(exec_operation, *args) do |*args|
             begin
               block.call(*args)
             rescue => e

data/lib/glimmer/dsl/swt/font_expression.rb

@@ -37,7 +37,7 @@ module Glimmer
             (parent.nil? || !parent.respond_to?('font')) and
             !parent.is_a?(Glimmer::SWT::Custom::Shape) and
             args.size == 1 and
-            args.first.is_a?(Hash)
+            (args.first.is_a?(Hash) || args.first.is_a?(org.eclipse.swt.graphics.FontData))
         end
   
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/dsl/swt/image_expression.rb

@@ -34,17 +34,31 @@ module Glimmer
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.last : {}
           (keyword == 'image') and
-            (parent.nil? or parent.respond_to?('image=') or args.first.is_a?(Numeric))
+            (
+              options.keys.include?(:top_level) or
+              (
+                !parent.is_a?(Glimmer::SWT::Custom::Shape) and
+                (parent.nil? or parent.respond_to?('image=') or args.first.is_a?(Numeric))
+              )
+            )
         end
   
         def interpret(parent, keyword, *args, &block)
           options = args.last.is_a?(Hash) ? args.last : {}
+          coordinate_args = args.size == (options.empty? ? 2 : 3)
           args.unshift(parent) unless parent.nil? || options[:top_level]
-          Glimmer::SWT::ImageProxy.new(*args, &block)
+          @create_pixel_by_pixel = coordinate_args && block&.parameters&.count == 2
+          if @create_pixel_by_pixel
+            Glimmer::SWT::ImageProxy.create_pixel_by_pixel(*args, &block)
+          else
+            Glimmer::SWT::ImageProxy.create(*args, &block)
+          end
         end
 
         def add_content(parent, &block)
+          return if @create_pixel_by_pixel || block&.parameters&.count == 2
           super
           parent.post_add_content
         end

data/lib/glimmer/dsl/swt/list_selection_data_binding_expression.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
@@ -23,6 +23,7 @@ require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/widget_binding'
 require 'glimmer/data_binding/list_selection_binding'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -42,7 +43,7 @@ module Glimmer
   
         def interpret(parent, keyword, *args, &block)
           model_binding = args[0]
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_options_property)
           model = model_binding.base_model
           #TODO make this options observer dependent and all similar observers in widget specific data binding interpretrs
@@ -50,13 +51,15 @@ module Glimmer
   
           property_type = :string
           property_type = :array if parent.has_style?(:multi)
-          list_selection_binding = DataBinding::ListSelectionBinding.new(parent, property_type)
+          list_selection_binding = DataBinding::ListSelectionBinding.new(parent, property_type, sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           list_selection_binding.call(model_binding.evaluate_property)
           #TODO check if nested data binding works for list widget and other widgets that need custom data binding
-          list_selection_binding.observe(model, model_binding.property_name_expression)
+          list_selection_binding.observe(model_binding)
   
-          parent.on_widget_selected do
-            model_binding.call(list_selection_binding.evaluate_property)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec(override_sync_exec: model_binding.binding_options[:sync_exec], override_async_exec: model_binding.binding_options[:async_exec]) do
+            parent.on_widget_selected do
+              model_binding.call(list_selection_binding.evaluate_property)
+            end
           end
         end
       end

data/lib/glimmer/dsl/swt/pixel_expression.rb

@@ -30,7 +30,7 @@ module Glimmer
       class PixelExpression < StaticExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::Custom::Shape.new(parent, 'point', *args, &block)
+          Glimmer::SWT::Custom::Shape.new(parent, 'pixel', *args, &block)
         end
       end
     end

data/lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb

@@ -22,6 +22,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/widget_binding'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module DSL
@@ -42,18 +43,20 @@ module Glimmer
   
           #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
           # TODO consider delegating some of this work
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_options_property)
           model = model_binding.base_model
           widget_binding.observe(model, model_binding.options_property_name)
   
-          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection')
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection', sync_exec: model_binding.binding_options[:sync_exec], async_exec: model_binding.binding_options[:async_exec])
           widget_binding.call(model_binding.evaluate_property)
-          widget_binding.observe(model, model_binding.property_name_expression)
+          widget_binding.observe(model_binding)
   
           raise(Glimmer::Error, "No radios found! Make sure radio selection is data-bound to a property having property_options as non-empty array!") if parent.items.empty?
-          parent.on_widget_selected do
-            model_binding.call(widget_binding.evaluate_property)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec(override_sync_exec: model_binding.binding_options[:sync_exec], override_async_exec: model_binding.binding_options[:async_exec]) do
+            parent.on_widget_selected do
+              model_binding.call(widget_binding.evaluate_property)
+            end
           end
         end
       end