shoes-core 4.0.0.pre12 → 4.0.0.rc1

data/lib/shoes/shape.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Shape < Common::ArtElement
     attr_reader :blk, :x, :y, :left_bound, :top_bound, :right_bound, :bottom_bound
@@ -6,6 +7,16 @@ class Shoes
     style_with :art_styles, :center, :common_styles, :dimensions
     STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
+    def initialize(*args)
+      @bottom_bound = nil
+      @left_bound = nil
+      @right_bound = nil
+      @top_bound = nil
+      @x = nil
+      @y = nil
+      super
+    end
+
     def create_dimensions(left, top)
       left ||= @style[:left] || 0
       top  ||= @style[:top] || 0
@@ -50,6 +61,26 @@ class Shoes
       false
     end
 
+    def redraw_left
+      return 0 unless @left_bound
+      @left_bound - strokewidth.to_i
+    end
+
+    def redraw_top
+      return 0 unless @top_bound
+      @top_bound - strokewidth.to_i
+    end
+
+    def redraw_width
+      return 0 unless element_width
+      element_width + 2 * strokewidth.to_i
+    end
+
+    def redraw_height
+      return 0 unless element_height
+      element_height + 2 * strokewidth.to_i
+    end
+
     # Moves the shape
     #
     # @param [Integer] left The new left value

data/lib/shoes/slot.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Slot < Common::UIElement
     include Common::Clickable
@@ -11,6 +12,9 @@ class Shoes
 
     attr_reader :parent, :dimensions, :gui, :contents, :blk
 
+    attr_reader :scroll_top
+    attr_accessor :scroll_height
+
     style_with :art_styles, :attach, :common_styles, :dimensions, :scroll
     STYLES = { scroll: false, fill: Shoes::COLORS[:black] }.freeze
 
@@ -25,16 +29,21 @@ class Shoes
 
     def before_initialize(*_)
       @contents = SlotContents.new
+      @last_hidden_state = nil
     end
 
     def handle_block(blk)
-      @current_position = Position.new element_left,
-                                       element_top,
-                                       element_top
+      snapshot_current_position
+
       @blk = blk
       eval_block blk
     end
 
+    def snapshot_current_position
+      top = element_top - scroll_offset
+      @current_position = Position.new element_left, top, top
+    end
+
     def set_default_dimension_values
       self.width          ||= 1.0
       self.height         ||= 0
@@ -129,6 +138,9 @@ class Shoes
 
     def contents_alignment(_ = nil)
       position_contents
+      update_child_visibility
+
+      # Layout code expects height returned!
       determine_slot_height
     end
 
@@ -136,17 +148,22 @@ class Shoes
       @app.add_mouse_hover_control(self)
     end
 
-    def scroll_height
-      position_contents.y
-    end
+    def scroll_top=(value)
+      unless scroll
+        Shoes.logger.warn "You've set scroll_top on a slot (#<#{self.class}:0x#{hash.to_s(16)}...>) that isn't scrollable. This will be ignored."
+        return
+      end
 
-    def scroll_max
-      scroll_height - height
+      value = 0 if value.negative?
+      @scroll_top = [value, scroll_max].min
     end
 
-    attr_reader :scroll_top
+    def scroll_max
+      contents_alignment
+      return 0 unless scroll_height && height
 
-    attr_writer :scroll_top
+      [scroll_height - height, 0].max
+    end
 
     def app
       @app.app # return the Shoes::App not the internal app
@@ -169,14 +186,13 @@ class Shoes
     Position = Struct.new(:x, :y, :next_line_start)
 
     def position_contents
-      @current_position = Position.new element_left,
-                                       element_top,
-                                       element_top
+      snapshot_current_position
 
       contents.each do |element|
         next if element.hidden?
         @current_position = positioning(element, @current_position)
       end
+
       @current_position
     end
 
@@ -309,6 +325,7 @@ class Shoes
 
     def determine_slot_height
       content_height = compute_content_height
+      self.scroll_height = content_height
       self.element_height = content_height if variable_height?
       content_height
     end
@@ -321,11 +338,32 @@ class Shoes
                    .max
 
       if max_bottom
-        max_bottom - element_top + NEXT_ELEMENT_OFFSET
+        max_bottom - (element_top - scroll_offset) + NEXT_ELEMENT_OFFSET
       else
         0
       end
     end
+
+    def update_visibility
+      # Always update our backend via common implementation
+      super
+
+      # Only alter contents on a visibility change
+      if @last_hidden_state != hidden?
+        @last_hidden_state = hidden?
+        update_child_visibility
+      end
+
+      self
+    end
+
+    def update_child_visibility
+      contents.each(&:update_visibility)
+    end
+
+    def scroll_offset
+      scroll ? @scroll_top : 0
+    end
   end
 
   class Flow < Slot

data/lib/shoes/slot_contents.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class SlotContents < SimpleDelegator
     include Common::Inspect

data/lib/shoes/sound.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Sound
     include Common::Inspect

data/lib/shoes/span.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Span < Text
     def initialize(texts, styles = {})

data/lib/shoes/standard_logger.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'logger'
 
 class Shoes

