shoes-core 4.0.0.pre4 → 4.0.0.pre5

data/lib/shoes/common/style.rb

@@ -41,6 +41,8 @@ class Shoes
         @style.merge!(new_styles)
         @style.merge!(arg_styles)
         @style = StyleNormalizer.new.normalize(@style)
+
+        set_hovers(@style)
       end
 
       def create_style_hash
@@ -123,6 +125,7 @@ class Shoes
         set_dimensions(new_styles)
         set_visibility(new_styles)
         set_coloring(new_styles)
+        set_hovers(new_styles)
         click(&new_styles[:click]) if new_styles.key?(:click)
         @style.merge! normalized_style
       end
@@ -145,6 +148,11 @@ class Shoes
         update_stroke if new_styles.include?(:stroke)
       end
 
+      def set_hovers(new_styles)
+        hover(&new_styles[:hover]) if new_styles.include?(:hover)
+        leave(&new_styles[:leave]) if new_styles.include?(:leave)
+      end
+
       def update_dimensions # so that @style hash matches actual values
         STYLE_GROUPS[:dimensions].each do |style|
           if self.respond_to?(style)

data/lib/shoes/configuration.rb

@@ -29,39 +29,42 @@ class Shoes
       # @example
       #   Shoes::Configuration.backend = :swt # => Shoes::Swt
       def backend=(name)
+        return if @backend_name == name
+
         unless @backend.nil?
           fail "Can't switch backend to Shoes::#{name.capitalize}, Shoes::#{backend_name.capitalize} backend already loaded."
         end
         @backend_name ||= name
       end
 
-      # Finds the appropriate backend class for the given Shoes object
+      # Finds the appropriate backend class for the given Shoes object or class
       #
-      # @param [Object] shoes_object A Shoes object
+      # @param [Object] object A Shoes object or a class
       # @return [Object] An appropriate backend class
       # @example
       #   Shoes.configuration.backend_class(shoes_button) # => Shoes::Swt::Button
-      def backend_class(shoes_object)
-        class_name = shoes_object.class.name.split("::").last
+      def backend_class(object)
+        klazz = object.is_a?(Class) ? object : object.class
+        class_name = klazz.name.split("::").last
         # Lookup with false to not consult modules higher in the chain Object
         # because Shoes::Swt.const_defined? 'Range' => true
-        fail ArgumentError, "#{shoes_object} does not have a backend class defined for #{backend}" unless backend.const_defined?(class_name, false)
+        fail ArgumentError, "#{object} does not have a backend class defined for #{backend}" unless backend.const_defined?(class_name, false)
         backend.const_get(class_name, false)
       end
 
-      # Creates an appropriate backend object, passing along additional arguments
+      # Creates an appropriate backend object, passing along additional
+      # arguments
       #
       # @param [Object] shoes_object A Shoes object
       # @return [Object] An appropriate backend object
+      #
       # @example
-      #   Shoes.configuration.backend_for(button, args) # => <Shoes::Swt::Button:0x12345678>
-      def backend_for(shoes_object, *args)
-        backend_factory(shoes_object).call(shoes_object, *args)
-      end
-
-      # Experimental replacement for #backend_for
-      def backend_with_app_for(shoes_object, *args, &blk)
-        backend_factory(shoes_object).call(shoes_object, shoes_object.app.gui, *args, &blk)
+      #   Shoes.backend_for(button, args) # => <Shoes::Swt::Button:0x12345678>
+      def backend_for(shoes_object, *args, &blk)
+        # Some element types (packager for instance) legitimately don't have
+        # an app. In those cases, don't try to get it to pass along.
+        args.unshift(shoes_object.app.gui) if shoes_object.respond_to?(:app)
+        backend_factory(shoes_object).call(shoes_object, *args, &blk)
       end
 
       def backend_factory(shoes_object)
@@ -90,7 +93,7 @@ def Shoes.configuration
 end
 
 def Shoes.backend_for(shoes_object, *args, &blk)
-  Shoes::Configuration.backend_with_app_for(shoes_object, *args, &blk)
+  Shoes::Configuration.backend_for(shoes_object, *args, &blk)
 end
 
 def Shoes.backend

data/lib/shoes/core/version.rb

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

data/lib/shoes/dimension.rb

@@ -238,11 +238,7 @@ class Shoes
 
   class ParentDimension < Dimension
     def absolute_start
-      @absolute_start ? super : parent.absolute_start
-    end
-
-    def start
-      @start ? super : parent.start
+      parent.element_start
     end
 
     def extent
@@ -253,27 +249,18 @@ class Shoes
 
     # Represents the extent, bounded by the parent container's sizing
     def extent_in_parent
