shoes-swt 4.0.0.pre12 → 4.0.0.rc1

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

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     module Common
       module Visibility
         def update_visibility
-          if @real && @real.respond_to?(:set_visible)
-            @real.set_visible(@dsl.visible?)
+          if defined?(@real) && @real.respond_to?(:set_visible)
+            # hidden_from_view? handles all visiblity conditions, including
+            # being outside a slot. SWT as backend doesn't get that for free
+            # because we can't use Composites as they lack transparency...
+            visible = !@dsl.hidden_from_view?
+            @real.set_visible(visible)
           end
         end
       end

data/lib/shoes/swt/dialog.rb

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

data/lib/shoes/swt/disposed_protection.rb

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

data/lib/shoes/swt/download.rb

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

data/lib/shoes/swt/font.rb

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

data/lib/shoes/swt/generate_backend.rb

@@ -7,21 +7,21 @@ class Shoes
     class << self
       def validate
         if RUBY_ENGINE != "jruby"
-          puts <<-EOS
+          puts <<~EOS
 
-*******************************************************************************
-The shoes-swt backend requires a 9.X version of JRuby.
+            *******************************************************************************
+            The shoes-swt backend requires a 9.X version of JRuby.
 
-You are running the following Ruby instead:
+            You are running the following Ruby instead:
 
-  #{RUBY_DESCRIPTION}
+              #{RUBY_DESCRIPTION}
 
-Please download JRuby from http://jruby.org (or your favorite Ruby version
-manager), then check our https://github.com/shoes/shoes4#installing-shoes-4 to
-get Shoes installed.
+            Please download JRuby from http://jruby.org (or your favorite Ruby version
+            manager), then check our https://github.com/shoes/shoes4#installing-shoes-4 to
+            get Shoes installed.
 
-Sorry for the inconvenience!
-*******************************************************************************
+            Sorry for the inconvenience!
+            *******************************************************************************
 
 EOS
           exit 1

data/lib/shoes/swt/gradient.rb

@@ -1,4 +1,16 @@
 # frozen_string_literal: true
+
+# Gradients are a little confusing, but don't let all the math below scare you.
+# Here's the (relatively) simple explanation of what's going on.
+#
+# ::SWT::Pattern, the underlying class we use, defines a gradient by a starting
+# and ending point. We account the angle into it by changing these points.
+#
+# To look right, the start/end points must be outside our shape! If not, then
+# we get a hard line where the color resets without fading, which looks bad.
+# Given that, we must keep those points outside our bounds of the element,
+# which are reported via the redraw_left, redraw_top, etc. methods.
+
 class Shoes
   module Swt
     class Gradient
@@ -7,6 +19,8 @@ class Shoes
       def initialize(dsl)
         @dsl = dsl
         @patterns = []
+        @color1 = nil
+        @color2 = nil
       end
 
       def dispose
@@ -42,12 +56,16 @@ class Shoes
 
       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(gui)
+        dsl    = gui.dsl
+        width  = dsl.redraw_width * 0.5
+        height = dsl.redraw_height * 0.5
+        angle  = normalize_angle(-(dsl.angle || 0))
+        left, top, width, height = determine_args_based_on_angle(angle,
+                                                                 dsl.redraw_left,
+                                                                 dsl.redraw_top,
+                                                                 width,
+                                                                 height)
 
         pattern = ::Swt::Pattern.new Shoes.display, left, top, width, height,
                                      color1.real, color2.real

data/lib/shoes/swt/image.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'fileutils'
 
 class Shoes
@@ -14,13 +15,16 @@ class Shoes
       include Common::ImageHandling
       include ::Shoes::BackendDimensionsDelegations
 
-      attr_reader :app, :real, :dsl, :painter
+      attr_reader :app, :real, :dsl, :painter, :full_width, :full_height
 
       def initialize(dsl, app)
         @dsl = dsl
         @app = app
+        @tmpname_or_data = nil
         update_image
-        add_paint_listener
+
+        @painter = ImagePainter.new(self)
+        app.add_paint_listener(@painter)
       end
 
       def update_image
@@ -116,14 +120,6 @@ class Shoes
         end
         data
       end
-
-      def add_paint_listener
-        @painter = lambda do |event|
-          graphics_context = event.gc
-          graphics_context.drawImage @real, 0, 0, @full_width, @full_height, dsl.element_left, dsl.element_top, dsl.element_width, dsl.element_height unless @dsl.hidden
-        end
-        app.add_paint_listener(@painter)
-      end
     end
   end
 end

