shoes-core 4.0.0.pre4 → 4.0.0.pre5

data/lib/shoes/rect.rb

@@ -4,6 +4,7 @@ class Shoes
     include Common::Fill
     include Common::Stroke
     include Common::Clickable
+    include Common::Hover
     include Common::Style
 
     style_with :angle, :art_styles, :curve, :common_styles, :dimensions

data/lib/shoes/shape.rb

@@ -39,6 +39,10 @@ class Shoes
       @app.height
     end
 
+    def fixed_height?
+      false
+    end
+
     # Moves the shape
     #
     # @param [Integer] left The new left value

data/lib/shoes/slot.rb

@@ -2,6 +2,7 @@ class Shoes
   class Slot
     include Common::UIElement
     include Common::Clickable
+    include Common::Hover
     include Common::Style
 
     # We need that offset because otherwise element overlap e.g. occupy
@@ -9,7 +10,7 @@ class Shoes
     # See #update_current_position
     NEXT_ELEMENT_OFFSET = 1
 
-    attr_reader :parent, :dimensions, :gui, :contents, :blk, :hover_proc, :leave_proc
+    attr_reader :parent, :dimensions, :gui, :contents, :blk
 
     style_with :art_styles, :attach, :common_styles, :dimensions, :scroll
     STYLES = { scroll: false, fill: Shoes::COLORS[:black] }
@@ -28,14 +29,13 @@ class Shoes
     end
 
     def handle_block(blk)
+      @current_position = CurrentPosition.new element_left,
+                                              element_top,
+                                              element_top
       @blk = blk
       eval_block blk
     end
 
-    def after_initialize(*_)
-      contents_alignment
-    end
-
     def set_default_dimension_values
       self.width          ||= 1.0
       self.height         ||= 0
@@ -63,6 +63,50 @@ class Shoes
 
     def add_child(element)
       contents.add_element element
+
+      if !element.hidden? && element.takes_up_space?
+        # Prepending would entail repositioning everyone after us, so just give
+        # it up and let contents_alignment save us the work.
+        if contents.prepending?
+          contents_alignment
+        else
+          original_height = self.height
+          @current_position = positioning(element, @current_position)
+
+          height_delta = slot_grew_by(original_height)
+          bump_parent_current_position(height_delta)
+        end
+      end
+    end
+
+    def slot_grew_by(original_height)
+      determine_slot_height
+      self.height - original_height
+    end
+
+    def bump_parent_current_position(height_delta)
+      return unless height_delta > 0
+      return unless parent.respond_to?(:bump_current_position)
+
+      parent.bump_current_position(self, height_delta)
+    end
+
+    # This method gets called when one of our child slots got larger, so we
+    # need to move our current position to accomodate.
+    def bump_current_position(growing_slot, height_delta)
+      # If intermediate child changed, give up and hit it with the big hammer
+      if any_sibling_slots_following?(growing_slot)
+        contents_alignment
+      else
+        @current_position.y += height_delta
+        @current_position.next_line_start += height_delta
+      end
+    end
+
+    def any_sibling_slots_following?(growing_slot)
+      next_sibling  = contents.index(growing_slot) + 1
+      next_siblings = contents[next_sibling..-1]
+      next_siblings.any? { |e| e.is_a?(Slot) }
     end
 
     def remove_child(element)
@@ -84,28 +128,8 @@ class Shoes
       determine_slot_height
     end
 
-    def hovered?
-      @hovered
-    end
-
-    def hover(blk)
-      @hover_proc = blk
-      @app.add_mouse_hover_control self
-    end
-
-    def leave(blk)
-      @leave_proc = blk
-      @app.add_mouse_hover_control self
-    end
-
-    def mouse_hovered
-      @hovered = true
-      @hover_proc.call(self) if @hover_proc
-    end
-
-    def mouse_left
-      @hovered = false
-      @leave_proc.call(self) if @leave_proc
+    def add_mouse_hover_control
+      @app.add_mouse_hover_control(self)
     end
 
     def scroll_height
@@ -128,25 +152,36 @@ class Shoes
       "#<#{self.class}:0x#{hash.to_s(16)} @contents=#{@contents.inspect} and so much stuff literally breaks the memory limit. Look at it selectively.>"
     end
 
+    def fixed_height?
+      !!@fixed_height
+    end
+
+    def variable_height?
+      !@fixed_height
+    end
+
     protected
 
     CurrentPosition = Struct.new(:x, :y, :next_line_start)
 
     def position_contents
-      current_position = CurrentPosition.new element_left,
+      @current_position = CurrentPosition.new element_left,
                                              element_top,
                                              element_top
 
       contents.each do |element|
         next if element.hidden?
-        current_position = positioning(element, current_position)
+        @current_position = positioning(element, @current_position)
       end
-      current_position
+      @current_position
     end
 
     def positioning(element, current_position)
-      position_element element, current_position
-      element.contents_alignment(current_position) if element.respond_to? :contents_alignment
+      if element.needs_positioning?
+        position_element element, current_position
+        element.contents_alignment(current_position) if element.respond_to? :contents_alignment
+      end
+
       if element.takes_up_space?
         update_current_position(current_position, element)
       else
