shoes-swt 4.0.0.pre3 → 4.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6157cdc9610526ffb063c6c08ee1a78d77d26e86
-  data.tar.gz: 29e9d0f9376d61eabcdafe9429e9c914bcd3aa99
+  metadata.gz: ffaed9c950057b7cfab0d611a0570dec0b604151
+  data.tar.gz: 2308581f63ff15b868167ce26cbb6d7898face7a
 SHA512:
-  metadata.gz: d357ec7854ea59d2746ad44a482e13be4d3f4f0a06bfb7fbf01e3d31da2046c3df97babfad75d4faa4bf0925dcf6716420c3c8d5c5e7bb7ecdce1d036fac278d
-  data.tar.gz: 517a9db8cd6880ffeeea32425604800879c1a9c02670e0d11e0a762643e193b49edd0f5542edcad802dd8e40c199aa562c4dcc952f4058067e2f71bc8a7289b9
+  metadata.gz: 93191af23b19fa9f015ac6803c2cb00facd3265ad85d84bef0278626f1f408fa441d2bafc5c26b721afe909935801324f10f04994588997db9a2d28d16bf55b6
+  data.tar.gz: c99eafcac01873724c545367dc5ff5ca21a4ab257bfc68ede4f919991dcb3d6b3561e3b454fde2bc78c5f39d086aa4949c25639bb1ccdba32b6b92071313bde0

data/bin/shoes-swt

@@ -2,10 +2,10 @@
 lib_directory = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << lib_directory
 
-if File.exists?("Gemfile")
+if File.exist?("Gemfile")
   require "bundler/setup"
   Bundler.require
 end
 
 require 'shoes/ui/cli'
-Shoes::CLI.new.run ARGV
+Shoes::CLI.new("swt").run ARGV

data/lib/shoes/swt.rb

@@ -41,81 +41,99 @@ class Shoes
       def self.display
         ::Swt::Widgets::Display.getCurrent
       end
+    end
+
+    def self.initialize_backend
+      return if @initialized
+      @initialized = true
 
       ::Swt::Widgets::Display.new.getFontList(nil, true).each { |f| ::Shoes::FONTS << f.getName }
       ::Shoes::FONTS.uniq!
+
+      ::Shoes.configuration.backend = :swt
+
+      require 'shoes/swt/disposed_protection'
+      require 'shoes/swt/click_listener'
+      require 'shoes/swt/color'
+      require 'shoes/swt/color_factory'
+      require 'shoes/swt/common/child'
+      require 'shoes/swt/common/remove'
+      require 'shoes/swt/common/clickable'
+      require 'shoes/swt/common/container'
+      require 'shoes/swt/common/fill'
+      require 'shoes/swt/common/resource'
+      require 'shoes/swt/common/painter'
+      require 'shoes/swt/common/painter_updates_position'
+      require 'shoes/swt/common/visibility'
+      require 'shoes/swt/common/selection_listener'
+      require 'shoes/swt/common/stroke'
+      require 'shoes/swt/common/update_position'
+
+      require 'shoes/swt/input_box'
+      require 'shoes/swt/rect_painter.rb'
+      require 'shoes/swt/swt_button'
+      require 'shoes/swt/check_button'
+      require 'shoes/swt/radio_group'
+      require 'shoes/swt/text_block/painter'
+
+      require 'shoes/swt/app'
+      require 'shoes/swt/animation'
+      require 'shoes/swt/arc'
+      require 'shoes/swt/background'
+      require 'shoes/swt/border'
+      require 'shoes/swt/button'
+      require 'shoes/swt/check'
+      require 'shoes/swt/dialog'
+      require 'shoes/swt/download'
+      require 'shoes/swt/font'
+      require 'shoes/swt/gradient'
+      require 'shoes/swt/image'
+      require 'shoes/swt/image_pattern'
+      require 'shoes/swt/key_listener'
+      require 'shoes/swt/line'
+      require 'shoes/swt/link'
+      require 'shoes/swt/link_segment'
+      require 'shoes/swt/list_box'
+      require 'shoes/swt/mouse_move_listener'
+      require 'shoes/swt/oval'
+      require 'shoes/swt/progress'
+      require 'shoes/swt/radio'
+      require 'shoes/swt/rect'
+      require 'shoes/swt/shape'
+      require 'shoes/swt/shoes_layout'
+      require 'shoes/swt/slot'
+      require 'shoes/swt/star'
+      require 'shoes/swt/sound'
+      require 'shoes/swt/text_block'
+      require 'shoes/swt/timer'
+
+      require 'shoes/swt/text_block/text_segment'
+      require 'shoes/swt/text_block/centered_text_segment'
+      require 'shoes/swt/text_block/text_segment_collection'
+      require 'shoes/swt/text_block/cursor_painter'
+      require 'shoes/swt/text_block/fitter'
+      require 'shoes/swt/text_block/text_font_factory'
+      require 'shoes/swt/text_block/text_style_factory'
+
+      require 'shoes/swt/packager'
+
+      require 'shoes/swt/tooling/leak_hunter' if ENV["LEAK_HUNTER"]
+
+      # redrawing aspect needs to know all the classes
+      require 'shoes/swt/redrawing_aspect'
+
+      @initialized = true
+    rescue Java::OrgEclipseSwt::SWTException => e
+      if e.message == "Invalid thread access"
+        puts "Ooops, we couldn't start properly. We'll try again."
+        puts ""
+        puts "To avoid this restarting behavior, try one of the following:"
+        puts "  * Use the shoes executable to start your app"
+        puts "  * Add JRUBY_OPTS='-J-XstartOnFirstThread' to your environment before starting."
+
+        `JRUBY_OPTS=-J-XstartOnFirstThread #{$0} #{ARGV.join(" ")}`
+        exit $?.exitstatus
+      end
     end
   end
 end