data/lib/shoes/star.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 class Shoes
   class Star < Common::ArtElement
-    style_with :angle, :art_styles, :common_styles, :dimensions, :inner, :outer, :points
-    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
+    style_with :art_styles, :center, :common_styles, :dimensions, :inner, :outer, :points
+    STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
     # Don't use param defaults as DSL explicit passes nil for missing params
     def create_dimensions(left, top, points, outer, inner)
@@ -35,5 +36,31 @@ class Shoes
       element_left - dx <= x && x <= element_right - dx &&
         element_top - dy <= y && y <= element_bottom - dy
     end
+
+    def redraw_left
+      return 0 unless element_left
+      if center
+        element_left - width * 0.5 - style[:strokewidth].to_i
+      else
+        super
+      end
+    end
+
+    def redraw_top
+      return 0 unless element_top
+      if center
+        element_top - width * 0.5 - style[:strokewidth].to_i
+      else
+        super
+      end
+    end
+
+    def redraw_width
+      element_width + style[:strokewidth].to_i * 2
+    end
+
+    def redraw_height
+      element_height + style[:strokewidth].to_i * 2
+    end
   end
 end

data/lib/shoes/text.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Text
     include Common::Inspect

data/lib/shoes/text_block.rb

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
+
 class Shoes
   CENTER = "center"
   DEFAULT_TEXTBLOCK_FONT = "Arial"
 
+  FONT_ALIASES = {
+    "Monospace" => "Fira Mono",
+    "Sans Serif" => "Lucida console",
+  }.freeze
+
   class TextBlock < Common::UIElement
     include Common::Clickable
     include Common::Hover
@@ -11,7 +17,8 @@ class Shoes
     include TextBlockDimensionsDelegations
 
     attr_reader :text, :contents, :text_styles
-    attr_accessor :cursor, :textcursor
+    attr_writer :textcursor
+    attr_accessor :cursor
 
     style_with :common_styles, :dimensions, :text_block_styles, :translate
     STYLES = { font: DEFAULT_TEXTBLOCK_FONT }.freeze # used in TextBlock specs only
@@ -133,6 +140,9 @@ class Shoes
       @style[:font] = font_family.first unless (font_family.size == 1 &&
         font_family[0] == "") || font_family.empty?
 
+      aliased_font = FONT_ALIASES[@style[:font]]
+      @style[:font] = aliased_font if aliased_font
+
       fsize = size_regex.match(type)
       @style[:size] = fsize[1].to_i unless fsize.nil?
 

data/lib/shoes/text_block_dimensions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   # We take over a bunch of the absolute_* measurements since the jagged
   # shape of a flowed TextBlock doesn't follow the usual rules for dimensions
@@ -7,6 +8,14 @@ class Shoes
     attr_writer :absolute_right, :absolute_bottom,
                 :calculated_width, :calculated_height
 
+    def initialize(*args)
+      @absolute_right    = nil
+      @absolute_bottom   = nil
+      @calculated_width  = nil
+      @calculated_height = nil
+      super
+    end
+
     def absolute_right
       @absolute_right || super
     end

data/lib/shoes/timer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Timer
     include Common::Inspect

data/lib/shoes/ui/cli.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'optparse'
 require 'shoes'
 

data/lib/shoes/ui/cli/base_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module UI
     class CLI

data/lib/shoes/ui/cli/default_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module UI
     class CLI

data/lib/shoes/ui/cli/help_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module UI
     class CLI
@@ -22,9 +23,9 @@ class Shoes
         end
 
         def help
-          <<-EOS
-shoes help
-    Displays this help text
+          <<~EOS
+            shoes help
+                Displays this help text
 EOS
         end
       end

data/lib/shoes/ui/cli/manual_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module UI
     class CLI
@@ -9,9 +10,9 @@ class Shoes
         end
 
         def help
-          <<-EOS
-shoes manual
-    Run the interactive Shoes manual
+          <<~EOS
+            shoes manual
+                Run the interactive Shoes manual
 EOS
         end
       end

data/lib/shoes/ui/cli/package_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module UI
     class CLI

data/lib/shoes/ui/cli/samples_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'fileutils'
 require 'shoes/samples'
 

data/lib/shoes/ui/cli/select_backend_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module UI
     class CLI
@@ -10,10 +11,10 @@ class Shoes
         end
 
         def help
-          <<-EOS
-shoes select_backend [backend]
-    Select a Shoes backend to use. A backend can be specified, or Shoes will
-    attempt to auto-detect available backends to select from.
+          <<~EOS
+            shoes select_backend [backend]
+                Select a Shoes backend to use. A backend can be specified, or Shoes will
+                attempt to auto-detect available backends to select from.
 EOS
         end
       end

data/lib/shoes/ui/cli/version_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module UI
     class CLI
@@ -8,9 +9,9 @@ class Shoes
         end
 
         def help
-          <<-EOS
-shoes version
-    Prints the current Shoes version
+          <<~EOS
+            shoes version
+                Prints the current Shoes version
 EOS
         end
       end

data/lib/shoes/ui/picker.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # This class is used for interactively (if necessary) picking the Shoes
 # backend that the user will run their Shoes app with.