shoes-swt 4.0.0.pre12 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d59ab2c243194cd08ec8910dc1ac800cf8d4557c7126338e71bed355cecfe6
-  data.tar.gz: 35019496beedf4815a237efb971a9ea0dc128b3155f8378bf6f3680735cdb8d7
+  metadata.gz: 7a0f5dce653d4fa2b8da0cc28e07058dfaeba20463a5aa2849a456f6088564af
+  data.tar.gz: df51d16aa4e78f78e5818e79cd99fb77d230140c7184d7055aa01ab3bcc61690
 SHA512:
-  metadata.gz: 86ee6a318228b84e51eea1ad73e5c0dbcc40e938f4c42e002a32f5c2e2fc2ae3699fa11226b92069bfdd9dc8d5e5182d60203a9801a39f3a3646b5439ee10032
-  data.tar.gz: a41f3c499268d5d8d35ad26a60cd3bdf3f419c082ca1724302e1a9e42701a93ae03a1505a249a5ad8b110de8f47b5a94d23c846b33cb2e10e0490cb5fffdf370
+  metadata.gz: 8f90a0299888757c83b667b2f429265a5e4749327b8e43dbefbb9db419dc8d7e8932099115ae0015d54332aa2416fcee95e9bdbf5da6181dc22f9002f1e842ff
+  data.tar.gz: 212cd8cc7260e7a9b709b6ef9c38b91632dade5d11c29e591906412036567df2fa4066c6d403c33733a29c8d89a93f5a456b4073bf882a0294bde6c4884c66a8

data/bin/shoes-swt

@@ -1,5 +1,6 @@
 #!/usr/bin/env jruby
 # frozen_string_literal: true
+
 lib_directory = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << lib_directory
 

data/lib/shoes/swt.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'java'
 require 'swt/minimal'
 require 'swt/core'
@@ -46,7 +47,7 @@ class Shoes
     end
 
     def self.initialize_backend
-      return if @initialized
+      return if defined?(@initialized) && @initialized
       @initialized = true
 
       ::Shoes.configuration.backend = :swt
@@ -96,6 +97,7 @@ class Shoes
       require 'shoes/swt/font'
       require 'shoes/swt/gradient'
       require 'shoes/swt/image'
+      require 'shoes/swt/image_painter'
       require 'shoes/swt/image_pattern'
       require 'shoes/swt/key_listener'
       require 'shoes/swt/line'

data/lib/shoes/swt/animation.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Animation

data/lib/shoes/swt/app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     shoes_icon = ::Shoes::ICON
@@ -24,16 +25,16 @@ class Shoes
 
       def initialize(dsl)
         if self.class.main_app_closed?
-          Shoes.logger.error <<-EOS
-Sorry! You can't start another Shoes.app at after the main one has already
-finished like that! If you need multiple windows, try it more like this:
-
-    Shoes.app do
-      para "first!"
-      Shoes.app do
-        para "second!"
-      end
-    end
+          Shoes.logger.error <<~EOS
+            Sorry! You can't start another Shoes.app at after the main one has already
+            finished like that! If you need multiple windows, try it more like this:
+
+                Shoes.app do
+                  para "first!"
+                  Shoes.app do
+                    para "second!"
+                  end
+                end
 EOS
           exit 1
         end
@@ -197,7 +198,7 @@ EOS
       # Because SWT shutdown is hard to reverse, we only let you do it once
       # and warn you if you try to run again afterward.
       def self.main_app_closed?
-        @main_app_closed
+        @main_app_closed ||= false
       end
 
       def self.mark_main_app_closed

data/lib/shoes/swt/arc.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Arc

data/lib/shoes/swt/arc_painter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class ArcPainter < Common::Painter
@@ -7,14 +8,14 @@ class Shoes
       def fill(graphics_context)
         if @obj.wedge?
           graphics_context.fill_arc(@obj.translate_left + @obj.element_left,
-                                    @obj.translate_top + @obj.element_top,
+                                    @obj.translate_top + drawing_top,
                                     @obj.element_width,
                                     @obj.element_height,
                                     start_angle, sweep)
         else
           path = ::Swt::Path.new(::Swt.display)
           path.add_arc(@obj.translate_left + @obj.element_left,
-                       @obj.translate_top + @obj.element_top,
+                       @obj.translate_top + drawing_top,
                        @obj.element_width,
                        @obj.element_height,
                        start_angle, sweep)
@@ -26,7 +27,7 @@ class Shoes
         line_width = graphics_context.get_line_width
         if @obj.element_left && @obj.element_top && @obj.element_width && @obj.element_height
           graphics_context.draw_arc(@obj.translate_left + @obj.element_left + line_width / 2,
-                                    @obj.translate_top + @obj.element_top + line_width / 2,
+                                    @obj.translate_top + drawing_top + line_width / 2,
                                     @obj.element_width - line_width,
                                     @obj.element_height - line_width,
                                     start_angle, sweep)

data/lib/shoes/swt/arrow.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Arrow

data/lib/shoes/swt/arrow_painter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class ArrowPainter < Common::Painter
@@ -28,14 +29,14 @@ class Shoes
 
           body_left   = @obj.translate_left + @obj.left - @obj.width * 0.5
           body_right  = @obj.translate_left + @obj.left + @obj.width * 0.1
