shoes-core 4.0.0.pre12 → 4.0.0.rc1

data/lib/shoes/common/translate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Translate

data/lib/shoes/common/ui_element.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     class UIElement
@@ -88,6 +89,29 @@ class Shoes
 
       def update_stroke
       end
+
+      # Some element types (arrows, shapes) don't necessarily track their
+      # element locations in the standard way. Let them inform redrawing about
+      # the actual bounds to redraw within by overriding these methods
+      def redraw_left
+        element_left
+      end
+
+      def redraw_top
+        element_top
+      end
+
+      def redraw_width
+        element_width
+      end
+
+      def redraw_height
+        element_height
+      end
+
+      def painted?
+        false
+      end
     end
   end
 end

data/lib/shoes/common/visibility.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Visibility
@@ -8,8 +9,10 @@ class Shoes
         self
       end
 
+      # Root method for determining whether we're visible or not, taking into
+      # account our parent chain's visibility.
       def hidden?
-        style[:hidden]
+        (defined?(@parent) && @parent&.hidden?) || style[:hidden]
       end
 
       alias hidden hidden?
@@ -18,6 +21,18 @@ class Shoes
         !hidden?
       end
 
+      def hidden_from_view?
+        hidden? || outside_parent_view?
+      end
+
+      def outside_parent_view?
+        # Painted elements handle slot bounds themselves when painting
+        return false if @parent.nil? || @parent.variable_height? || painted?
+
+        # We hide when we're at all outside our parent's bounds
+        !@parent.contains?(dimensions)
+      end
+
       # Reveals the element, if it is hidden. See also #hide and #toggle.
       def show
         style(hidden: false)
@@ -33,6 +48,11 @@ class Shoes
 
       private
 
+      # Backend elements are expected to respond to update_visibility, and use
+      # the hidden? or visible? accessors to assess their proper display state.
+      #
+      # These take into account parent visibility, versus styling which applies
+      # only to the element itself.
       def update_visibility
         gui.update_visibility
         self

data/lib/shoes/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Configuration
     class << self

data/lib/shoes/console.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Console
     attr_reader :messages, :message_stacks
@@ -76,7 +77,7 @@ class Shoes
     end
 
     def add_message_stack(type, message, index = nil)
-      return unless @app && @app.open?
+      return unless defined?(@app) && @app.open?
 
       @app.instance_exec do
         append do

data/lib/shoes/core.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require 'shoes/dsl'

data/lib/shoes/core/version.rb

@@ -2,6 +2,6 @@
 
 class Shoes
   module Core
-    VERSION = "4.0.0.pre12"
+    VERSION = "4.0.0.rc1"
   end
 end

data/lib/shoes/dialog.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Dialog
     def initialize
@@ -42,7 +43,7 @@ class Shoes
         end
 
         def result
-          @result
+          @result ||= nil
         end
       end
 

data/lib/shoes/dimension.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Dimension
     attr_reader :parent
@@ -15,9 +16,22 @@ class Shoes
     PIXEL_COUNTING_ADJUSTMENT = -1
 
     def initialize(parent = nil, start_as_center = false)
-      @parent          = parent
-      @start_as_center = start_as_center
-      @combined_margins = 0
+      @parent              = parent
+      @start_as_center     = start_as_center
+      @combined_margins    = 0
+      @displace_start      = nil
+      @displace_start_relative = nil
+      @end                 = nil
+      @extent              = nil
+      @extent_negative     = nil
+      @extent_relative     = nil
+      @margin_end          = nil
+      @margin_end_relative = nil
+      @margin_start        = nil
+      @margin_start_relative = nil
+      @start               = nil
+      @start               = nil
+      @start_relative      = nil
     end
 
     def start
@@ -45,8 +59,6 @@ class Shoes
 
       @extent_relative = relative?(@extent)
       @extent_negative = negative?(@extent)
-
-      @extent
     end
 
     def absolute_end
