shoes-swt 4.0.0.pre6 → 4.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beac25befd7cf85ba03f9b1cd9826bb9f1e28930
-  data.tar.gz: e82b136fb081ce7f34a0a9c62e1683e42e1f46cc
+  metadata.gz: e578292fc72374cb908da4b2a44e2b72703d8f8e
+  data.tar.gz: 67cb5ed10dd725f3346f060e223f90d333cdfeb6
 SHA512:
-  metadata.gz: 11f22c3d4cf71dc857f7ce0314b1faeac57a8b4438c24b2fa4c32a5b186e1abd9ac804934eade0a1972dca958391c5a32d90eb52b4ac5f85dc9afcd3e36483a5
-  data.tar.gz: e44f05ba4c214ed613aacd03325c24f588e4a68ddf6d3118fac3070efcdd9f25d42144b21f9185c06f8d054d8507cb1d628bce93f5a4a1ba282f6a9da2a1efde
+  metadata.gz: ef6ccf0aaa4e412776b246ea1875b1c10d895a703efb2ea6062ad7d8303a6dfacd27e2590d2228bb47f3c4e817116c17b302b8c3f5447c99c37f0bad7890ae79
+  data.tar.gz: 0bf3f70d2c0c0f78e3ae64ef542972b0f73f6e2e185b251ab647ade8513441996d1ed950d484c0cef6cf4dcc469c50145f4506b0a06390eedc80f7c3bcc629b2

data/Guardfile

@@ -1,4 +1,4 @@
 guard 'rspec', cmd: 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
 end

data/lib/shoes/swt.rb

@@ -66,10 +66,17 @@ class Shoes
       require 'shoes/swt/common/visibility'
       require 'shoes/swt/common/selection_listener'
       require 'shoes/swt/common/stroke'
+      require 'shoes/swt/common/translate'
       require 'shoes/swt/common/update_position'
 
       require 'shoes/swt/input_box'
+      require 'shoes/swt/arc_painter.rb'
+      require 'shoes/swt/arrow_painter.rb'
+      require 'shoes/swt/line_painter.rb'
+      require 'shoes/swt/oval_painter.rb'
       require 'shoes/swt/rect_painter.rb'
+      require 'shoes/swt/shape_painter.rb'
+      require 'shoes/swt/star_painter.rb'
       require 'shoes/swt/swt_button'
       require 'shoes/swt/check_button'
       require 'shoes/swt/radio_group'
@@ -78,6 +85,7 @@ class Shoes
       require 'shoes/swt/app'
       require 'shoes/swt/animation'
       require 'shoes/swt/arc'
+      require 'shoes/swt/arrow'
       require 'shoes/swt/background'
       require 'shoes/swt/border'
       require 'shoes/swt/button'

data/lib/shoes/swt/app.rb

@@ -87,9 +87,7 @@ class Shoes
       end
 
       def flush
-        if @dsl.top_slot
-          @real.layout
-        end
+        @real.layout if @dsl.top_slot
       end
 
       def scroll_top
@@ -157,8 +155,8 @@ class Shoes
         # just one color for now
         background_color = Shoes.display.getSystemColor(::Swt::SWT::COLOR_WIDGET_BACKGROUND)
         ::Shoes::DSL.define_shoes_color(:system_background, background_color.red,
-                                                            background_color.green,
-                                                            background_color.blue)
+                                        background_color.green,
+                                        background_color.blue)
       end
 
       private
@@ -209,7 +207,7 @@ class Shoes
 
         @shell = ::Swt::Widgets::Shell.new(::Swt.display, main_window_style)
         @shell.image = @image
-        @shell.text = (@dsl.app_title)
+        @shell.text = @dsl.app_title
         @shell.background_mode = ::Swt::SWT::INHERIT_DEFAULT
         @shell.background = @background.real
       end
@@ -245,7 +243,7 @@ class Shoes
       def unregister_app
         proc do |_event|
           ::Shoes::Swt.unregister(self)
