shoes-swt 4.0.0.pre4 → 4.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffaed9c950057b7cfab0d611a0570dec0b604151
-  data.tar.gz: 2308581f63ff15b868167ce26cbb6d7898face7a
+  metadata.gz: ad850293dc338127cb8179643d1687913cb91fbb
+  data.tar.gz: e0fc3c0b500802b5f294ca454fc12955a9fc6462
 SHA512:
-  metadata.gz: 93191af23b19fa9f015ac6803c2cb00facd3265ad85d84bef0278626f1f408fa441d2bafc5c26b721afe909935801324f10f04994588997db9a2d28d16bf55b6
-  data.tar.gz: c99eafcac01873724c545367dc5ff5ca21a4ab257bfc68ede4f919991dcb3d6b3561e3b454fde2bc78c5f39d086aa4949c25639bb1ccdba32b6b92071313bde0
+  metadata.gz: e0e22591aded485f7bd61cfe8b0db70b92d9c1f50bb3b8f350cf11c42fc5b43b44d030983f82de0755d851a53601a36ae65ae8b208485acffdb1eeb1b4d0dcd0
+  data.tar.gz: 3f282218db6550e8dafb20d006f6f7c98aea3d33e0f602ddcbb4199088c903125fb851d77069c40316e47a799f8bf184e2696e85adb6588bffa753747f2afad0

data/Guardfile

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

data/lib/shoes/swt/app.rb

@@ -24,7 +24,8 @@ class Shoes
       def initialize(dsl)
         @dsl = dsl
         ::Swt::Widgets::Display.app_name = @dsl.app_title
-        @background = Color.new(@dsl.opts[:background])
+        @background = Color.new(@dsl.opts[:background] ||
+                               ::Shoes::COLORS.fetch(:system_background))
         @started = false
         initialize_shell
         initialize_real
@@ -42,7 +43,6 @@ class Shoes
         @shell.pack
         force_shell_size
         @shell.open
-        @dsl.top_slot.contents_alignment
         @started = true
         self.fullscreen = true if dsl.start_as_fullscreen?
         flush
@@ -153,6 +153,14 @@ class Shoes
         end
       end
 
+      def self.setup_system_colors
+        # 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)
+      end
+
       private
 
       def initialize_scroll_bar
@@ -191,6 +199,7 @@ class Shoes
         style  = ::Swt::SWT::CLOSE | ::Swt::SWT::MIN | ::Swt::SWT::V_SCROLL
         style |= ::Swt::SWT::RESIZE | ::Swt::SWT::MAX if @dsl.opts[:resizable]
         style |= ::Swt::SWT::APPLICATION_MODAL        if @dsl.opts[:modal]
+        style |= ::Swt::SWT::ON_TOP if @dsl.opts[:always_on_top]
         style
       end
 

data/lib/shoes/swt/button.rb

@@ -1,15 +1,13 @@
 class Shoes
   module Swt
     class Button < SwtButton
-      include Common::Child
-
       # Create a button
       #
       # @param [Shoes::Button] dsl The Shoes DSL button this represents
       # @param [::Swt::Widgets::Composite] parent The parent element of this button
       # @param [Proc] blk The block of code to call when this button is activated
-      def initialize(dsl, parent)
-        super(dsl, parent, ::Swt::SWT::PUSH) do |button|
+      def initialize(dsl, app)
+        super(dsl, app, ::Swt::SWT::PUSH) do |button|
           button.set_text @dsl.text
         end
       end

data/lib/shoes/swt/check_button.rb

@@ -1,10 +1,8 @@
 class Shoes
   module Swt
     class CheckButton < SwtButton
-      include Common::Child
-
-      def initialize(dsl, parent, type)
-        super(dsl, parent, type)
+      def initialize(dsl, app, type)
+        super(dsl, app, type)
       end
 
       def checked?

data/lib/shoes/swt/color_factory.rb

@@ -22,8 +22,7 @@ class Shoes
       def create(element)
         return nil if element.nil?
         return @swt_elements[element] if @swt_elements.include?(element)
-
-        swt_element = ::Shoes.configuration.backend_for(element)
+        swt_element = ::Shoes.backend_for(element)
         @swt_elements[element] = swt_element
         swt_element
       end

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

