glimmer-dsl-swt 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d54a8793938853e74eb207e159ce6ab3f856ac57f737a3bd28990f5e52a745d
-  data.tar.gz: a28121a29d1a123b056d121642bf70acd12891c428bdda8602caa2cf7157df35
+  metadata.gz: c4290c2587a5d74bdbd39df1e1459219628abd0f867df9c972ec766d1581e786
+  data.tar.gz: a422f8c8f1cad97b8c59f72eefdbdac2bfab5076e45b4d99bacbea063f683897
 SHA512:
-  metadata.gz: 21a850f6805c1cc2f129bdc91c09c7a8b336ce81640311af63040c8168d535ab68fb91cb53bf0a8421ec38d1daab94b9a835eec209e2685e1702ca3e91b51af8
-  data.tar.gz: 3044e95046bbda195c0ecd736ff30097ab6dadf660093d317d86d92c46f1bdf16dc669f944a9a62b398fa2f27697572290f4df9caffb8825c6b61a8f0ff2fea1
+  metadata.gz: cfe72e5b9043ca482199ebcdb21ce5dfb3bcf5106b4adf2d1f5928d195b9ae99fbd1cd10b120ec14901052121a3cb82e5e45a203e235daaf2bd29addc6e29f60
+  data.tar.gz: 9f1d1bd197e61a8a462f5afc8d84466b0a595f0ab225999571d9fb22c8f00e078928a675a4474fde34c1274aaac252c4d23f7c7fcd38fea155a0cac8e6769767

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.6.2 (Desktop GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.6.3 (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.6.2
+0.6.3

data/bin/girb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 trap "SIGINT" do
   # No Op for irb

data/bin/glimmer

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 require_relative '../lib/glimmer/launcher'
 

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

@@ -16,7 +16,15 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           potential_parent = args.first
-          parent = args.shift if potential_parent.is_a?(Shell) || (potential_parent.respond_to?(:swt_widget) && potential_parent.swt_widget.is_a?(Shell))
+          potential_parent = potential_parent.swt_widget if potential_parent.respond_to?(:swt_widget)
+          parent = nil          
+          if potential_parent.is_a?(Shell)
+            args.shift
+            parent = potential_parent
+          elsif potential_parent.is_a?(Widget)
+            args.shift
+            parent = potential_parent.shell
+          end
           Glimmer::SWT::MessageBoxProxy.new(parent, Glimmer::SWT::SWTProxy[args])
         end
       end

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

@@ -17,13 +17,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          begin
-            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
-            widget_class = Glimmer::SWT.const_get(class_name)
-          rescue
-            widget_class = Glimmer::SWT::WidgetProxy
-          end
-          widget_class.new(keyword, parent, args)
+          Glimmer::SWT::WidgetProxy.create(keyword, parent, args)
         end
         
         def add_content(parent, &block)

data/lib/glimmer/launcher.rb

@@ -13,7 +13,7 @@ module Glimmer
     
       When a task is specified, it runs via rake. Some tasks take arguments in square brackets.
     
-      Available tasks are below (you may also lookup by adding `require 'glimmer/rake_task'` in Rakefile and running rake -T):
+      Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
     MULTI_LINE_STRING
 
     TEXT_USAGE_SUFFIX = <<~MULTI_LINE_STRING
@@ -96,6 +96,10 @@ module Glimmer
           devmode_require = '-r puts_debuggerer '
         end
         rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
+         
+        # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
+        application = 'package[msi]' if application == 'packages'
+        
         potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
         application = potential_rake_task_parts[1]
         rake_task_args = potential_rake_task_parts[2].split(',')

data/lib/glimmer/package.rb

@@ -6,6 +6,7 @@ module Glimmer
   module Package
     class << self
       attr_accessor :javapackager_extra_args
+      alias jpackage_extra_args :javapackager_extra_args
       
       def clean
         require 'fileutils'
@@ -42,14 +43,15 @@ module Glimmer
       end
       
       def lock_jars
-        puts 'Locking JARs with jar-dependencies...'
-        command = "lock_jars --vendor-dir vendor"
+        puts 'Locking gem jar-dependencies by downloading & storing in vendor/jars...'
+        FileUtils.mkdir_p('vendor/jars')
+        command = "lock_jars --vendor-dir vendor/jars"
         puts command
         system command      
       end
       
-      def native(native_type=nil)
-        puts "Generating native executable with javapackager..."
+      def native(native_type=nil, native_extra_args)
+        puts "Generating native executable with javapackager/jpackage..."
         require 'facets/string/titlecase'
         require 'facets/string/underscore'
         project_name = File.basename(File.expand_path('.'))
@@ -59,13 +61,28 @@ module Glimmer
         license = (File.read(license_file).strip if File.exists?(license_file) && File.file?(license_file)) rescue nil
         copyright = license.split("\n").first
         human_name = project_name.underscore.titlecase
-        command = "javapackager -deploy -native #{native_type} -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" -BinstalldirChooser=true -Bvendor=\"#{human_name}\" -Bwin.menuGroup=\"#{human_name}\" -BsystemWide=#{OS.mac?} "
-        command += " -BjvmOptions=-XstartOnFirstThread " if OS.mac?
-        command += " -BappVersion=#{version} -Bmac.CFBundleVersion=#{version} " if version
-        command += " -srcfiles LICENSE.txt -BlicenseFile=LICENSE.txt " if license
-        command += " -Bcopyright=\"#{copyright}\" " if copyright
+        icon = "package/#{OS.mac? ? 'macosx' : 'windows'}/#{human_name}.#{OS.mac? ? 'icns' : 'ico'}"
+        if (`javapackager`.to_s.include?('Usage: javapackager') rescue nil)
+          command = "javapackager -deploy -native #{native_type} -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" -BinstalldirChooser=true -Bvendor=\"#{human_name}\" -Bwin.menuGroup=\"#{human_name}\" "
+          command += " -BsystemWide=false " if OS.windows?
+          command += " -BjvmOptions=-XstartOnFirstThread " if OS.mac?
+          command += " -BappVersion=#{version} -Bmac.CFBundleVersion=#{version} " if version
+          command += " -srcfiles LICENSE.txt -BlicenseFile=LICENSE.txt " if license
+          command += " -Bcopyright=\"#{copyright}\" " if copyright
+        elsif (`jpackage`.to_s.include?('Usage: jpackage') rescue nil)
+          command = "jpackage --type #{native_type} --dest 'packages/bundles' --input 'dist' --main-class JarMain --main-jar '#{project_name}.jar' --name '#{human_name}' --vendor '#{human_name}' --icon '#{icon}' "
+          command += " --win-per-user-install --win-dir-chooser --win-menu --win-menu-group '#{human_name}' " if OS.windows?
+          command += " --java-options '-XstartOnFirstThread' --mac-package-name '#{human_name}' --mac-package-identifier 'org.#{project_name}.application.#{project_name}' " if OS.mac?
+          command += " --app-version \"#{version}\" " if version
+          command += " --license-file LICENSE.txt " if license
+          command += " --copyright \"#{copyright}\" " if copyright
+        else
+          puts "Neither javapackager nor jpackage exist in your Java installation. Please ensure javapackager or jpackage is available in PATH environment variable."
+          return
+        end
         command += " #{javapackager_extra_args} " if javapackager_extra_args
         command += " #{ENV['JAVAPACKAGER_EXTRA_ARGS']} " if ENV['JAVAPACKAGER_EXTRA_ARGS']
+        command += " #{native_extra_args} " if native_extra_args
         puts command
         system command      
       end

data/lib/glimmer/rake_task.rb

@@ -24,18 +24,19 @@ namespace :glimmer do
       Glimmer::Package.lock_jars
     end
 
-    desc 'Generate Native files (DMG/PKG/APP on the Mac, MSI/EXE/IMAGE on Windows, RPM/DEB on Linux) (type is optional)'
+    desc 'Generate Native files. type can be dmg/pkg on the Mac, msi/exe on Windows, and rpm/deb on Linux (type is optional)'
     task :native, [:type] do |t, args|
-      Glimmer::Package.native(args[:type])
+      extra_args = ARGV.partition {|arg| arg.include?('package:native')}.last.to_a.join(' ')
+      Glimmer::Package.native(args[:type], extra_args)
     end
   end
 
   desc 'Package app for distribution (generating config, jar, and native files) (type is optional)'
   task :package, [:type] do |t, args|
+    Rake::Task['gemspec:generate'].execute
+    Rake::Task['glimmer:package:lock_jars'].execute
     Rake::Task['glimmer:package:config'].execute
     Rake::Task['glimmer:package:jar'].execute
-    Rake::Task['glimmer:package:lock_jars'].execute
-    Rake::Task['gemspec:generate'].execute
     Rake::Task['glimmer:package:native'].execute(args)
   end
 

data/lib/glimmer/scaffold.rb

@@ -73,7 +73,8 @@ class Scaffold
       
       # Glimmer
       dist
-      packages      
+      packages
+      vendor/jars
     MULTI_LINE_STRING
 
     GEMFILE = <<~MULTI_LINE_STRING
@@ -109,7 +110,6 @@ class Scaffold
     MULTI_LINE_STRING
 
     def app(app_name)
-      return puts('Namespace is required! Usage: glimmer scaffold:custom_shell_gem[custom_shell_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
       gem_name = file_name(app_name)
       gem_summary = human_name(app_name)
       system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
@@ -127,17 +127,22 @@ class Scaffold
       mkdir 'app/models'
       mkdir 'app/views'
       custom_shell('AppView', current_dir_name, :app)
-      if OS::Underlying.windows?
-        mkdir_p 'package/windows'
-        icon_file = "package/windows/#{human_name(app_name)}.ico"
-        cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      elsif OS.mac?
-        mkdir_p 'package/macosx'
-        icon_file = "package/macosx/#{human_name(app_name)}.icns"
-        cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      end
+        
+      mkdir_p 'package/windows'
+      icon_file = "package/windows/#{human_name(app_name)}.ico"
+      cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
+      mkdir_p 'package/macosx'
+      icon_file = "package/macosx/#{human_name(app_name)}.icns"
+      cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+    
+      mkdir_p 'package/linux'
+      icon_file = "package/linux/#{human_name(app_name)}.png"
+      cp File.expand_path('../../../icons/scaffold_app.png', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+    
       mkdir 'bin'
       write "bin/#{file_name(app_name)}", app_bin_file(app_name)
       write 'spec/spec_helper.rb', spec_helper_file
@@ -147,9 +152,12 @@ class Scaffold
         system "\"packages/bundles/#{human_name(app_name)}/#{human_name(app_name)}.exe\""
       else
         system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-        system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app" if OS.mac?
+        if OS.mac?
+          system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app"
+        else
+          system "glimmer bin/#{file_name(app_name)}"
+        end
       end
-      # TODO generate rspec test suite
     end
 
     def custom_shell(custom_shell_name, namespace, shell_type = nil)
@@ -169,13 +177,13 @@ class Scaffold
     end
 
     def custom_shell_gem(custom_shell_name, namespace)
-      return puts('Namespace is required! Usage: glimmer scaffold:custom_shell_gem[custom_shell_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
       gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
       gem_summary = "#{human_name(custom_shell_name)} - Glimmer Custom Shell"
       if namespace
         gem_name += "-#{compact_name(namespace)}"
         gem_summary += " (#{human_name(namespace)})"
       else
+        return puts('Namespace is required! Usage: glimmer scaffold:gem:customshell[name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
         namespace = 'glimmer'
       end
       system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
@@ -194,24 +202,33 @@ class Scaffold
       write "bin/#{file_name(custom_shell_name)}", gem_bin_command_file(gem_name)
       FileUtils.chmod 0755, "bin/#{file_name(custom_shell_name)}"
       write 'spec/spec_helper.rb', spec_helper_file
-      if OS::Underlying.windows?
-        mkdir_p 'package/windows'
-        icon_file = "package/windows/#{human_name(custom_shell_name)}.ico"
-        cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      elsif OS.mac?
-        mkdir_p 'package/macosx'
-        icon_file = "package/macosx/#{human_name(custom_shell_name)}.icns"
-        cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      end
+
+      mkdir_p 'package/windows'
+      icon_file = "package/windows/#{human_name(custom_shell_name)}.ico"
+      cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+        
+      mkdir_p 'package/macosx'
+      icon_file = "package/macosx/#{human_name(custom_shell_name)}.icns"
+      cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
+      mkdir_p 'package/linux'
+      icon_file = "package/linux/#{human_name(custom_shell_name)}.png"
+      cp File.expand_path('../../../icons/scaffold_app.png', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
       if OS.windows?
         system "bundle"
         system "glimmer package[image]"
         system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
       else
         system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-        system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
+        if OS.mac?
+          system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
+        else
+          system "bin/#{file_name(custom_shell_name)}"
+        end        
       end
       puts "Finished creating #{gem_name} Ruby gem."
       puts 'Edit Rakefile to configure gem details.'
@@ -344,7 +361,7 @@ class Scaffold
 
     def gem_bin_command_file(gem_name)
       <<~MULTI_LINE_STRING
-        #!/usr/bin/env ruby
+        #!/usr/bin/env jruby
         
         require 'glimmer/launcher'
         
@@ -489,7 +506,7 @@ class Scaffold
           menu {
             text '&File'
             menu_item {
-              text 'Preferences...'
+              text '&Preferences...'
               on_widget_selected {
                 display_preferences_dialog
               }

data/lib/glimmer/swt/display_proxy.rb

@@ -35,16 +35,26 @@ module Glimmer
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
       end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
+      end      
 
       def method_missing(method, *args, &block)
-        swt_display.send(method, *args, &block)
+        if can_handle_observation_request?(method)
+          handle_observation_request(method, &block)
+        else
+          swt_display.send(method, *args, &block)
+        end
       rescue => e
         Glimmer::Config.logger.debug {"Neither DisplayProxy nor #{swt_display.class.name} can handle the method ##{method}"}
         super
       end
       
       def respond_to?(method, *args, &block)
-        super || swt_display.respond_to?(method, *args, &block)
+        super || 
+          can_handle_observation_request?(method) ||        
+          swt_display.respond_to?(method, *args, &block)
       end
 
       def can_handle_observation_request?(observation_request)
@@ -61,6 +71,7 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
+        observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)

data/lib/glimmer/swt/message_box_proxy.rb

@@ -14,16 +14,22 @@ module Glimmer
       attr_reader :swt_widget
       
       def initialize(parent, style)
-        parent = parent.swt_widget if parent.respond_to?(:swt_widget) && parent.swt_widget.is_a?(Shell)
-        @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget if parent.nil?
-        @swt_widget = MessageBox.new(parent, style)
+        if parent.nil?
+          @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
+        end
+        @swt_widget = MessageBox.new(parent, style)        
       end
       
       def open
-        @swt_widget.open
-        @temporary_parent&.dispose
+        @swt_widget.open.tap do |result|
+          @temporary_parent&.dispose
+        end
       end
       
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::MessageBoxExpression.new, &block)
+      end            
+      
       # TODO refactor the following methods to put in a JavaBean mixin or somethin (perhaps contribute to OSS project too)
       
       def attribute_setter(attribute_name)
@@ -44,6 +50,18 @@ module Glimmer
 
       def get_attribute(attribute_name)
         @swt_widget.send(attribute_getter(attribute_name))
+      end
+      
+      def method_missing(method, *args, &block)
+        swt_widget.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger.debug {"Neither MessageBoxProxy 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      
     end
   end

data/lib/glimmer/swt/table_proxy.rb

@@ -85,7 +85,55 @@ module Glimmer
                 }
                 table_editor_widget_proxy
               end,
-            }
+            },
+            checkbox: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                checkbox(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            },
+            radio: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                radio(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            }            
           }      
         end
       end
@@ -276,7 +324,7 @@ module Glimmer
           new_value = @table_editor_widget_proxy&.swt_widget&.send(widget_value_property)
           if table_item.isDisposed
             @cancel_edit.call
-          elsif new_value && !action_taken && !@edit_in_progress && !@cancel_in_progress
+          elsif !new_value.nil? && !action_taken && !@edit_in_progress && !@cancel_in_progress
             action_taken = true
             @edit_in_progress = true
             if new_value == model.send(model_editing_property)

data/lib/glimmer/swt/widget_proxy.rb

@@ -67,18 +67,45 @@ module Glimmer
           group.setLayout(GridLayout.new)
         end,
       }
+      
+      class << self
+        def create(keyword, parent, args)
+          widget_proxy_class(keyword).new(keyword, parent, args)
+        end
+        
+        def widget_proxy_class(keyword)
+          begin
+            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
+            Glimmer::SWT.const_get(class_name)
+          rescue
+            Glimmer::SWT::WidgetProxy
+          end        
+        end
+        
+        def underscored_widget_name(swt_widget)
+          swt_widget.class.name.split(/::|\./).last.underscore        
+        end
+      end
 
       attr_reader :parent_proxy, :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
 
       # Initializes a new SWT Widget
       #
       # Styles is a comma separate list of symbols representing SWT styles in lower case
-      def initialize(underscored_widget_name, parent, args)
-        @parent_proxy = parent
-        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_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
-        @swt_widget.set_data('proxy', self)
+      def initialize(*init_args, swt_widget: nil)      
+        if swt_widget.nil?
+          underscored_widget_name, parent, args = init_args
+          @parent_proxy = parent
+          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_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
+        else
+          @swt_widget = swt_widget
+          underscored_widget_name = self.class.underscored_widget_name(@swt_widget)
+          parent_proxy_class = self.class.widget_proxy_class(self.class.underscored_widget_name(@swt_widget.parent))
+          @parent_proxy = parent_proxy_class.new(swt_widget: swt_widget.parent)
+        end
+        @swt_widget.set_data('proxy', self)          
         DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
         @parent_proxy.post_initialize_child(self)
       end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   name: puts_debuggerer
   type: :runtime
   prerelease: false
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -309,6 +309,7 @@ files:
 - bin/glimmer
 - icons/scaffold_app.icns
 - icons/scaffold_app.ico
+- icons/scaffold_app.png
 - lib/ext/glimmer.rb
 - lib/ext/glimmer/config.rb
 - lib/glimmer-dsl-swt.rb