-          ::Shoes.unregister(self.dsl.app)
+          ::Shoes.unregister(dsl.app)
         end
       end
 

data/lib/shoes/swt/arc.rb

@@ -7,6 +7,7 @@ class Shoes
       include Common::PainterUpdatesPosition
       include Common::Visibility
       include Common::Remove
+      include Common::Translate
       include ::Shoes::BackendDimensionsDelegations
 
       attr_reader :dsl, :app, :transform
@@ -18,7 +19,8 @@ class Shoes
       def initialize(dsl, app)
         @dsl = dsl
         @app = app
-        @painter = Painter.new(self)
+
+        @painter = ArcPainter.new(self)
         @app.add_paint_listener @painter
       end
 
@@ -39,33 +41,6 @@ class Shoes
       def radians_to_degrees(radians)
         radians * 180 / ::Shoes::PI
       end
-
-      class Painter < Common::Painter
-        def fill(graphics_context)
-          if @obj.wedge?
-            graphics_context.fill_arc(@obj.element_left, @obj.element_top,
-                                      @obj.element_width, @obj.element_height,
-                                      @obj.angle1, @obj.angle2 * -1)
-          else
-            path = ::Swt::Path.new(::Swt.display)
-            path.add_arc(@obj.element_left, @obj.element_top,
-                         @obj.element_width, @obj.element_height,
-                         @obj.angle1, @obj.angle2 * -1)
-            graphics_context.fill_path(path)
-          end
-        end
-
-        def draw(graphics_context)
-          sw = graphics_context.get_line_width
-          if @obj.element_left && @obj.element_top && @obj.element_width && @obj.element_height
-            graphics_context.draw_arc(@obj.element_left + sw / 2,
-                                      @obj.element_top + sw / 2,
-                                      @obj.element_width - sw,
-                                      @obj.element_height - sw,
-                                      @obj.angle1, @obj.angle2 * -1)
-          end
-        end
-      end
     end
   end
 end

data/lib/shoes/swt/arc_painter.rb

@@ -0,0 +1,34 @@
+class Shoes
+  module Swt
+    class ArcPainter < Common::Painter
+      def fill(graphics_context)
+        if @obj.wedge?
+          graphics_context.fill_arc(@obj.translate_left + @obj.element_left,
+                                    @obj.translate_top + @obj.element_top,
+                                    @obj.element_width,
+                                    @obj.element_height,
+                                    @obj.angle1, @obj.angle2 * -1)
+        else
+          path = ::Swt::Path.new(::Swt.display)
+          path.add_arc(@obj.translate_left + @obj.element_left,
+                       @obj.translate_top + @obj.element_top,
+                       @obj.element_width,
+                       @obj.element_height,
+                       @obj.angle1, @obj.angle2 * -1)
+          graphics_context.fill_path(path)
+        end
+      end
+
+      def draw(graphics_context)
+        sw = 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 + sw / 2,
+                                    @obj.translate_top + @obj.element_top + sw / 2,
+                                    @obj.element_width - sw,
+                                    @obj.element_height - sw,
+                                    @obj.angle1, @obj.angle2 * -1)
+        end
+      end
+    end
+  end
+end

data/lib/shoes/swt/arrow.rb

@@ -0,0 +1,35 @@
+class Shoes
+  module Swt
+    class Arrow
+      extend Forwardable
+      include Common::Fill
+      include Common::Stroke
+      include Common::Clickable
+      include Common::PainterUpdatesPosition
+      include Common::Visibility
+      include Common::Remove
+      include Common::Translate
+      include ::Shoes::BackendDimensionsDelegations
+
+      def_delegators :dsl, :angle
+
+      attr_reader :dsl, :app, :transform, :path, :painter
+
+      def initialize(dsl, app)
+        @dsl = dsl
+        @app = app
+
+        @painter = ArrowPainter.new(self)
+        @app.add_paint_listener @painter
+      end
+
+      def update_position
+        @painter.clear_path
+      end
+
+      def dispose
+        @painter.dispose
+      end
+    end
+  end
+end