@@ -35,14 +35,16 @@ class Shoes
           graphics_context.set_transform(@obj.transform)
 
           obj = @obj.dsl
-          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
+          clip_context_to(graphics_context, obj.parent, obj.parent.fixed_height?) do
+            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
-          else
-            fill_and_draw(graphics_context)
           end
         end
 

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

@@ -23,6 +23,20 @@ class Shoes
         def track_graphics_context(graphics_context)
           @graphic_contexts << graphics_context
         end
+
+        def clip_context_to(graphics_context, element, use_element_height = true)
+          clipping = graphics_context.clipping
+          height   = use_element_height ? element.height : element.app.height
+
+          graphics_context.set_clipping(element.absolute_left, element.absolute_top,
+                                        element.width, height)
+          yield graphics_context
+        ensure
+          if clipping
+            graphics_context.set_clipping(clipping.x, clipping.y,
+                                          clipping.width, clipping.height)
+          end
+        end
       end
     end
   end

data/lib/shoes/swt/download.rb

@@ -2,7 +2,7 @@ class Shoes
   module Swt
     class Download
       attr_accessor :busy
-      def initialize(_dsl)
+      def initialize(_dsl, _app)
         @busy = false
       end
 

data/lib/shoes/swt/generate-backend.rb

@@ -5,5 +5,5 @@ def generate_backend(path)
     options = "-J-XstartOnFirstThread"
   end
 
-  "jruby --1.9 #{options} #{path}/shoes-swt"
+  "jruby #{options} #{path}/shoes-swt"
 end

data/lib/shoes/swt/gradient.rb

@@ -40,13 +40,14 @@ class Shoes
       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)
+                                                                  dsl.element_left, dsl.element_top,
+                                                                  width, height)
 
         pattern = ::Swt::Pattern.new Shoes.display, left, top, width, height,
                                      color1.real, color2.real

data/lib/shoes/swt/image.rb

@@ -3,7 +3,6 @@ class Shoes
     class Image
       import java.io.ByteArrayInputStream
 
-      include Common::Child
       include Common::Resource
       include Common::Clickable
       include Common::PainterUpdatesPosition
@@ -11,11 +10,11 @@ class Shoes
       include Common::Remove
       include ::Shoes::BackendDimensionsDelegations
 
-      attr_reader :parent, :real, :dsl, :painter
+      attr_reader :app, :real, :dsl, :painter
 
-      def initialize(dsl, parent)
+      def initialize(dsl, app)
         @dsl = dsl
-        @parent = parent
+        @app = app
         update_image
         add_paint_listener
       end

data/lib/shoes/swt/input_box.rb

@@ -2,20 +2,19 @@ class Shoes
   module Swt
     # Class is used by edit_box and edit_line
     class InputBox
-      include Common::Child
       include Common::Remove
       include Common::PainterUpdatesPosition
       include Common::Visibility
       include Common::UpdatePosition
       include ::Shoes::BackendDimensionsDelegations
 
-      attr_reader :real, :dsl, :parent
+      attr_reader :real, :dsl, :app
 
-      def initialize(dsl, parent, text_options)
-        @dsl          = dsl
-        @parent       = parent
+      def initialize(dsl, app, text_options)
+        @dsl = dsl
+        @app = app
 
-        @real = ::Swt::Widgets::Text.new(@parent.real, text_options)
+        @real = ::Swt::Widgets::Text.new(@app.real, text_options)
         @real.set_size dsl.element_width, dsl.element_height
         @real.set_text dsl.style[:text]
         @real.add_modify_listener do |event|
@@ -33,7 +32,7 @@ class Shoes
       end
 
       def enabled(value)
-        @real.enable_widget value
+        @real.enabled = value
       end
 
       def highlight_text(start_index, final_index)
@@ -56,17 +55,17 @@ class Shoes
 
     class EditLine < InputBox
       DEFAULT_STYLES = ::Swt::SWT::SINGLE | ::Swt::SWT::BORDER
-      def initialize(dsl, parent)
+      def initialize(dsl, app)
         styles = DEFAULT_STYLES
         styles |= ::Swt::SWT::PASSWORD if dsl.secret?
