shoes-swt 4.0.0.pre2 → 4.0.0.pre3

data/lib/shoes/swt/arc.rb

@@ -35,14 +35,14 @@ class Shoes
       end
 
       private
+
       def radians_to_degrees(radians)
         radians * 180 / ::Shoes::PI
       end
 
-      public
       class Painter < Common::Painter
         def fill(graphics_context)
-          if (@obj.wedge?)
+          if @obj.wedge?
             graphics_context.fill_arc(@obj.element_left, @obj.element_top,
                                       @obj.element_width, @obj.element_height,
                                       @obj.angle1, @obj.angle2 * -1)
@@ -57,11 +57,11 @@ class Shoes
 
         def draw(graphics_context)
           sw = graphics_context.get_line_width
-          if (@obj.element_left and @obj.element_top and @obj.element_width and @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,
+          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

data/lib/shoes/swt/background.rb

@@ -32,7 +32,7 @@ class Shoes
       end
 
       class Painter < RectPainter
-        def draw_setup(gc)
+        def draw_setup(_gc)
           # don't draw
         end
       end

data/lib/shoes/swt/border.rb

@@ -26,8 +26,7 @@ class Shoes
       end
 
       class Painter < RectPainter
-
-        def fill_setup(gc)
+        def fill_setup(_gc)
           # don't draw
         end
 

data/lib/shoes/swt/click_listener.rb

@@ -0,0 +1,70 @@
+class Shoes
+  module Swt
+    # This class is intended as the single click listener held onto by the app.
+    # That lets us control dispatch of events to our DSL objects however we
+    # please, instead of relying on whatever SWT thinks is right. See #882.
+    class ClickListener
+      include ::Swt::Widgets::Listener
+
+      attr_reader :clickable_elements
+
+      def initialize(swt_app)
+        @clickable_elements = []
+        @clicks   = {}
+        @releases = {}
+        swt_app.add_listener ::Swt::SWT::MouseDown, self
+        swt_app.add_listener ::Swt::SWT::MouseUp, self
+      end
+
+      def add_click_listener(dsl, block)
+        add_clickable_element(dsl)
+        @clicks[dsl] = block
+      end
+
+      def add_release_listener(dsl, block)
+        add_clickable_element(dsl)
+        @releases[dsl] = block
+      end
+
+      def remove_listeners_for(dsl)
+        @clickable_elements.delete(dsl)
+        @clicks.delete(dsl)
+        @releases.delete(dsl)
+      end
+
+      def add_clickable_element(dsl)
+        @clickable_elements << dsl unless @clickable_elements.include?(dsl)
+      end
+
+      def handle_event(event)
+        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?
+
+        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
+        # dynamic this is sufficient to give the behavior we want.
+        dsl, block = handlers.last
+
+        eval_block(event, dsl, block)
+      end
+
+      def eval_block(event, dsl, block)
+        return if block.nil?
+
+        if dsl.pass_coordinates?
+          block.call event.button, event.x, event.y
+        else
+          block.call(dsl)
+        end
+      end
+    end
+  end
+end

data/lib/shoes/swt/color.rb

@@ -27,13 +27,13 @@ class Shoes
       # @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)
+      def apply_as_fill(gc, _left = nil, _top = nil, _width = nil, _height = nil, _angle = 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)
+      def apply_as_stroke(gc, _left = nil, _top = nil, _width = nil, _height = nil, _angle = 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_stroke(gc); end
+      def apply_as_fill(_gc); end
+
+      def apply_as_stroke(_gc); end
     end
   end
 end
-

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

@@ -2,66 +2,15 @@ class Shoes
   module Swt
     module Common
       module Clickable
-
         attr_accessor :click_listener
 
-        # object = self is there for compatibility reasons for now
-        # it's for link (defined in text.rb) and the listener is added in the
-        # swt/text_block.rb ... moving it around would be too hard now
-        def clickable(object = self, block)
-          add_listener_for object, ::Swt::SWT::MouseDown, block
-        end
-
         def click(block)
-          remove_listener_for ::Swt::SWT::MouseDown
-          add_listener_for ::Swt::SWT::MouseDown, block
+          app.click_listener.add_click_listener(dsl, block)
         end
 
         def release(block)
-          remove_listener_for ::Swt::SWT::MouseUp
-          add_listener_for ::Swt::SWT::MouseUp, block
-        end
-
-        private
-        def add_listener_for(swt_object = self, event, block)
-          # dsl objects take care of in bounds checking etc.
-          dsl_object = swt_object.dsl
-          listener = ClickListener.new(dsl_object, block)
-          swt_object.click_listener = listener
-          app.add_clickable_element dsl_object
-          app.add_listener event, listener
-        end
-
-        def remove_listener_for(swt_object = self, event)
-          dsl_object = swt_object.dsl
-          app.clickable_elements.delete(dsl_object)
-          app.remove_listener event, swt_object.click_listener
+          app.click_listener.add_release_listener(dsl, block)
         end
-
-        class ClickListener
-          include ::Swt::Widgets::Listener
-
-          def initialize(clickable_object, block)
-            @clickable_object = clickable_object
-            @block            = block
-          end
-
-          def handleEvent(mouse_event)
-            return if @clickable_object.respond_to?(:hidden?) && @clickable_object.hidden?
-            if @clickable_object.in_bounds?(mouse_event.x, mouse_event.y)
-              eval_block mouse_event
-            end
-          end
-
-          def eval_block(mouse_event)
-            if @clickable_object.pass_coordinates?
-              @block.call mouse_event.button, mouse_event.x, mouse_event.y
-            else
-              @block.call @clickable_object
-            end
-          end
-        end
-
       end
     end
   end

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

@@ -27,7 +27,7 @@ class Shoes
 
         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]
+            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)
             true
           end

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