-
-Shoes.configuration.backend = :swt
-
-require 'shoes/swt/disposed_protection'
-require 'shoes/swt/click_listener'
-require 'shoes/swt/color'
-require 'shoes/swt/color_factory'
-require 'shoes/swt/common/child'
-require 'shoes/swt/common/remove'
-require 'shoes/swt/common/clickable'
-require 'shoes/swt/common/container'
-require 'shoes/swt/common/fill'
-require 'shoes/swt/common/resource'
-require 'shoes/swt/common/painter'
-require 'shoes/swt/common/painter_updates_position'
-require 'shoes/swt/common/visibility'
-require 'shoes/swt/common/selection_listener'
-require 'shoes/swt/common/stroke'
-require 'shoes/swt/common/update_position'
-
-require 'shoes/swt/input_box'
-require 'shoes/swt/rect_painter.rb'
-require 'shoes/swt/swt_button'
-require 'shoes/swt/check_button'
-require 'shoes/swt/radio_group'
-require 'shoes/swt/text_block/painter'
-
-require 'shoes/swt/app'
-require 'shoes/swt/animation'
-require 'shoes/swt/arc'
-require 'shoes/swt/background'
-require 'shoes/swt/border'
-require 'shoes/swt/button'
-require 'shoes/swt/check'
-require 'shoes/swt/dialog'
-require 'shoes/swt/download'
-require 'shoes/swt/font'
-require 'shoes/swt/gradient'
-require 'shoes/swt/image'
-require 'shoes/swt/image_pattern'
-require 'shoes/swt/key_listener'
-require 'shoes/swt/line'
-require 'shoes/swt/link'
-require 'shoes/swt/link_segment'
-require 'shoes/swt/list_box'
-require 'shoes/swt/mouse_move_listener'
-require 'shoes/swt/oval'
-require 'shoes/swt/progress'
-require 'shoes/swt/radio'
-require 'shoes/swt/rect'
-require 'shoes/swt/shape'
-require 'shoes/swt/shoes_layout'
-require 'shoes/swt/slot'
-require 'shoes/swt/star'
-require 'shoes/swt/sound'
-require 'shoes/swt/text_block'
-require 'shoes/swt/timer'
-
-require 'shoes/swt/text_block/text_segment'
-require 'shoes/swt/text_block/centered_text_segment'
-require 'shoes/swt/text_block/text_segment_collection'
-require 'shoes/swt/text_block/cursor_painter'
-require 'shoes/swt/text_block/fitter'
-require 'shoes/swt/text_block/text_font_factory'
-require 'shoes/swt/text_block/text_style_factory'
-
-require 'shoes/swt/packager'
-
-require 'shoes/swt/tooling/leak_hunter' if ENV["LEAK_HUNTER"]
-
-# redrawing aspect needs to know all the classes
-require 'shoes/swt/redrawing_aspect'

data/lib/shoes/swt/app.rb

@@ -35,6 +35,10 @@ class Shoes
       end
 
       def open
+        # If something called quit during the app block's initial evaluation
+        # we might already be disposed of, in which case get out of here!
+        return if ::Shoes::Swt.main_app.disposed? || @shell.disposed?
+
         @shell.pack
         force_shell_size
         @shell.open