-        super(dsl, parent, styles)
+        super(dsl, app, styles)
       end
     end
 
     class EditBox < InputBox
       DEFAULT_STYLES = ::Swt::SWT::MULTI | ::Swt::SWT::BORDER | ::Swt::SWT::WRAP | ::Swt::SWT::V_SCROLL
-      def initialize(dsl, parent)
-        super(dsl, parent, DEFAULT_STYLES)
+      def initialize(dsl, app)
+        super(dsl, app, DEFAULT_STYLES)
       end
     end
   end

data/lib/shoes/swt/key_listener.rb

@@ -79,6 +79,7 @@ class Shoes
         modifier_keys += 'control_' if control?(event)
         modifier_keys += 'shift_' if shift?(event) && special_key?(event)
         modifier_keys += 'alt_' if alt?(event)
+        modifier_keys += 'super_' if super?(event)
         modifier_keys
       end
 
@@ -86,19 +87,24 @@ class Shoes
         is_this_modifier_key?(event, ::Swt::SWT::ALT)
       end
 
-      # NOTE: state_mask and key_code error for me so the java version is used
-      def is_this_modifier_key?(event, key)
-        (event.stateMask & key) == key
+      def control?(event)
+        is_this_modifier_key?(event, ::Swt::SWT::CTRL)
       end
 
       def shift?(event)
         is_this_modifier_key?(event, ::Swt::SWT::SHIFT)
       end
 
-      def control?(event)
-        is_this_modifier_key?(event, ::Swt::SWT::CTRL)
+      def super?(event)
+        is_this_modifier_key?(event, ::Swt::SWT::COMMAND)
       end
 
+      # NOTE: state_mask and key_code error for me so the java version is used
+      def is_this_modifier_key?(event, key)
+        (event.stateMask & key) == key
+      end
+
+
       def character_key(event)
         return '' if current_key_is_modifier?(event)
         if special_key?(event)

data/lib/shoes/swt/link.rb

@@ -2,6 +2,8 @@ class Shoes
   module Swt
     class Link
       include Common::Clickable
+      include Common::Fill
+      include Common::Stroke
 
       attr_reader :app, :link_segments, :dsl
 

data/lib/shoes/swt/list_box.rb

@@ -1,23 +1,18 @@
 class Shoes
   module Swt
     class ListBox
-      include Common::Child
       include Common::Remove
       include Common::Visibility
       include Common::UpdatePosition
       include ::Shoes::BackendDimensionsDelegations
 
-      attr_reader :dsl, :parent
+      attr_reader :dsl, :app
 
-      # Create a list box
-      #
-      # @param dsl    [Shoes::List_box] The Shoes DSL list box this represents
-      # @param parent [::Swt::Widgets::Composite] The parent element of this button
-      def initialize(dsl, parent)
+      def initialize(dsl, app)
         @dsl = dsl
-        @parent = parent
+        @app = app
         @real = ::Swt::Widgets::Combo.new(
-          @parent.real,
+          @app.real,
           ::Swt::SWT::DROP_DOWN | ::Swt::SWT::READ_ONLY
         )
         @real.set_size dsl.element_width, dsl.element_height

data/lib/shoes/swt/packager.rb

@@ -59,6 +59,7 @@ class Shoes
       end
 
       private
+
       # Copy the master config (including singleton class), since we may be
       # packaging for more than one backend
       def create_config(master_config, backend)

data/lib/shoes/swt/progress.rb

@@ -1,20 +1,19 @@
 class Shoes
   module Swt
     class Progress
-      include Common::Child
       include Common::Remove
       include Common::Visibility
       include Common::UpdatePosition
       include DisposedProtection
       include ::Shoes::BackendDimensionsDelegations
 
-      attr_reader :parent, :dsl
+      attr_reader :app, :dsl
 
-      def initialize(dsl, parent)
+      def initialize(dsl, app)
         @dsl = dsl
-        @parent = parent
+        @app = app
 