data/lib/shoes/swt/image_painter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Shoes
+  module Swt
+    class ImagePainter
+      include Common::Resource
+
+      def initialize(image)
+        @image = image
+        @dsl = image.dsl
+      end
+
+      def paint_control(event)
+        return if @dsl.hidden
+
+        graphics_context = event.gc
+        clip_context_to(graphics_context, @dsl.parent) do
+          graphics_context.drawImage(@image.real, 0, 0,
+                                     @image.full_width, @image.full_height,
+                                     @dsl.element_left, @dsl.element_top,
+                                     @dsl.element_width, @dsl.element_height)
+        end
+      end
+    end
+  end
+end

data/lib/shoes/swt/image_pattern.rb

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

data/lib/shoes/swt/input_box.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     # Class is used by edit_box and edit_line

data/lib/shoes/swt/key_listener.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class KeyListener
@@ -9,13 +10,13 @@ class Shoes
       end
 
       SPECIAL_KEY_NAMES = Hash[
-        %w(TAB PAGE_UP PAGE_DOWN HOME END F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12
-           F13 F14 F15).map do |key|
+        %w[TAB PAGE_UP PAGE_DOWN HOME END F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12
+           F13 F14 F15].map do |key|
           [get_swt_constant(key), key.downcase]
         end
       ]
 
-      %w(UP DOWN LEFT RIGHT).each do |key|
+      %w[UP DOWN LEFT RIGHT].each do |key|
         SPECIAL_KEY_NAMES[get_swt_constant "ARROW_#{key}"] = key.downcase
       end
 
@@ -26,7 +27,7 @@ class Shoes
 
       SPECIAL_KEY_NAMES.freeze
 
-      MODIFIER_KEYS = %w(CTRL SHIFT ALT CAPS_LOCK COMMAND).map do |key|
+      MODIFIER_KEYS = %w[CTRL SHIFT ALT CAPS_LOCK COMMAND].map do |key|
         get_swt_constant key
       end
 
@@ -49,7 +50,7 @@ class Shoes
       end
 
       BUTTON_EXCLUDES = ["\n", " "].freeze
-      COMBO_EXCLUDES  = %w(up down) + BUTTON_EXCLUDES
+      COMBO_EXCLUDES  = %w[up down] + BUTTON_EXCLUDES
 
       # For a variety of SWT controls, certain characters should not be passed
       # to Shoes key listeners, since they're already handled by the controls.

data/lib/shoes/swt/line.rb

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

data/lib/shoes/swt/line_painter.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class LinePainter < Common::Painter
       def draw(gc)
         gc.draw_line(@obj.translate_left + @obj.element_left,
-                     @obj.translate_top + @obj.element_top,
+                     @obj.translate_top + drawing_top,
                      @obj.translate_left + @obj.element_right + 1,
-                     @obj.translate_top + @obj.element_bottom + 1)
+                     @obj.translate_top + drawing_bottom + 1)
       end
 
       # Don't do fill setup

data/lib/shoes/swt/link.rb

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

data/lib/shoes/swt/link_segment.rb

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

data/lib/shoes/swt/list_box.rb

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

data/lib/shoes/swt/mouse_move_listener.rb

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

data/lib/shoes/swt/oval.rb

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

data/lib/shoes/swt/oval_painter.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class OvalPainter < Common::Painter
       def clipping
         clipping = ::Swt::Path.new(Shoes.display)