@@ -244,7 +279,7 @@ class Shoes
 
     def determine_slot_height
       content_height = compute_content_height
-      self.height = content_height if variable_height?
+      self.element_height = content_height if variable_height?
       content_height
     end
 
@@ -256,18 +291,17 @@ class Shoes
                     max
 
       if max_bottom
-        max_bottom - self.absolute_top + NEXT_ELEMENT_OFFSET
+        max_bottom - self.element_top + NEXT_ELEMENT_OFFSET
       else
         0
       end
     end
-
-    def variable_height?
-      !@fixed_height
-    end
   end
 
   class Flow < Slot
+    # Included to generate the *Hover class
+    include Common::Hover
+
     def position_element(element, current_position)
       if fits_on_the_same_line?(element, current_position.x)
         position_in_current_line(element, current_position)
@@ -278,6 +312,9 @@ class Shoes
   end
 
   class Stack < Slot
+    # Included to generate the *Hover class
+    include Common::Hover
+
     def position_element(element, current_position)
       move_to_next_line(element, current_position)
     end

data/lib/shoes/slot_contents.rb

@@ -9,6 +9,10 @@ class Shoes
       super(@contents)
     end
 
+    def prepending?
+      @prepending
+    end
+
     def add_element(element)
       if @prepending
         prepend_element element

data/lib/shoes/sound.rb

@@ -3,13 +3,14 @@ class Shoes
     include Common::Inspect
 
     def initialize(parent, filepath, _opts = {}, &_blk)
+      @app    = parent
       @parent = parent
       @filepath = filepath
 
-      @gui = Shoes.configuration.backend_for(self)
+      @gui = Shoes.backend_for(self)
     end
 
-    attr_reader :gui, :filepath, :parent
+    attr_reader :app, :gui, :filepath, :parent
 
     def play
       @gui.play

data/lib/shoes/star.rb

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

data/lib/shoes/text_block.rb

@@ -6,6 +6,7 @@ class Shoes
     include Common::UIElement
     include Common::Style
     include Common::Clickable
+    include Common::Hover
     include TextBlockDimensionsDelegations
 
     attr_reader :text, :contents, :text_styles
@@ -18,17 +19,27 @@ class Shoes
       @dimensions = TextBlockDimensions.new @parent, @style
     end
 
-    def after_initialize(text)
+    def add_to_parent(text)
       handle_styles @style
 
-      # Important to use accessor and do this after the backend exists!
+      # Important to use accessor and do this after the backend exists, but
+      # before we place ourselves in the parent container!
       self.text = Array(text)
+
+      super
     end
 
     def in_bounds?(*args)
       @gui.in_bounds?(*args)
     end
 
+    def remove
+      super
+      links.each do |link|
+        @app.remove_mouse_hover_control(link)
+      end
+    end
+
     def text=(*texts)
       replace(*texts[0])
     end
@@ -138,6 +149,11 @@ class Shoes
     clazz = Class.new(TextBlock) do
       const_set("STYLES", { font: DEFAULT_TEXTBLOCK_FONT, fill: nil }.merge(styles))
     end
+
     Shoes.const_set(name, clazz)
+
+    clazz.class_eval do
+      include Shoes::Common::Hover
+    end
   end
 end

data/lib/shoes/text_block_dimensions.rb

@@ -29,9 +29,21 @@ class Shoes
       10
     end
 
-    # This is the width the text block initially wants to try and fit into.
-    def desired_width(containing = containing_width)
-      parent.absolute_left + containing - absolute_left - margin_left - margin_right
+    # This is the width the text block initially wants to try to fit in.
+    #
+    # If an explicit containing width is provided, trust that most
+    # If we've gotten an explicit width, use that but check that we fit still
+    # Last but certainly not least, consult what's remaining in our parent.
+    def desired_width(containing = nil)
+      if containing
+        desired = parent.absolute_left + containing - absolute_left
+      elsif element_width
+        desired = [element_width, remaining_in_parent].min
+      else
+        desired = remaining_in_parent
+      end
+
+      desired - margin_left - margin_right
     end
 
     # If an explicit width's set, use that when asking how much space we need.
@@ -39,6 +51,10 @@ class Shoes
     def containing_width
       element_width || parent.element_width
     end
+
+    def remaining_in_parent
+      parent.absolute_left + parent.element_width - absolute_left
+    end
   end
 
   module TextBlockDimensionsDelegations

data/lib/shoes/timer.rb

@@ -6,9 +6,9 @@ class Shoes
       @app = app
       @n   = n
       @blk = @app.current_slot.create_bound_block(blk)
-      @gui = Shoes.configuration.backend_for(self, @app.gui, @blk)
+      @gui = Shoes.backend_for(self, @blk)
     end
 
-    attr_reader :n, :gui
+    attr_reader :app, :n, :gui
   end
 end

data/lib/shoes/ui/picker.rb