-        @real = ::Swt::Widgets::ProgressBar.new(@parent.real,
+        @real = ::Swt::Widgets::ProgressBar.new(@app.real,
                                                 ::Swt::SWT::SMOOTH)
         real.minimum = 0
         real.maximum = 100

data/lib/shoes/swt/radio.rb

@@ -9,10 +9,10 @@ class Shoes
       # Create a radio button
       #
       # @param [Shoes::Radio] dsl The Shoes DSL radio this represents
-      # @param [::Swt::Widgets::Composite] parent The parent element of this button
+      # @param [::Swt::Widgets::Composite] app The app element of this button
       # @param [Proc] blk The block of code to call when this button is activated
-      def initialize(dsl, parent)
-        super(dsl, parent, ::Swt::SWT::RADIO)
+      def initialize(dsl, app)
+        super(dsl, app, ::Swt::SWT::RADIO)
         self.group = dsl.group
       end
 

data/lib/shoes/swt/redrawing_aspect.rb

@@ -20,27 +20,22 @@ class Shoes
             TextBlock::CursorPainter         => [:move_textcursor],
             Timer                            => [:eval_block],
             ::Shoes::Common::Changeable      => [:call_change_listeners] }
+
       # only the main thread may draw
       NEED_TO_ASYNC_UPDATE_GUI = { ::Shoes::Download => [:eval_block] }
 
       # 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] }
 
-      CHANGED_POSITION = { ::Shoes::Common::Positioning => [:_position] }
-
-      # These methods trigger SWT painting listeners, so we need to be sure
-      # that positioning has run properly before allowing them to continue.
-      NEED_CONTENTS_ALIGNMENT = {
-        ::Shoes::Swt::Dialog    => [:ask_color,
-                                    :dialog_chooser,
-                                    :open_message_box]
-      }
+      CHANGED_POSITION = { ::Shoes::Common::Positioning => [:_position],
+                           ::Shoes::Common::Hover       => [:eval_hover_block] }
 
       attr_reader :app
 
@@ -64,7 +59,6 @@ class Shoes
       def affected_classes
         classes = NEED_TO_UPDATE.keys +
                   NEED_TO_ASYNC_UPDATE_GUI.keys +
-                  NEED_CONTENTS_ALIGNMENT.keys +
                   SAME_POSITION.keys +
                   CHANGED_POSITION.keys
         classes.uniq
@@ -83,9 +77,6 @@ class Shoes
         before_and_after_every CHANGED_POSITION do |*_args, element|
           redraw_element element
         end
-        before_every NEED_CONTENTS_ALIGNMENT do |*_args|
-          app.dsl.top_slot.contents_alignment
-        end
       end
 
       def update_gui

data/lib/shoes/swt/slot.rb

@@ -25,7 +25,10 @@ class Shoes
       # responsibility, although this is more DSL code
       # #904 #905
       def update_visibility
-        if dsl.hidden?
+        # Only alter contents on a visibility change
+        return if @last_hidden_state == dsl.hidden?
+
+        if @last_hidden_state = dsl.hidden?
           dsl.contents.each(&:hide)
         else
           dsl.contents.each(&:show)

data/lib/shoes/swt/sound.rb

@@ -19,7 +19,7 @@ class Shoes
 
       BufferSize = 4096
 
-      def initialize(dsl)
+      def initialize(dsl, _app)
         @dsl = dsl
       end
 

data/lib/shoes/swt/swt_button.rb

@@ -6,14 +6,14 @@ class Shoes
       include Common::UpdatePosition
       include ::Shoes::BackendDimensionsDelegations
 
-      attr_reader :parent, :real, :dsl
+      attr_reader :app, :real, :dsl
 
-      def initialize(dsl, parent, type)
+      def initialize(dsl, app, type)
         @dsl = dsl
-        @parent = parent
+        @app = app
 
         @type = type
-        @real = ::Swt::Widgets::Button.new(@parent.real, @type)
+        @real = ::Swt::Widgets::Button.new(@app.real, @type)
 
         yield(@real) if block_given?
 

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

@@ -20,7 +20,10 @@ class Shoes
                     @dsl.gui.segments.empty?
 
           reset_graphics_context(paint_event.gc)
-          @dsl.gui.segments.paint_control(paint_event.gc)
+
+          clip_context_to(paint_event.gc, @dsl.parent) do |gc|
+            @dsl.gui.segments.paint_control(gc)
+          end
         end
       end
     end

data/lib/shoes/swt/text_block/text_segment_collection.rb

@@ -4,7 +4,7 @@ class Shoes
       class TextSegmentCollection
         extend Forwardable
         def_delegators :@segments, :length, :last, :inject,