-      if parent.element_end
-        # Why subtracting an absolute from an element dimension value? A
-        # diagram helped me reason out what we wanted.
-        #
-        # parent.      parent.      self.       self.    parent.      parent.
-        # abs_start    elem_start   abs_start   abs_end  elem_end     abs_end
-        # |   margin   |            |           |        |   margin   |
-        #
-        # To get our extent respecting the parent's margins, it's our absolute
-        # start, minus parent's element end (so we don't blow past the margin)
-        parent.element_end - absolute_start - PIXEL_COUNTING_ADJUSTMENT
+      if parent.element_extent
+        parent.element_extent
       else
         # If we hit this, then the extent in parent isn't available and will be
-        # ignored by the min call below
+        # ignored by the min call in extent
         Float::INFINITY
       end
     end
 
     # Represents the raw value set for extent, either on element or on parent
-    def raw_extent(original_value)
-      original_value || parent.extent
+    def raw_extent(own_original_extent)
+      own_original_extent || parent.extent
     end
   end
 end

data/lib/shoes/dimensions.rb

@@ -91,6 +91,10 @@ class Shoes
       self.margin_right, self.margin_bottom =  margin
     end
 
+    def needs_positioning?
+      true
+    end
+
     def takes_up_space?
       true
     end
@@ -166,6 +170,10 @@ class Shoes
     def initialize(*args)
       super(nil, *args)
     end
+
+    def takes_up_space?
+      false
+    end
   end
 
   # for objects that are more defined by their parents, delegates method calls

data/lib/shoes/download.rb

@@ -2,7 +2,7 @@ class Shoes
   class HttpResponse
     # Struct might be better?
     attr_accessor :headers, :body, :status
-    def initalize
+    def initialize
       @headers = {}
       @body = ''
       @status = []
@@ -10,15 +10,17 @@ class Shoes
   end
 
   class Download
-    attr_reader :progress, :response, :content_length, :gui, :transferred
+    attr_reader :app, :progress, :response, :content_length, :gui, :transferred
+
     UPDATE_STEPS = 100
 
     def initialize(app, _parent, url, opts = {}, &blk)
+      @app = app
       @url = url
       @opts = opts
       initialize_blocks(app, blk)
 
-      @gui = Shoes.configuration.backend_for(self)
+      @gui = Shoes.backend_for(self)
 
       @response = HttpResponse.new
       @finished = false

data/lib/shoes/dsl.rb

@@ -78,6 +78,7 @@ require 'shoes/common/background_element'
 require 'shoes/common/changeable'
 require 'shoes/common/clickable'
 require 'shoes/common/fill'
+require 'shoes/common/hover'
 require 'shoes/common/initialization'
 require 'shoes/common/positioning'
 require 'shoes/common/remove'
@@ -113,7 +114,6 @@ require 'shoes/image_pattern'
 require 'shoes/key_event'
 require 'shoes/line'
 require 'shoes/link'
-require 'shoes/link_hover'
 require 'shoes/list_box'
 require 'shoes/logger'
 require 'shoes/oval'
@@ -567,11 +567,11 @@ EOS
     # hover and leave just delegate to the current slot as hover and leave
     # are just defined for slots but self is always the app.
     def hover(&blk)
-      @__app__.current_slot.hover(blk)
+      @__app__.current_slot.hover(&blk)
     end
 
     def leave(&blk)
-      @__app__.current_slot.leave(blk)
+      @__app__.current_slot.leave(&blk)
     end
 
     def keypress(&blk)

data/lib/shoes/image.rb

@@ -3,6 +3,7 @@ class Shoes
     include Common::UIElement
     include Common::Style
     include Common::Clickable
+    include Common::Hover
 
     BINARY_ENCODING = Encoding.find('binary')
 

data/lib/shoes/image_pattern.rb

@@ -4,7 +4,7 @@ class Shoes
 
     def initialize(path)
       @path = path
-      @gui = Shoes.configuration.backend_for(self)
+      @gui = Shoes.backend_for(self)
     end
 
     attr_reader :gui, :path

data/lib/shoes/input_box.rb

@@ -3,6 +3,8 @@ class Shoes
     include Common::UIElement
     include Common::Style
     include Common::Changeable
+    include Common::State
+
 
     def before_initialize(styles, text)
       styles[:text] = text.to_s
@@ -13,11 +15,6 @@ class Shoes
       update_visibility
     end
 
-    def state=(value)
-      style(state: value)
-      @gui.enabled value.nil?
-    end
-
     def focus
       @gui.focus
     end

data/lib/shoes/internal_app.rb

@@ -16,8 +16,7 @@ class Shoes
     DEFAULT_OPTIONS = { width: 600,
                         height: 500,
                         title: "Shoes 4",
-                        resizable: true,
-                        background: Shoes::COLORS.fetch(:shoes_background) }.freeze
+                        resizable: true }.freeze
 
     def initialize(app, opts, &blk)
       @app = app