@@ -3,12 +3,12 @@ class Shoes
     # This class is used for interactively (if necessary) picking the Shoes
     # backend that the user will run their Shoes app with.
     class Picker
-      def initialize(input=STDIN, output=STDOUT)
+      def initialize(input = STDIN, output = STDOUT)
         @input  = input
         @output = output
       end
 
-      def run(bin_dir, desired_backend=nil)
+      def run(bin_dir, desired_backend = nil)
         bundle
         generator_file = select_generator(desired_backend)
         write_backend(generator_file, bin_dir)
@@ -25,7 +25,7 @@ class Shoes
         require 'bundler/setup'
       end
 
-      def select_generator(desired_backend=nil)
+      def select_generator(desired_backend = nil)
         candidates = find_candidates(desired_backend)
 
         if candidates.empty?
@@ -75,7 +75,7 @@ class Shoes
 
       def name_for_candidate(candidate)
         /.*lib\/shoes\/(.*)\/generate-backend.rb/.match(candidate)
-        return "shoes-#{$1.gsub("/", "-")}"
+        return "shoes-#{$1.gsub('/', '-')}"
       end
 
       def write_backend(generator_file, bin_dir)

data/lib/shoes/version.rb

@@ -1,3 +1,3 @@
 class Shoes
-  VERSION = "4.0.0.pre4"
+  VERSION = "4.0.0.pre5"
 end

data/shoes-core.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = "Shoes is the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple. This is the DSL for writing your app. You'll need a backend to run it."
   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/animation_spec.rb

@@ -1,4 +1,4 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 shared_examples_for Shoes::Animation do
   it "should start" do
@@ -60,7 +60,7 @@ describe Shoes::Animation do
   it { is_expected.not_to be_stopped }
 
   describe "with framerate" do
-    let(:opts) { {:framerate => 36, :app => app} }
+    let(:opts) { {framerate: 36, app: app} }
 
     it "sets framerate" do
       expect(subject.framerate).to eq(36)

data/spec/shoes/app_spec.rb

@@ -1,4 +1,4 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 describe Shoes::App do
   let(:input_blk) { Proc.new {} }
@@ -64,7 +64,7 @@ describe Shoes::App do
     end
 
     context "from opts" do
-      let(:opts) { {:width => 150, :height => 2, :title => "Shoes::App Spec", :resizable => false} }
+      let(:opts) { {width: 150, height: 2, title: "Shoes::App Spec", resizable: false} }
 
       it "sets width", :qt do
         expect(subject.width).to eq opts[:width]
@@ -125,11 +125,9 @@ describe Shoes::App do
         it "passes default to objects" do
           expect(subject.line(0, 100, 100, 0).style[key]).to eq(value)
         end
-
       end
     end
 
-
     describe "default styles" do
       it "are independent among Shoes::App instances" do
         app1 = Shoes::App.new
@@ -140,7 +138,6 @@ describe Shoes::App do
 
         # .. but does not affect app2
         expect(app2.line(0, 100, 100, 0).style[:strokewidth]).not_to eq(10)
-
       end
     end
   end
@@ -164,7 +161,6 @@ describe Shoes::App do
         expect(subject.line(0, 100, 100, 0).style[style]).to eq('val')
       end
     end
-
   end
 
   describe "connecting with gui" do
@@ -234,7 +230,7 @@ describe Shoes::App do
         expect(app).not_to be_fullscreen
       end
 
-      it 'can enter fullscreen' do
+      it 'can enter fullscreen', :fullscreen do
         app.fullscreen = true
         expect(app).to be_fullscreen
       end
@@ -248,18 +244,15 @@ describe Shoes::App do
         app.fullscreen = false
       end
 
-      # Failing on Mac fullscreen doesnt seem to work see #397
-      it 'is not in fullscreen', :fails_on_osx do
+      it 'is not in fullscreen', :fullscreen do
         expect(app).not_to be_fullscreen
       end
 
-      # Failing on Mac fullscreen doesnt seem to work see #397
-      it 'has its origina', :fails_on_osx do
+      it 'has its original', :fullscreen do
         expect(app.width).to eq(defaults[:width])
       end
 
-      # Failing on Mac fullscreen doesnt seem to work see #397
-      it 'has its original height', :fails_on_osx do
+      it 'has its original height', :fullscreen do
         expect(app.height).to eq(defaults[:height])
       end
     end
@@ -311,7 +304,6 @@ describe Shoes::App do
         expect(my_parent).to eq my_stack
       end
     end
-
   end
 
   describe "additional context" do
@@ -352,7 +344,6 @@ describe Shoes::App do
   end
 
   describe 'subscribing to DSL methods' do
-
     class TestSubscribeClass
       attr_reader :app
       def initialize(app)
@@ -384,7 +375,6 @@ describe Shoes::App do
     end
 
     describe '.new_dsl_method (for widget method notifications etc.)' do
-
       before :each do
         Shoes::App.new_dsl_method :widget_method do
           # noop
@@ -417,7 +407,6 @@ describe Shoes::App do
         it {is_expected.not_to include :parent, :app}
       end
     end
-
   end
 end