-          body_top    = @obj.translate_top + @obj.top - @obj.width * 0.2
-          body_bottom = @obj.translate_top + @obj.top + @obj.width * 0.2
+          body_top    = @obj.translate_top + drawing_top - @obj.width * 0.2
+          body_bottom = @obj.translate_top + drawing_top + @obj.width * 0.2
 
-          middle = @obj.translate_top + @obj.top
+          middle = @obj.translate_top + drawing_top
 
           head_right  = @obj.translate_left + @obj.left + @obj.width * 0.5
-          head_top    = @obj.translate_top + @obj.top - @obj.width * 0.4
-          head_bottom = @obj.translate_top + @obj.top + @obj.width * 0.4
+          head_top    = @obj.translate_top + drawing_top - @obj.width * 0.4
+          head_bottom = @obj.translate_top + drawing_top + @obj.width * 0.4
 
           path = ::Swt::Path.new(::Swt.display)
           path.move_to(body_left, middle)
@@ -56,6 +57,10 @@ class Shoes
         clear_path
       end
 
+      def after_painted
+        clear_path
+      end
+
       def clear_path
         @path.dispose unless @path.nil? || @path.disposed?
         @path = nil

data/lib/shoes/swt/background.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Background

data/lib/shoes/swt/border.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Border

data/lib/shoes/swt/button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Button < SwtButton

data/lib/shoes/swt/check.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Check < CheckButton

data/lib/shoes/swt/check_button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class CheckButton < SwtButton

data/lib/shoes/swt/click_listener.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     # This class is intended as the single click listener held onto by the app.

data/lib/shoes/swt/color.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Color

data/lib/shoes/swt/color_factory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     # ColorFactory is used for tracking SWT-backed resources related to colors

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common
@@ -25,7 +26,7 @@ class Shoes
 
         # @return [Integer] the angle to use when filling with a pattern
         def angle
-          @angle || 0
+          dsl.angle || 0
         end
 
         # Just clear it out and let next paint recreate and save our SWT color

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common
@@ -6,6 +7,10 @@ class Shoes
         def focus
           @real.set_focus
         end
+
+        def focused?
+          @real.has_focus
+        end
       end
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common
@@ -13,22 +14,27 @@ class Shoes
           tmpname = File.join(Dir.tmpdir, "__shoes4_#{Time.now.to_i}_#{File.basename(name)}")
           FileUtils.cp(name, tmpname)
 
-          @cleanup_files ||= []
-          @cleanup_files << tmpname
+          cleanup_files << tmpname
           tmpname
         end
 
         def cleanup_temporary_files
-          return unless @cleanup_files
+          return unless cleanup_files.any?
 
-          @cleanup_files.each do |file|
+          cleanup_files.each do |file|
             begin
               FileUtils.rm(file)
             rescue => e
               Shoes.logger.debug("Error during image temp file cleanup.\n#{e.class}: #{e.message}")
             end
           end
-          @cleanup_files.clear
+          cleanup_files.clear
+        end
+
+        private
+
+        def cleanup_files
+          @cleanup_files ||= []
         end
       end
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common
@@ -17,6 +18,7 @@ class Shoes
         end
 
         def paint_control(event)
+          before_painted
           graphics_context = event.gc
           reset_graphics_context graphics_context
           if @obj.dsl.visible? && @obj.dsl.positioned?
@@ -30,6 +32,8 @@ class Shoes
           #
           puts "SWALLOWED PAINT EXCEPTION ON #{@obj} - go take care of it: " + e.to_s
           puts 'Unfortunately we have to swallow it because it causes odd failures :('
+        ensure
+          after_painted
         end
 
         def paint_object(graphics_context)
@@ -42,7 +46,7 @@ class Shoes
             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
+                         drawing_top + obj.element_height / 2.0 do
                 fill_and_draw(graphics_context)
               end
             else
@@ -101,6 +105,22 @@ class Shoes
           transform.translate(-left, -top)
           graphics_context.set_transform transform
         end
+
+        def drawing_top
+          dsl = @obj.dsl
+          dsl.element_top - dsl.parent.scroll_top
+        end
+
+        def drawing_bottom
+          dsl = @obj.dsl
+          dsl.element_bottom - dsl.parent.scroll_top
+        end
+
+        def before_painted
+        end
+
+        def after_painted
+        end
       end
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common

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

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common
       module Remove
         def remove
-          app.remove_paint_listener @painter
+          app.remove_paint_listener(painter)
           remove_click_listeners
-          @real.dispose unless @real.nil? || @real.disposed?
+          real&.dispose unless real&.disposed?
           dispose_held_resources
           dispose
         end
 
         def dispose_held_resources
-          @color_factory&.dispose
+          color_factory&.dispose
         end
 
         # Classes should override to dispose of any Swt resources they create
@@ -21,6 +22,18 @@ class Shoes
 
         private
 
+        def color_factory
+          @color_factory ||= nil
+        end
+
+        def painter
+          @painter ||= nil
+        end
+
+        def real
+          @real ||= nil
+        end
+
         def remove_click_listeners
           app.click_listener.remove_listeners_for(dsl)
         end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class SelectionListener

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common