@@ -138,7 +150,6 @@ class Shoes
       @margin_start = parse_int_value(value)
 
       @combined_margins = margin_start + margin_end
-      @margin_start
     end
 
     def margin_end=(value)
@@ -146,7 +157,6 @@ class Shoes
       @margin_end = parse_int_value(value)
 
       @combined_margins = margin_start + margin_end
-      @margin_end
     end
 
     def displace_start=(value)

data/lib/shoes/dimensions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Dimensions is a central class that most Shoes classes use to represent their
 # dimensions, e.g. where they are and how much space they are taking up there.
 # All the different position types might be confusing. So here is a little list:
@@ -82,6 +83,16 @@ class Shoes
       x_dimension.in_bounds?(x) && y_dimension.in_bounds?(y)
     end
 
+    def contains?(other)
+      return false unless other.element_left && other.element_top &&
+                          other.element_right && other.element_bottom
+
+      element_left <= other.element_left &&
+        element_right >= other.element_right &&
+        element_top <= other.element_top &&
+        element_bottom >= other.element_bottom
+    end
+
     def margin
       [margin_left, margin_top, margin_right, margin_bottom]
     end
@@ -205,7 +216,7 @@ class Shoes
     WRITER_METHODS.each do |meth|
       key = meth.to_s.sub("=", "").to_sym
       define_method(meth) do |value|
-        @style[key] = value if @style
+        @style[key] = value if defined?(@style)
         dimensions.send(meth, value)
       end
     end

data/lib/shoes/download.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class HttpResponse
     # Struct might be better?

data/lib/shoes/dsl.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'delegate'
 require 'fileutils'
 require 'forwardable'
@@ -24,7 +25,7 @@ class Shoes
     end
 
     def logger
-      return @logger if @logger
+      return @logger if defined?(@logger)
 
       @logger ||= Shoes::LoggerCollection.new
       @logger << Shoes::StandardLogger.new

data/lib/shoes/dsl/animate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module DSL
     module Animate

data/lib/shoes/dsl/art.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module DSL
     module Art
@@ -23,12 +24,12 @@ class Shoes
 
         left, top, width, *leftovers = args
 
-        message = <<EOS
-Too many arguments. Must be one of:
-  - arrow(left, top, width, [opts])
-  - arrow(left, top, [opts])
-  - arrow(left, [opts])
-  - arrow([opts])
+        message = <<~EOS
+          Too many arguments. Must be one of:
+            - arrow(left, top, width, [opts])
+            - arrow(left, top, [opts])
+            - arrow(left, [opts])
+            - arrow([opts])
 EOS
         raise ArgumentError, message if leftovers.any?
 
@@ -51,15 +52,15 @@ EOS
 
         left, top, width, height, angle1, angle2, *leftovers = args
 
-        message = <<EOS
-Too many arguments. Must be one of:
-  - arc(left, top, width, height, angle1, angle2, [opts])
-  - arc(left, top, width, height, angle1, [opts])
-  - arc(left, top, width, height, [opts])
-  - arc(left, top, width, [opts])
-  - arc(left, top, [opts])
-  - arc(left, [opts])
-  - arc([opts])
+        message = <<~EOS
+          Too many arguments. Must be one of:
+            - arc(left, top, width, height, angle1, angle2, [opts])
+            - arc(left, top, width, height, angle1, [opts])
+            - arc(left, top, width, height, [opts])
+            - arc(left, top, width, [opts])
+            - arc(left, top, [opts])
+            - arc(left, [opts])
+            - arc([opts])
 EOS
         raise ArgumentError, message if leftovers.any?
 
@@ -78,13 +79,13 @@ EOS
 
         x1, y1, x2, y2, *leftovers = args
 
