glimmer-dsl-opal 0.28.0 → 0.29.0

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -56,7 +56,7 @@ module Glimmer
         old_item_ids_per_model = old_items.reduce({}) {|hash, item| hash.merge(item.get_data.hash => item.id) }
         parent.remove_all
         model_collection.each do |model|
-          table_item = Glimmer::SWT::TableItemProxy.new(parent)
+          table_item = Glimmer::SWT::TableItemProxy.new(parent, [], nil)
           for index in 0..(column_properties.size-1)
             table_item.set_text(index, model.send(column_properties[index]).to_s)
           end

data/lib/glimmer/dsl/opal/async_exec_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/bind_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/block_property_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/checkbox_group_selection_data_binding_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/color_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/custom_widget_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -52,7 +52,7 @@ module Glimmer
           # TODO clean code by extracting methods into CustomShell
           if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)
             if Glimmer::SWT::DisplayProxy.instance.shells.empty? || Glimmer::SWT::DisplayProxy.open_custom_shells_in_current_window?
-              custom_widget_class.new(parent, *args, {}, &block)
+              custom_widget_class.new(parent, args, {}, &block)
             else
               options = args.last.is_a?(Hash) ? args.pop : {}
               options = options.merge('swt_style' => args.join(',')) unless args.join(',').empty?
@@ -75,7 +75,7 @@ module Glimmer
               # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
               Glimmer::SWT::MakeShiftShellProxy.new
             else
-              custom_widget_class&.new(parent, *args, {}, &block)
+              custom_widget_class&.new(parent, args, {}, &block)
             end
           end
         end

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

@@ -26,7 +26,7 @@ module Glimmer
           #TODO make this options observer dependent and all similar observers in element specific data binding handlers
           element_binding.observe(model_binding)
           # TODO simplify this logic and put it where it belongs
-          parent.add_observer(model_binding, keyword) if parent.respond_to?(:add_observer, [model_binding, keyword])
+          parent.add_observer(model_binding, keyword) if parent.respond_to?(:add_observer)
         end
       end
     end

data/lib/glimmer/dsl/opal/dialog_expression.rb

@@ -12,7 +12,7 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           parent = args.delete_at(0)
-          Glimmer::SWT::DialogProxy.new(parent, args)
+          Glimmer::SWT::DialogProxy.new(parent, args, block)
         end
       end
     end

data/lib/glimmer/dsl/opal/display_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/dsl.rb

@@ -31,6 +31,7 @@ require 'glimmer/dsl/opal/dialog_expression'
 require 'glimmer/dsl/opal/shape_expression'
 require 'glimmer/dsl/opal/shine_data_binding_expression'
 require 'glimmer/dsl/opal/shape_expression'
+require 'glimmer/dsl/opal/image_expression'
 
 module Glimmer
   module DSL
@@ -47,6 +48,7 @@ module Glimmer
          checkbox_group_selection_data_binding
          data_binding
          font
+         image
          layout
          block_property
          property

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/font_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/image_expression.rb

@@ -0,0 +1,64 @@
+# Copyright (c) 2020-2022 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/dsl/expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/image_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      # image expression
+      # Note: Cannot be a static expression because it clashes with image property expression
+      class ImageExpression < Expression
+        include TopLevelExpression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.last : {}
+          (
+            (keyword == 'image') and
+            (
+              options.keys.include?(:top_level) or
+              (
+                !parent.is_a?(Glimmer::SWT::Custom::Shape) &&
+                !parent.is_a?(Glimmer::SWT::CanvasProxy)
+              )
+            )
+          )
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+#           options = args.last.is_a?(Hash) ? args.last : {}
+#           args.unshift(parent) unless parent.nil? || options[:top_level]
+          Glimmer::SWT::ImageProxy.create(*args, &block)
+        end
+
+        def add_content(parent, keyword, *args, &block)
+          return if @create_pixel_by_pixel || block&.parameters&.count == 2
+          super(parent, keyword, *args, &block)
+          parent.post_add_content
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/opal/menu_bar_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/menu_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -48,7 +48,7 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          super(parent, &block)
+          super(parent, keyword, *args, &block)
           parent.post_add_content
         end
         