data/lib/shoes/swt/arrow_painter.rb

@@ -0,0 +1,59 @@
+class Shoes
+  module Swt
+    class ArrowPainter < Common::Painter
+      def fill(gc)
+        gc.fill_path(path)
+      end
+
+      def draw(gc)
+        gc.draw_path(path)
+      end
+
+      def path
+        @path ||= begin
+          #
+          #                                  body_right
+          #
+          #  head_top        body_left       |\
+          #                                  | \
+          #  body_top        |---------------|  \  head_right
+          #                  |                   \
+          #  body_middle     |           (l,t)    |
+          #                  |                   /
+          #  body_bottom     |---------------|  /
+          #                                  | /
+          #  head_bottom                     |/
+          #
+
+          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
+
+          middle = @obj.translate_top + @obj.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
+
+          path = ::Swt::Path.new(::Swt.display)
+          path.move_to(body_left, middle)
+          path.line_to(body_left, body_top)
+          path.line_to(body_right, body_top)
+          path.line_to(body_right, head_top)
+          path.line_to(head_right, middle)
+          path.line_to(body_right, head_bottom)
+          path.line_to(body_right, body_bottom)
+          path.line_to(body_left, body_bottom)
+          path.line_to(body_left, middle)
+
+          path
+        end
+      end
+
+      def clear_path
+        @path = nil
+      end
+    end
+  end
+end

data/lib/shoes/swt/background.rb

@@ -6,6 +6,7 @@ class Shoes
       include Common::Stroke
       include Common::Remove
       include Common::Visibility
+      include Common::Translate
       include BackendDimensionsDelegations
 
       def_delegators :dsl, :angle

data/lib/shoes/swt/border.rb

@@ -6,6 +6,7 @@ class Shoes
       include Common::Stroke
       include Common::Remove
       include Common::Visibility
+      include Common::Translate
       include ::Shoes::BackendDimensionsDelegations
 
       def_delegators :dsl, :angle

data/lib/shoes/swt/check_button.rb

@@ -1,17 +1,17 @@
-class Shoes
-  module Swt
-    class CheckButton < SwtButton
-      def initialize(dsl, app, type)
-        super(dsl, app, type)
-      end
-
-      def checked?
-        @real.get_selection
-      end
-
-      def checked=(bool)
-        @real.set_selection bool
-      end
-    end
-  end
-end
+class Shoes
+  module Swt
+    class CheckButton < SwtButton
+      def initialize(dsl, app, type)
+        super(dsl, app, type)
+      end
+
+      def checked?
+        @real.get_selection
+      end
+
+      def checked=(bool)
+        @real.set_selection bool
+      end
+    end
+  end
+end

data/lib/shoes/swt/click_listener.rb

@@ -38,14 +38,14 @@ class Shoes
 
       def handle_event(event)
         handlers = case event.type
-          when ::Swt::SWT::MouseDown then @clicks
-          when ::Swt::SWT::MouseUp   then @releases
-        end
+                   when ::Swt::SWT::MouseDown then @clicks
+                   when ::Swt::SWT::MouseUp   then @releases
+                   end
         return if handlers.nil? || handlers.empty?
 
-        handlers = handlers.to_a.
-          select { |dsl, _| !dsl.hidden? }.
-          select { |dsl, _| dsl.in_bounds?(event.x, event.y) }
+        handlers = handlers.to_a
+                           .select { |dsl, _| !dsl.hidden? }
+                           .select { |dsl, _| dsl.in_bounds?(event.x, event.y) }
 
         # Take the last handler as an approximation of the "top-most" element
         # since we don't have a true z-index. For layouts that aren't too

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

@@ -9,7 +9,7 @@ class Shoes
           curve:   ::Swt::SWT::CAP_ROUND,
           rect:    ::Swt::SWT::CAP_FLAT,
           project: ::Swt::SWT::CAP_SQUARE