-        message = <<EOS
-Too many arguments. Must be one of:
-  - line(x1, y1, x2, y2, [opts])
-  - line(x1, y1, x2, [opts])
-  - line(x1, y1, [opts])
-  - line(x1, [opts])
-  - line([opts])
+        message = <<~EOS
+          Too many arguments. Must be one of:
+            - line(x1, y1, x2, y2, [opts])
+            - line(x1, y1, x2, [opts])
+            - line(x1, y1, [opts])
+            - line(x1, [opts])
+            - line([opts])
 EOS
         raise ArgumentError, message if leftovers.any?
 
@@ -118,13 +119,13 @@ EOS
 
         left, top, width, height, *leftovers = args
 
-        message = <<EOS
-Wrong number of arguments. Must be one of:
-  - oval(left, top, width, height, [opts])
-  - oval(left, top, diameter, [opts])
-  - oval(left, top, [opts])
-  - oval(left, [opts])
-  - oval(styles)
+        message = <<~EOS
+          Wrong number of arguments. Must be one of:
+            - oval(left, top, width, height, [opts])
+            - oval(left, top, diameter, [opts])
+            - oval(left, top, [opts])
+            - oval(left, [opts])
+            - oval(styles)
 EOS
         raise ArgumentError, message if leftovers.any?
 
@@ -159,14 +160,14 @@ EOS
         left, top, width, height, curve, *leftovers = args
         opts[:curve] = curve if curve
 
-        message = <<EOS
-Wrong number of arguments. Must be one of:
-  - rect(left, top, width, height, curve, [opts])
-  - rect(left, top, width, height, [opts])
-  - rect(left, top, side, [opts])
-  - rect(left, top, [opts])
-  - rect(left, [opts])
-  - rect(styles)
+        message = <<~EOS
+          Wrong number of arguments. Must be one of:
+            - rect(left, top, width, height, curve, [opts])
+            - rect(left, top, width, height, [opts])
+            - rect(left, top, side, [opts])
+            - rect(left, top, [opts])
+            - rect(left, [opts])
+            - rect(styles)
 EOS
 
         raise ArgumentError, message if leftovers.any?
@@ -207,14 +208,14 @@ EOS
 
         left, top, points, outer, inner, *leftovers = args
 
-        message = <<EOS
-Wrong number of arguments. Must be one of:
-  - star([styles])
-  - star(left, [styles])
-  - star(left, top, [styles])
-  - star(left, top, points, [styles])
-  - star(left, top, points, outer, [styles])
-  - star(left, top, points, outer, inner, [styles])
+        message = <<~EOS
+          Wrong number of arguments. Must be one of:
+            - star([styles])
+            - star(left, [styles])
+            - star(left, top, [styles])
+            - star(left, top, points, [styles])
+            - star(left, top, points, outer, [styles])
+            - star(left, top, points, outer, inner, [styles])
 EOS
         raise ArgumentError, message if leftovers.any?
 
@@ -240,11 +241,11 @@ EOS
 
         left, top, *leftovers = args
 
-        message = <<EOS
-Wrong number of arguments. Must be one of:
-  - shape(left, top, [opts])
-  - shape(left, [opts])
-  - shape([opts])
+        message = <<~EOS
+          Wrong number of arguments. Must be one of:
+            - shape(left, top, [opts])
+            - shape(left, [opts])
+            - shape([opts])
 EOS
 
         raise ArgumentError, message if leftovers.any?

data/lib/shoes/dsl/element.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module DSL
     module Element

data/lib/shoes/dsl/interaction.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module DSL
     module Interaction

data/lib/shoes/dsl/media.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module DSL
     module Media
@@ -12,9 +13,9 @@ class Shoes
           opts = style_normalizer.normalize pop_style(args)
           path, *leftovers = args
 
-          message = <<EOS
-Wrong number of arguments. Must be:
-  - image(path, [opts])
+          message = <<~EOS
+            Wrong number of arguments. Must be:
+              - image(path, [opts])
 EOS
           raise ArgumentError, message if leftovers.any?
 

data/lib/shoes/dsl/setup.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class << self
     # To ease the upgrade path from Shoes 3 we warn users they need to install