data/lib/glimmer/dsl/opal/message_box_expression.rb

@@ -12,7 +12,7 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           parent = args.delete_at(0) if !textual?(args.first)
-          Glimmer::SWT::MessageBoxProxy.new(parent, args)
+          Glimmer::SWT::MessageBoxProxy.new(parent, args, block)
         end
       end
     end

data/lib/glimmer/dsl/opal/property_expression.rb

@@ -1,16 +1,15 @@
 require 'glimmer/dsl/expression'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module DSL
     module Opal
       class PropertyExpression < StaticExpression
-        include TopLevelExpression
-
         def can_interpret?(parent, keyword, *args, &block)
           parent and
             (!args.empty?) and
             parent.respond_to?(:set_attribute) and
-            parent.respond_to?(keyword, *args) and
+            parent.respond_to?(keyword) and
             keyword and
             block.nil?
         end

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/rgb_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/rgba_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/shape_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,6 +22,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/canvas_proxy'
 require 'glimmer/swt/custom/shape'
 
 module Glimmer
@@ -31,9 +32,10 @@ module Glimmer
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
-          (parent.is_a?(Glimmer::SWT::WidgetProxy) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
-            Glimmer::SWT::Custom::Shape.valid?(parent, keyword, args, &block) &&
-            (keyword != 'text' || args.size >= 3)
+          # TODO consider parent as WidgetProxy too just like SWT
+          (parent.is_a?(Glimmer::SWT::CanvasProxy) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
+            Glimmer::SWT::Custom::Shape.valid?(parent, keyword, args, &block) and
+            ((keyword != 'text' && keyword != 'image') || args.size >= 3 || (args.empty? && block_given?))
         end
         
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/dsl/opal/shell_expression.rb

@@ -23,12 +23,12 @@ module Glimmer
             # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
             Glimmer::SWT::MakeShiftShellProxy.new
           else
-            Glimmer::SWT::ShellProxy.new(*args)
+            Glimmer::SWT::ShellProxy.new(args)
           end
         end
         
         def add_content(parent, keyword, *args, &block)
-          super(parent, &block)
+          super(parent, keyword, *args, &block)
           parent.post_add_content
         end
       end

data/lib/glimmer/dsl/opal/shine_data_binding_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/swt_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/sync_exec_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/dsl/opal/widget_expression.rb

@@ -22,7 +22,7 @@ module Glimmer
         
         def add_content(parent, keyword, *args, &block)
           if parent.rendered? || parent.skip_content_on_render_blocks?
-            super(parent, &block)
+            super(parent, keyword, *args, &block)
             parent.post_add_content
           else
             parent.add_content_on_render(&block)

data/lib/glimmer/engine.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/arrow_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,6 +25,12 @@ require 'glimmer/swt/button_proxy'
 module Glimmer
   module SWT
     class ArrowProxy < ButtonProxy
+      STYLE = <<~CSS
+        .arrow {
+          position: relative;
+        }
+      CSS
+      
       def initialize(parent, args, block)
         if args.to_a.include?(:left)
           @text = '<'

data/lib/glimmer/swt/button_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -79,12 +79,13 @@ module Glimmer
       def dom
         input_text = @text
         input_id = id
-        input_style = css
+        input_style = "min-width: 32px; min-height: 32px; #{css}"
         input_args = {}
         input_disabled = @enabled ? {} : {'disabled': 'disabled'}
         input_args = input_args.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 32px; min-height: 32px;').merge(input_disabled)) {
+          # TODO `:style` key is duplicated twice
+          button(input_args.merge(id: input_id, class: name, style: input_style).merge(input_disabled)) {
             input_text.to_s == '' ? ' ' : input_text
           }
         }.to_s

data/lib/glimmer/swt/c_combo_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/c_tab_folder_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/c_tab_item_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/checkbox_proxy.rb

@@ -57,10 +57,11 @@ module Glimmer
       def dom
         check_text = @text
         check_id = id
-        check_style = css
+        check_style = "min-width: 27px; #{css}"
         check_class = name
         check_selection = @selection
-        options = {type: 'checkbox', id: check_id, name: parent.id, style: check_style, class: check_class, value: check_text, style: 'min-width: 27px;'}
+        # TODO `:style` key is duplicated twice
+        options = {type: 'checkbox', id: check_id, name: parent.id, style: check_style, class: check_class, value: check_text}
         options[checked: 'checked'] if check_selection
         @dom ||= html {
           span {

data/lib/glimmer/swt/color_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/composite_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/control_editor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/checkbox_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/radio_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2022 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/arc.rb

@@ -0,0 +1,75 @@
+# Copyright (c) 2020-2022 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/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Arc < Shape
+          def parameter_names
+            [:x, :y, :width, :height, :start_angle, :arc_angle]
+          end
+        
+          def post_add_content
+            @performing_post_add_content = true
+            render
+            @performing_post_add_content = false
+          end
+          
+          def background=(value)
+            super(value)
+            self.foreground = value
+          end
+
+          def render(custom_parent_dom_element: nil, brand_new: false)
+            return unless @performing_post_add_content
+            the_parent_element = Native(`document.getElementById(#{parent.id})`)
+            params = { type: `Two.Types.svg` }
+            two = Native(`new Two(#{params})`)
+            two.appendTo(the_parent_element)
+            x = @args[0]
+            y = @args[1]
+            width = @args[2]
+            height = @args[3]
+            start_angle = -1*@args[4]
+            arc_angle = -1*@args[5]
+            end_angle = start_angle + arc_angle
+            rx = width / 2.0
+            ry = height / 2.0
+            cx = x + rx
+            cy = y + ry
+            arc = two.makeArcSegment(cx, cy, 0, ry, 2*`Math.PI`*(start_angle)/360.0, 2*`Math.PI`*(end_angle)/360.0);
+            arc.fill = background.to_css unless background.nil?
+            arc.stroke = foreground.to_css unless foreground.nil?
+            two.update
+          end
+                    
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,98 @@
+# Copyright (c) 2020-2022 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/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+require 'glimmer/swt/image_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Image < Shape
+          def parameter_names
+            if image_whole_parameter_names.size == @args.size
+              @parameter_names = image_whole_parameter_names
+            elsif image_part_parameter_names.size == @args.size
+              @parameter_names = image_part_parameter_names
+            end
+            @parameter_names || image_whole_parameter_names
+          end
+        
+          def possible_parameter_names
+            (image_whole_parameter_names + image_part_parameter_names).uniq
+          end
+          
+          def image_part_parameter_names
+            [:image, :src_x, :src_y, :src_width, :src_height, :dest_x, :dest_y, :dest_width, :dest_height]
+          end
+          
+          def image_whole_parameter_names
+            [:image, :x, :y]
+          end
+          
+          def set_parameter_attribute(attribute_name, *args)
+            if @parameter_names.to_a.map(&:to_s).include?(attribute_name.to_s)
+              super(attribute_name, *args)
+              build_dom
+              reattach(dom_element)
+              return
+            end
+            ####TODO refactor and improve this method through meta-programming (and share across other shapes)
+            if image_whole_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = image_whole_parameter_names
+            elsif image_part_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = image_part_parameter_names
+            end
+            super(attribute_name, *args)
+          end
+              
+          def reattach(old_element)
+            old_element.attr('href', Element[@dom].attr('href'))
+            old_element.attr('x', Element[@dom].attr('x'))
+            old_element.attr('y', Element[@dom].attr('y'))
+            old_element.attr('width', Element[@dom].attr('width'))
+            old_element.attr('height', Element[@dom].attr('height'))
+          end
+        
+          def element
+            'image'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            href = @args[0].is_a?(Glimmer::SWT::ImageProxy) ? @args[0].file_path : @args[0]
+            width = @args[0].is_a?(Glimmer::SWT::ImageProxy) ? @args[0].width : nil
+            height = @args[0].is_a?(Glimmer::SWT::ImageProxy) ? @args[0].height : nil
+            @dom ||= xml {
+              image(id: shape_id, class: shape_class, href: href, x: @args[1], y: @args[2], width: width, height: height)
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end