@@ -231,6 +235,7 @@ class Shoes
       def unregister_app
         proc do |_event|
           ::Shoes::Swt.unregister(self)
+          ::Shoes.unregister(self.dsl.app)
         end
       end
 

data/lib/shoes/swt/click_listener.rb

@@ -40,7 +40,6 @@ class Shoes
         handlers = case event.type
           when ::Swt::SWT::MouseDown then @clicks
           when ::Swt::SWT::MouseUp   then @releases
-          else nil
         end
         return if handlers.nil? || handlers.empty?
 

data/lib/shoes/swt/color.rb

@@ -14,7 +14,7 @@ class Shoes
       end
 
       def dispose
-        @real.dispose unless @real.disposed?
+        real.dispose
       end
 
       attr_reader :dsl
@@ -25,15 +25,15 @@ class Shoes
       end
 
       # @param [Swt::Graphics::GC] gc the graphics context on which to apply fill
-      # @note left, top, width, height, and angle are not used in this method, and only
-      #   exist to satisfy the Pattern interface
-      def apply_as_fill(gc, _left = nil, _top = nil, _width = nil, _height = nil, _angle = nil)
+      # @dsl unused by this method, passed to satisfy the Pattern interface
+      def apply_as_fill(gc, _dsl = nil)
         gc.set_background real
         gc.set_alpha alpha
       end
 
       # @param [Swt::Graphics::GC] gc the graphics context on which to apply stroke
-      def apply_as_stroke(gc, _left = nil, _top = nil, _width = nil, _height = nil, _angle = nil)
+      # @dsl unused by this method, passed to satisfy the Pattern interface
+      def apply_as_stroke(gc, _dsl = nil)
         gc.set_foreground real
         gc.set_alpha alpha
       end
@@ -41,9 +41,9 @@ class Shoes
 
     class NullColor
       attr_reader :alpha, :dsl, :real
-      def apply_as_fill(_gc); end
+      def apply_as_fill(_gc, _dsl); end
 
-      def apply_as_stroke(_gc); end
+      def apply_as_stroke(_gc, _dsl); end
     end
   end
 end

data/lib/shoes/swt/common/fill.rb

@@ -9,8 +9,10 @@ class Shoes
         #
         # @return [Swt::Graphics::Color] The Swt representation of this object's fill color
         def fill
+          return @cached_swt_fill if @cached_swt_fill
+
           @color_factory ||= ::Shoes::Swt::ColorFactory.new
-          @color_factory.create(dsl.fill)
+          @cached_swt_fill = @color_factory.create(dsl.fill)
         end
 
         # This object's fill alpha value
@@ -25,10 +27,14 @@ class Shoes
           @angle || 0
         end
 
+        # Just clear it out and let next paint recreate and save our SWT color
+        def update_fill
+          @cached_swt_fill = nil
+        end
+
         def apply_fill(context)
           if fill
-            left, top = self.is_a?(Star) ? [element_left - element_width / 2.0, element_top - element_height / 2.0] : [element_left, element_top]
-            fill.apply_as_fill(context, left, top, element_width, element_height, angle)
+            fill.apply_as_fill(context, self)
             true
           end
         end

data/lib/shoes/swt/common/painter.rb

@@ -33,21 +33,24 @@ class Shoes
           cap = LINECAP[@obj.dsl.style[:cap]]
           graphics_context.set_line_cap(cap) if cap
           graphics_context.set_transform(@obj.transform)
+
           obj = @obj.dsl
-          case obj
-            when ::Shoes::Oval, ::Shoes::Rect
-              set_rotate graphics_context, obj.rotate,
-                         obj.element_left + obj.element_width / 2.0,
-                         obj.element_top + obj.element_height / 2.0 do
-                fill graphics_context if fill_setup(graphics_context)
-                draw graphics_context if draw_setup(graphics_context)
-              end
-            else
-              fill graphics_context if fill_setup(graphics_context)
-              draw graphics_context if draw_setup(graphics_context)
+          if obj.needs_rotate?
+            set_rotate graphics_context, obj.rotate,
+                       obj.element_left + obj.element_width / 2.0,
+                       obj.element_top + obj.element_height / 2.0 do
+              fill_and_draw(graphics_context)
+            end
+          else
+            fill_and_draw(graphics_context)
           end
         end
 
+        def fill_and_draw(graphics_context)
+          fill graphics_context if fill_setup(graphics_context)
+          draw graphics_context if draw_setup(graphics_context)
+        end
+
         # Override in subclass and return something falsy if not using fill
         def fill_setup(graphics_context)
           @obj.apply_fill(graphics_context)