@@ -37,8 +37,8 @@ class Shoes
           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
+                         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
@@ -54,7 +54,7 @@ class Shoes
         end
 
         # Implement in subclass
-        def fill(graphics_context)
+        def fill(_graphics_context)
         end
 
         # Override in subclass and return something falsy if not using draw
@@ -63,10 +63,10 @@ class Shoes
         end
 
         # Implement in subclass
-        def draw(graphics_context)
+        def draw(_graphics_context)
         end
 
-        def set_rotate graphics_context, angle, left, top
+        def set_rotate(graphics_context, angle, left, top)
           angle, left, top = angle.to_i, left.to_i, top.to_i
           if block_given?
             begin
@@ -80,10 +80,10 @@ class Shoes
           end
         end
 
-        def reset_rotate transform, graphics_context, angle, left, top
+        def reset_rotate(transform, graphics_context, angle, left, top)
           transform.translate left, top
           transform.rotate angle
-          transform.translate -left, -top
+          transform.translate(-left, -top)
           graphics_context.setTransform transform
         end
       end

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

@@ -2,11 +2,11 @@ class Shoes
   module Swt
     module Common
       module PainterUpdatesPosition
-        # No-op. This object manages its own position with its own painter. The 
+        # No-op. This object manages its own position with its own painter. The
         # painter is triggered automatically in the event loop.
         def update_position
         end
       end
     end
   end
-end
+end

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

@@ -19,10 +19,9 @@ class Shoes
         end
 
         private
+
         def remove_click_listeners
-          app.remove_listener ::Swt::SWT::MouseDown, @click_listener
-          app.remove_listener ::Swt::SWT::MouseUp, @click_listener
-          app.clickable_elements.delete self.dsl
+          app.click_listener.remove_listeners_for(dsl)
         end
       end
     end

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

@@ -10,7 +10,7 @@ class Shoes
 
         def dispose_previous_contexts
           @graphic_contexts ||= []
-          @graphic_contexts.each{|g| g.dispose if g}
+          @graphic_contexts.each { |g| g.dispose if g }
           @graphic_contexts.clear
         end
 

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