-                                   :one?, :any?, :empty?
+                       :one?, :any?, :empty?
 
         attr_reader :dsl, :default_text_styles
 
@@ -164,9 +164,20 @@ class Shoes
         end
 
         # This could be smarter, basing height on the actual line the cursor's
-        # in. For now, just use the first line's height.
+        # in. For now, just use the first line's (purported) height.
         def cursor_height
-          @segments.first.line_bounds(0).height
+          if @segments.first.text.empty?
+            # Heights are off for empty text layouts. Fake it to make it (it
+            # being a real height).
+            new_segment = TextSegment.new(@dsl, "Hi", 100)
+            height_from_segment(new_segment)
+          else
+            height_from_segment(@segments.first)
+          end
+        end
+
+        def height_from_segment(segment)
+          segment.line_bounds(0).height
         end
       end
     end

data/lib/shoes/swt/text_block/text_style_factory.rb

@@ -86,6 +86,7 @@ class Shoes
       end
 
       private
+
       def style_present?(style)
         !style.nil? && !(style == 'none')
       end

data/lib/shoes/swt/text_block.rb

@@ -94,7 +94,11 @@ class Shoes
       def set_absolutes(starting_left, starting_top)
         last_segment = segments.last
 
-        @dsl.absolute_right  = starting_left + last_segment.last_line_width +
+        # If we have an explicit width, use that.
+        # If not, take our trailing line's width.
+        width_to_offset = @dsl.element_width || last_segment.last_line_width
+
+        @dsl.absolute_right  = starting_left + width_to_offset +
           margin_right - NEXT_ELEMENT_OFFSET
 
         @dsl.absolute_bottom = starting_top + last_segment.height +

data/lib/shoes/swt/version.rb

@@ -1,5 +1,5 @@
 class Shoes
   module Swt
-    VERSION = "4.0.0.pre4"
+    VERSION = "4.0.0.pre5"
   end
 end

data/lib/shoes/swt.rb

@@ -56,7 +56,6 @@ class Shoes
       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'
@@ -122,6 +121,7 @@ class Shoes
       # redrawing aspect needs to know all the classes
       require 'shoes/swt/redrawing_aspect'
 
+      ::Shoes::Swt::App.setup_system_colors
       @initialized = true
     rescue Java::OrgEclipseSwt::SWTException => e
       if e.message == "Invalid thread access"
@@ -131,8 +131,8 @@ class Shoes
         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
+        `JRUBY_OPTS=-J-XstartOnFirstThread #{$PROGRAM_NAME} #{ARGV.join(" ")}`
+        exit $CHILD_STATUS.exitstatus
       end
     end
   end

data/shoes-swt.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = 'A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple.'
   s.license     = 'MIT'
 
-  s.files         = `git ls-files`.split($/)
+  s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 

data/spec/shoes/swt/animation_spec.rb

@@ -1,10 +1,10 @@
-require 'shoes/swt/spec_helper'
+require 'spec_helper'
 
 describe Shoes::Swt::Animation do
   include_context 'swt app'
-  let(:dsl) { double('dsl', :stopped? => false, :removed? => false,
-                     :framerate => 10, :current_frame => nil,
-                     :increment_frame => nil, :blk => block) }
+  let(:dsl) { double('dsl', stopped?: false, removed?: false,
+                            framerate: 10, current_frame: nil,
+                            increment_frame: nil, blk: block) }
   let(:block) { double 'block', call: nil }
   let(:display) { ::Swt.display }
   subject { Shoes::Swt::Animation.new dsl, swt_app }
@@ -51,7 +51,7 @@ describe Shoes::Swt::Animation do
     describe 'disabled' do
       describe 'stopped?' do
         before :each do
-          allow(dsl).to receive_messages :stopped? => true
+          allow(dsl).to receive_messages stopped?: true
           task.call
         end
 
@@ -67,7 +67,7 @@ describe Shoes::Swt::Animation do
 
       describe 'removed?' do
         before :each do
-          allow(dsl).to receive_messages :removed? => true
+          allow(dsl).to receive_messages removed?: true
           task.call
         end
 
@@ -81,6 +81,5 @@ describe Shoes::Swt::Animation do
         end
       end
     end
-
   end
 end