@@ -27,6 +26,7 @@ class Shoes
     end
 
     def setup_gui
+      ensure_backend_loaded
       @gui = Shoes.configuration.backend::App.new self
 
       self.current_slot = create_top_slot
@@ -37,6 +37,13 @@ class Shoes
       register_console_keypress
     end
 
+    def ensure_backend_loaded
+      if !defined?(Shoes.configuration.backend::App)
+        backend_const = Shoes.load_backend(Shoes.configuration.backend_name)
+        backend_const.initialize_backend
+      end
+    end
+
     attr_reader :gui, :top_slot, :app, :dimensions,
                 :mouse_motion, :owner, :element_styles, :resize_callbacks
     attr_accessor :elements, :current_slot, :opts, :blk, :mouse_button,
@@ -102,6 +109,10 @@ class Shoes
       mouse_hover_controls << element
     end
 
+    def remove_mouse_hover_control(element)
+      mouse_hover_controls.delete(element)
+    end
+
     def open_gui
       gui.open
     end

data/lib/shoes/line.rb

@@ -6,6 +6,7 @@ class Shoes
     include Common::Stroke
     include Common::Style
     include Common::Clickable
+    include Common::Hover
 
     attr_reader :point_a, :point_b
 

data/lib/shoes/link.rb

@@ -1,6 +1,9 @@
 class Shoes
   class Link < Span
     include Common::Style
+    include Common::Fill
+    include Common::Stroke
+    include Common::Hover
 
     attr_reader :app, :gui, :blk
     style_with :common_styles, :text_block_styles
@@ -15,6 +18,11 @@ class Shoes
       super texts, @style
     end
 
+    # Force hovering evaluation up in parent where we have actual dimensions
+    def eval_in_parent?
+      true
+    end
+
     # Doesn't use Common::Clickable because of URL flavor option clicks
     def setup_click(blk)
       if blk.nil?

data/lib/shoes/list_box.rb

@@ -28,6 +28,7 @@ class Shoes
     include Common::UIElement
     include Common::Style
     include Common::Changeable
+    include Common::State
 
     style_with :change, :choose, :common_styles, :dimensions, :items, :state, :text
     STYLES = { width: 200, height: 20, items: [""] }
@@ -37,6 +38,7 @@ class Shoes
     end
 
     def after_initialize
+      super
       proxy_array = Shoes::ProxyArray.new(items, @gui)
       @style[:items] = proxy_array
     end
@@ -63,10 +65,5 @@ class Shoes
     end
 
     alias_method :choose=, :choose
-
-    def state=(value)
-      style(state: value)
-      @gui.enabled value.nil?
-    end
   end
 end

data/lib/shoes/mock/check.rb

@@ -5,6 +5,9 @@ class Shoes
       include Shoes::Mock::Clickable
 
       def initialize(*_opts)
+        # SWT backend sets a size, so mimic that in the mock
+        super
+        @dsl.width ||= 22
       end
 
       def checked?

data/lib/shoes/mock/image.rb

@@ -6,6 +6,12 @@ class Shoes
 
       attr_accessor :left, :top
 
+      def initialize(*_)
+        # SWT backend sets a size, so mimic that in the mock
+        super
+        @dsl.width ||= 22
+      end
+
       def update_image
       end
     end

data/lib/shoes/mock/progress.rb

@@ -3,6 +3,12 @@ class Shoes
     class Progress
       include Shoes::Mock::CommonMethods
 
+      def initialize(*_)
+        # SWT backend sets a size, so mimic that in the mock
+        super
+        @dsl.width ||= 140
+      end
+
       def fraction=(_fraction)
       end
     end

data/lib/shoes/mock/radio.rb

@@ -5,6 +5,9 @@ class Shoes
       include Shoes::Mock::Clickable
 
       def initialize(*_opts)
+        # SWT backend sets a size, so mimic that in the mock
+        super
+        @dsl.width ||= 22
       end
 
       def checked?

data/lib/shoes/mock/sound.rb

@@ -1,7 +1,7 @@
 class Shoes
   module Mock
     class Sound
-      def initialize(_dsl)
+      def initialize(_dsl, _app)
       end
     end
   end

data/lib/shoes/oval.rb

@@ -5,6 +5,7 @@ class Shoes
     include Common::Stroke
     include Common::Style
     include Common::Clickable
+    include Common::Hover
 
     style_with :art_styles, :center, :common_styles, :dimensions, :radius
     STYLES = { fill: Shoes::COLORS[:black] }

data/lib/shoes/packager.rb

@@ -4,7 +4,7 @@ class Shoes
 
     def initialize
       begin
-        @backend = Shoes.configuration.backend_for(self)
+        @backend = Shoes.backend_for(self)
       rescue ArgumentError
         # Packaging unsupported by this backend
       end