@@ -1,14 +1,14 @@
-class Shoes
-  module Swt
-    class SelectionListener
-
-      def initialize radio, &blk
-        @radio = radio
-        @blk = blk
-      end
-      def widget_selected event
-        @blk.call @radio, event
-      end
-    end
-  end
-end
+class Shoes
+  module Swt
+    class SelectionListener
+      def initialize(radio, &blk)
+        @radio = radio
+        @blk = blk
+      end
+
+      def widget_selected(event)
+        @blk.call @radio, event
+      end
+    end
+  end
+end

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

@@ -27,10 +27,9 @@ class Shoes
           dsl.strokewidth
         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]
+            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)
             context.set_line_width strokewidth
             true

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

@@ -12,4 +12,4 @@ class Shoes
       end
     end
   end
-end
+end

data/lib/shoes/swt/dialog.rb

@@ -15,7 +15,7 @@ class Shoes
         confirmed? answer_id
       end
 
-      def dialog_chooser title, folder=false
+      def dialog_chooser(title, folder = false)
         style = ::Swt::SWT::OPEN
         shell = ::Swt::Widgets::Shell.new Shoes.display
         fd = folder ? ::Swt::Widgets::DirectoryDialog.new(shell, style) : ::Swt::Widgets::FileDialog.new(shell, style)
@@ -23,11 +23,7 @@ class Shoes
         fd.open
       end
 
-      def ask msg, args
-        Swt::AskDialog.new(::Swt::Widgets::Shell.new, msg, args).open
-      end
-
-      def ask_color title
+      def ask_color(title)
         shell = ::Swt::Widgets::Shell.new Shoes.display
         cd = ::Swt::Widgets::ColorDialog.new shell
         cd.setText title
@@ -36,6 +32,7 @@ class Shoes
       end
 
       private
+
       def open_message_box(style, msg)
         shell = ::Swt::Widgets::Shell.new ::Swt.display
         @message_box = ::Swt::Widgets::MessageBox.new shell, style
@@ -47,44 +44,5 @@ class Shoes
         answer_id == SWT::YES
       end
     end
-
-    class AskDialog < ::Swt::Widgets::Dialog
-      def initialize shell, msg, args
-        @shell, @msg, @args= shell, msg, args
-        super shell
-      end
-
-      def open
-        display = getParent.getDisplay
-        icon = ::Swt::Graphics::Image.new display, ::Shoes::Swt::ICON
-        @shell.setImage icon
-        @shell.setSize 300, 125
-        @shell.setText 'Shoes 4 asks:'
-        label = ::Swt::Widgets::Label.new @shell, ::Swt::SWT::NONE
-        label.setText @msg
-        label.setLocation 10, 10
-        label.pack
-        styles = @args[:secret] ? ::Swt::SWT::BORDER | ::Swt::SWT::SINGLE | ::Swt::SWT::PASSWORD : ::Swt::SWT::BORDER | ::Swt::SWT::SINGLE
-        text = ::Swt::Widgets::Text.new @shell, styles
-        text.setLocation 10, 30
-        text.setSize 270, 20
-        b = ::Swt::Widgets::Button.new @shell, ::Swt::SWT::NULL
-        b.setText 'OK'
-        b.setLocation 180, 55
-        b.pack
-        b.addSelectionListener{|e| @ret = text.getText; @shell.close}
-        b = ::Swt::Widgets::Button.new @shell, ::Swt::SWT::NULL
-        b.setText 'CANCEL'
-        b.setLocation 222, 55
-        b.pack
-        b.addSelectionListener{|e| @ret = nil; @shell.close}
-        @shell.open
-        while !@shell.isDisposed do
-          display.sleep unless display.readAndDispatch
-        end
-        icon.dispose
-        @ret
-      end
-    end
   end
 end

data/lib/shoes/swt/disposed_protection.rb

@@ -15,7 +15,7 @@ class Shoes
           @real.respond_to? method
         end
 
-        def method_missing(method, *args)
+        def method_missing(_method, *_args)
         end
       end
     end