-        clipping.add_arc(@obj.element_left, @obj.element_top,
+        clipping.add_arc(@obj.element_left, drawing_top,
                          @obj.element_width, @obj.element_height, 0, 360)
         clipping
       end
 
       def fill(graphics_context)
         graphics_context.fill_oval(@obj.translate_left + @obj.element_left,
-                                   @obj.translate_top + @obj.element_top,
+                                   @obj.translate_top + drawing_top,
                                    @obj.element_width,
                                    @obj.element_height)
       end
@@ -19,7 +20,7 @@ class Shoes
       def draw(graphics_context)
         sw = graphics_context.get_line_width
         graphics_context.draw_oval(@obj.translate_left + @obj.element_left + sw / 2,
-                                   @obj.translate_top + @obj.element_top + sw / 2,
+                                   @obj.translate_top + drawing_top + sw / 2,
                                    @obj.element_width - sw,
                                    @obj.element_height - sw)
       end

data/lib/shoes/swt/packager.rb

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

data/lib/shoes/swt/progress.rb

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

data/lib/shoes/swt/radio.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     # In Swt a radio button is actually just a
     # button, so a lot of these methods are
     # borrowed from button.rb
     class Radio < CheckButton
-      attr_accessor :group
+      attr_reader :group
 
       # Create a radio button
       #
@@ -19,9 +20,9 @@ class Shoes
 
       def group=(value)
         group_lookup = RadioGroup.group_lookup
-        group_lookup[@group].remove(self) unless @group.nil?
+        group_lookup[group].remove(self) unless group.nil?
         @group = value || RadioGroup::DEFAULT_RADIO_GROUP
-        group_lookup[@group].add self
+        group_lookup[group].add self
       end
     end
   end

data/lib/shoes/swt/radio_group.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     # In Swt radio groups are managed by composites which occupy space

data/lib/shoes/swt/rect.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Rect
@@ -12,8 +13,6 @@ class Shoes
       include Common::Translate
       include ::Shoes::BackendDimensionsDelegations
 
-      def_delegators :dsl, :angle
-
       attr_reader :dsl, :app, :transform, :painter
 
       def initialize(dsl, app)

data/lib/shoes/swt/rect_painter.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class RectPainter < Common::Painter
       def fill(gc)
         gc.fill_round_rectangle(@obj.translate_left + @obj.element_left + inset,
-                                @obj.translate_top + @obj.element_top + inset,
+                                @obj.translate_top + drawing_top + inset,
                                 @obj.element_width - inset * 2,
                                 @obj.element_height - inset * 2,
                                 @obj.corners * 2,
@@ -14,7 +15,7 @@ class Shoes
       def draw(gc)
         stroke_width = gc.get_line_width
         gc.draw_round_rectangle(@obj.translate_left + @obj.element_left + stroke_width / 2,
-                                @obj.translate_top + @obj.element_top + stroke_width / 2,
+                                @obj.translate_top + drawing_top + stroke_width / 2,
                                 @obj.element_width - stroke_width,
                                 @obj.element_height - stroke_width,
                                 @obj.corners * 2, @obj.corners * 2)

data/lib/shoes/swt/redrawing_aspect.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This file uses the after_do gem, which you probably haven't heard of (yet)
 # It basically works like Class.after :method do ... end
 # So for every instance of Class, after method is executed the block you
@@ -22,18 +23,21 @@ class Shoes
           MouseMoveListener                => [:eval_move_block],
           TextBlock::CursorPainter         => [:move_textcursor],
           Timer                            => [:eval_block],
-          ::Shoes::Common::Changeable      => [:call_change_listeners]
+          Slot                             => [:update_scroll],
+          ::Shoes::Common::Changeable      => [:call_change_listeners],
         }.freeze
 
       # These need to trigger a redraw
-      SAME_POSITION    = { Common::Visibility      => [:update_visibility],
-                           Image                   => [:create_image],
-                           ::Shoes::Common::Hover  => [:eval_hover_block],
-                           ::Shoes::Common::Style  => [:update_style],
-                           ::Shoes::Common::Remove => [:remove],
-                           ::Shoes::Slot           => [:mouse_hovered,
-                                                       :mouse_left],
-                           ::Shoes::TextBlock      => [:replace] }.freeze
+      SAME_POSITION =
+        {
+          Common::Visibility      => [:update_visibility],
+          Image                   => [:create_image],
+          ::Shoes::Common::Hover  => [:eval_hover_block],
+          ::Shoes::Common::Style  => [:update_style],
+          ::Shoes::Common::Remove => [:remove],
+          ::Shoes::Slot           => [:mouse_hovered, :mouse_left],
+          ::Shoes::TextBlock      => [:replace],
+        }.freeze
 
       CHANGED_POSITION = { ::Shoes::DimensionsDelegations => [:adjust_current_position],
                            ::Shoes::Common::Positioning   => [:_position, :displace],
@@ -85,8 +89,8 @@ class Shoes
 
       def redraw_element(element, include_children = true)
         target = redraw_target(element)
-        redraw_area target.element_left, target.element_top,
-                    target.element_width, target.element_height,
+        redraw_area target.redraw_left, target.redraw_top,
+                    target.redraw_width, target.redraw_height,
                     include_children
       end
 
@@ -98,7 +102,7 @@ class Shoes
 
       def redraw_target(element)
         # During DSL initialization element.gui is nil, so if a SWT backend
-        # object causes a redraw in its initailize (like Shoes::Swt::Image),
+        # object causes a redraw in its initialize (like Shoes::Swt::Image),
         # we won't have gui set yet. Annoying, but fine.
         if element.gui
           element.gui.redraw_target