-        }
+        }.freeze
 
         def initialize(obj)
           @obj = obj
@@ -72,7 +72,9 @@ class Shoes
         end
 
         def set_rotate(graphics_context, angle, left, top)
-          angle, left, top = angle.to_i, left.to_i, top.to_i
+          angle = angle.to_i
+          left = left.to_i
+          top = top.to_i
           if block_given?
             begin
               transform = ::Swt::Transform.new Shoes.display

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

@@ -0,0 +1,15 @@
+class Shoes
+  module Swt
+    module Common
+      module Translate
+        def translate_left
+          dsl.translate_left
+        end
+
+        def translate_top
+          dsl.translate_top
+        end
+      end
+    end
+  end
+end

data/lib/shoes/swt/{generate-backend.rb → generate_backend.rb}

@@ -1,9 +1,7 @@
 require 'rbconfig'
 
 def generate_backend(path)
-  if RbConfig::CONFIG["host_os"] =~ /darwin/
-    options = "-J-XstartOnFirstThread"
-  end
+  options = "-J-XstartOnFirstThread" if RbConfig::CONFIG["host_os"] =~ /darwin/
 
   "jruby #{options} #{path}/shoes-swt"
 end

data/lib/shoes/swt/gradient.rb

@@ -45,9 +45,8 @@ class Shoes
         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)
+        left, top, width, height = determine_args_based_on_angle(angle, dsl.element_left,
+                                                                 dsl.element_top, width, height)
 
         pattern = ::Swt::Pattern.new Shoes.display, left, top, width, height,
                                      color1.real, color2.real
@@ -84,7 +83,7 @@ class Shoes
         end
         my_angle = angle % (Math::PI * 0.5)
         length = Math.sqrt(my_width**2 + my_height**2)
-        b      = (my_height == 0 && my_width == 0) ? 0 : Math.atan(my_height / my_width)
+        b      = my_height.zero? && my_width.zero? ? 0 : Math.atan(my_height / my_width)
         c      = Math::PI * 0.5 - my_angle - b
         r      = length * Math.cos(c.abs)
         x      = r * Math.cos(b + c)

data/lib/shoes/swt/key_listener.rb

@@ -7,12 +7,13 @@ class Shoes
         ::Swt::SWT.const_get name
       end
 
-      SPECIAL_KEY_NAMES = {}
+      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|
+          [get_swt_constant(key), key.downcase]
+        end
+      ]
 
-      %w(TAB PAGE_UP PAGE_DOWN HOME END F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12
-         F13 F14 F15).each do|key|
-        SPECIAL_KEY_NAMES[get_swt_constant key] = key.downcase
-      end
       %w(UP DOWN LEFT RIGHT).each do |key|
         SPECIAL_KEY_NAMES[get_swt_constant "ARROW_#{key}"] = key.downcase
       end
@@ -22,6 +23,8 @@ class Shoes
       SPECIAL_KEY_NAMES[::Swt::SWT::ESC] = "escape"
       SPECIAL_KEY_NAMES[::Swt::SWT::CR]  = "\n"
 
+      SPECIAL_KEY_NAMES.freeze
+
       MODIFIER_KEYS = %w(CTRL SHIFT ALT CAPS_LOCK COMMAND).map do |key|
         get_swt_constant key
       end
@@ -44,7 +47,7 @@ class Shoes
         @app.remove_key_listener(self)
       end
 
-      BUTTON_EXCLUDES = ["\n", " "]
+      BUTTON_EXCLUDES = ["\n", " "].freeze
       COMBO_EXCLUDES  = %w(up down) + BUTTON_EXCLUDES
 
       # For a variety of SWT controls, certain characters should not be passed
@@ -104,7 +107,6 @@ class Shoes
         (event.stateMask & key) == key
       end
 
-
       def character_key(event)
         return '' if current_key_is_modifier?(event)
         if special_key?(event)