data/lib/shoes/swt/common/stroke.rb

@@ -9,8 +9,10 @@ class Shoes
         #
         # @return [Swt::Graphics::Color] The Swt representation of this object's stroke color
         def stroke
+          return @cached_swt_stroke if @cached_swt_stroke
+
           @color_factory ||= ::Shoes::Swt::ColorFactory.new
-          @color_factory.create(dsl.stroke)
+          @cached_swt_stroke = @color_factory.create(dsl.stroke)
         end
 
         # This object's stroke alpha value
@@ -27,10 +29,14 @@ class Shoes
           dsl.strokewidth
         end
 
+        # Just clear it out and let next paint recreate and save our SWT color
+        def update_stroke
+          @cached_swt_stroke = nil
+        end
+
         def apply_stroke(context)
           if stroke
-            l, t = self.is_a?(Star) ? [element_left - element_width / 2.0, element_top - element_height / 2.0] : [element_left, element_top]
-            stroke.apply_as_stroke(context, l, t, element_width, element_height, angle)
+            stroke.apply_as_stroke(context, self)
             context.set_line_width strokewidth
             true
           end

data/lib/shoes/swt/dialog.rb

@@ -15,8 +15,8 @@ class Shoes
         confirmed? answer_id
       end
 
-      def dialog_chooser(title, folder = false)
-        style = ::Swt::SWT::OPEN
+      def dialog_chooser(title, folder = false, style = :open)
+        style = (style == :save ? ::Swt::SWT::SAVE : ::Swt::SWT::OPEN)
         shell = ::Swt::Widgets::Shell.new Shoes.display
         fd = folder ? ::Swt::Widgets::DirectoryDialog.new(shell, style) : ::Swt::Widgets::FileDialog.new(shell, style)
         fd.setText title

data/lib/shoes/swt/gradient.rb

@@ -29,25 +29,27 @@ class Shoes
         @dsl.alpha
       end
 
-      def apply_as_fill(gc, left, top, width, height, angle = 0)
-        pattern = create_pattern(left, top, width, height, -angle)
+      def apply_as_fill(gc, dsl)
+        pattern = create_pattern(dsl)
         gc.set_background_pattern pattern
       end
 
-      def apply_as_stroke(gc, left, top, width, height, angle = 0)
-        pattern = create_pattern(left, top, width, height, -angle)
+      def apply_as_stroke(gc, dsl)
+        pattern = create_pattern(dsl)
         gc.set_foreground_pattern pattern
       end
 
       private
+      def create_pattern(dsl)
+        width  = dsl.element_width * 0.5
+        height = dsl.element_height * 0.5
+        angle  = normalize_angle(-dsl.angle)
+        left, top, width, height  = determine_args_based_on_angle(angle,
+                                      dsl.element_left, dsl.element_top,
+                                      width, height)
 
-      def create_pattern(left, top, width, height, angle)
-        width  = width * 0.5
-        height = height * 0.5
-        angle  = normalize_angle(angle)
-        left, top, width, height  = determine_args_based_on_angle(angle, left, top, width, height)
-
-        pattern = ::Swt::Pattern.new Shoes.display, left, top, width, height, color1.real, color2.real
+        pattern = ::Swt::Pattern.new Shoes.display, left, top, width, height,
+                                     color1.real, color2.real
         @patterns << pattern
         pattern
       end

data/lib/shoes/swt/image.rb

@@ -16,9 +16,7 @@ class Shoes
       def initialize(dsl, parent)
         @dsl = dsl
         @parent = parent
-
-        load_image(@dsl.file_path)
-
+        update_image
         add_paint_listener
       end
 

data/lib/shoes/swt/image_pattern.rb

@@ -19,11 +19,11 @@ class Shoes
         @pattern ||= ::Swt::Pattern.new(Shoes.display, @image)
       end
 
-      def apply_as_fill(gc, _left, _top, _width, _height, _angle = 0)
+      def apply_as_fill(gc, _dsl)
         gc.set_background_pattern pattern
       end
 
-      def apply_as_stroke(gc, _left, _top, _width, _height, _angle = 0)
+      def apply_as_stroke(gc, _dsl)
         gc.set_foreground_pattern pattern
       end
     end

data/lib/shoes/swt/line.rb

@@ -23,8 +23,6 @@ class Shoes
         @dsl.angle
       end
 
-      private
-
       class Painter < Common::Painter
         def draw(gc)
           gc.draw_line(@obj.element_left, @obj.element_top,