ea 0.6.140 → 0.6.141

data/lib/ea/svg/ea_emitter/bounds_calculator.rb

@@ -33,6 +33,13 @@ module Ea
 
         attr_reader :diagram, :model_index
 
+        # Where the leftmost model x lands: 30 + min_x capped at 35. A
+        # negative min_x keeps the 30 of min_x 0 (the corpus has none),
+        # so content left of the origin is not drawn off the canvas.
+        def self.inset_left_for(min_x)
+          [[INSET_LEFT - 5 + min_x, INSET_LEFT - 5].max, INSET_LEFT].min
+        end
+
         def initialize(diagram, model_index: nil)
           @diagram = diagram
           @model_index = model_index
@@ -53,7 +60,7 @@ module Ea
           # Left inset scales from 30 up to the 35 cap with the
           # stored leftmost x: leftmost drawn x = 30 + min_x capped
           # at 35 (corpus: min_x 0 -> 30, 2 -> 32, 4 -> 34, >=5 -> 35).
-          @effective_inset_left = [INSET_LEFT - 5 + min_x, INSET_LEFT].min
+          @effective_inset_left = self.class.inset_left_for(min_x)
           [
             min_x,
             min_y,
@@ -62,19 +69,7 @@ module Ea
           ]
         end
 
-        private
-
-        # Element x-extent: logical bounds only (matches EA's canvas
-        # left/right exactly).
-        # Element y-extent: union of logical + image_bounds (image
-        # extends below bounds for shadow / image padding), plus the
-        # "(from Parent)" subtitle extent: EA draws the subtitle 15px
-        # below the body and its text descent adds ~4 more, reserving
-        # 19px of canvas below subtitle-bearing packages (the +19
-        # height family: 05DF5000 Main, Metadata All, package
-        # Clients/Suppliers contexts).
-        SUBTITLE_CANVAS_EXTRA = 19
-
+        # Canvas points reserved below "(from Parent)" subtitles.
         def subtitle_points
           pts = []
           (diagram.elements || []).each do |e|
@@ -88,6 +83,19 @@ module Ea
           pts
         end
 
+        private
+
+        # Element x-extent: logical bounds only (matches EA's canvas
+        # left/right exactly).
+        # Element y-extent: union of logical + image_bounds (image
+        # extends below bounds for shadow / image padding), plus the
+        # "(from Parent)" subtitle extent: EA draws the subtitle 15px
+        # below the body and its text descent adds ~4 more, reserving
+        # 19px of canvas below subtitle-bearing packages (the +19
+        # height family: 05DF5000 Main, Metadata All, package
+        # Clients/Suppliers contexts).
+        SUBTITLE_CANVAS_EXTRA = 19
+
         def element_points
           pts = []
           (diagram.elements || []).each do |e|

data/lib/ea/svg/ea_emitter/canvas.rb

@@ -23,6 +23,8 @@ module Ea
         FRAME_INSET_LEFT = 35
         INSET_TOUCHING_ORIGIN = 30
         FRAME_INSET_TOP = 40
+        # Where the diagram frame's border line sits from the canvas edge.
+        FRAME_BORDER_INSET = 6
 
         attr_reader :min_x, :min_y, :width, :height, :inset_left, :inset_top
 
@@ -32,8 +34,8 @@ module Ea
                        insets: [FRAME_INSET_LEFT, FRAME_INSET_TOP])
           @min_x = min_x
           @min_y = min_y
-          @width = width
-          @height = height
+          @width = whole(width)
+          @height = whole(height)
           @inset_left, @inset_top = insets
         end
 
@@ -60,11 +62,23 @@ module Ea
                                        bottom: BottomMargin.for(diagram, model_index))
           end
 
+          return empty_framed(diagram, min_x, min_y) unless bc.max_x
+
           new(min_x: min_x, min_y: min_y, width: width, height: height,
               insets: [bc.effective_inset_left || FRAME_INSET_LEFT,
                        FRAME_INSET_TOP])
         end
 
+        # No element to size on: the frame alone, wide enough for its
+        # name tab.
+        def self.empty_framed(diagram, min_x, min_y)
+          width = [INSET_TOUCHING_ORIGIN + BoundsCalculator::INSET_RIGHT,
+                   DiagramFrame.new(canvas: nil).min_width(diagram)].max
+          new(min_x: min_x, min_y: min_y, width: width,
+              height: BoundsCalculator::INSET_TOP + BoundsCalculator::INSET_BOTTOM,
+              insets: [BoundsCalculator.inset_left_for(min_x), FRAME_INSET_TOP])
+        end
+
         # Second-pass canvas over the DRAWN extents captured by the
         # element pass (grown classifiers, autosized packages, plus
         # BoundsCalculator's subtitle reservation). EA sizes the
@@ -79,7 +93,7 @@ module Ea
             pts << [b.x, b.y]
             pts << [b.x + b.width, b.y + b.height]
           end
-          extra = base.send(:subtitle_points)
+          extra = base.subtitle_points
           min_x = (pts + extra).map(&:first).min || 0
           min_y = (pts + extra).map(&:last).min || 0
           max_x = (pts + extra).map(&:first).max || 0
@@ -95,8 +109,7 @@ module Ea
 
           # Same scaled rule as BoundsCalculator: drawn leftmost =
           # min(35, 30 + min_x).
-          inset_left = [BoundsCalculator::INSET_LEFT - 5 + min_x,
-                        BoundsCalculator::INSET_LEFT].min
+          inset_left = BoundsCalculator.inset_left_for(min_x)
           new(min_x: min_x, min_y: min_y,
               width: (max_x - min_x) + inset_left +
                      BoundsCalculator::INSET_RIGHT,
@@ -105,6 +118,25 @@ module Ea
               insets: [inset_left, FRAME_INSET_TOP])
         end
 
+        # This canvas when every point of `shapes` ([min_x, min_y, max_x,
+        # max_y] in canvas coordinates) lies inside its frame border (the
+        # FRAME_BORDER_INSET line), otherwise a canvas grown so the shapes
+        # sit CONTENT_MARGIN inside the border on the overflowing sides.
+        def holding(shapes)
+          left, top, right, bottom = shapes
+          reach = CanvasAnchor::CONTENT_MARGIN
+          grow_left = left < FRAME_BORDER_INSET ? reach - left : 0
+          grow_top = top < FRAME_BORDER_INSET ? reach - top : 0
+          new_width = right > width - FRAME_BORDER_INSET ? right + reach : width
+          new_height = bottom > height - FRAME_BORDER_INSET ? bottom + reach : height
+          return self if [grow_left, grow_top].all?(&:zero?) &&
+                         new_width == width && new_height == height
+
+          Canvas.new(min_x: min_x - grow_left, min_y: min_y - grow_top,
+                     width: new_width + grow_left, height: new_height + grow_top,
+                     insets: [inset_left, inset_top])
+        end
+
         def view_box
           "0 0 #{width} #{height}"
         end
@@ -139,6 +171,12 @@ module Ea
 
         private
 
+        # Measured extents arrive as Floats ("508.0"); EA writes whole
+        # pixels into the viewBox and background rect.
+        def whole(pixels)
+          pixels.is_a?(Float) && pixels == pixels.to_i ? pixels.to_i : pixels
+        end
+
         def format_cm(px)
           return "0cm" if px.nil? || px.zero?
 

data/lib/ea/svg/ea_emitter/canvas_anchor.rb

@@ -25,6 +25,12 @@ module Ea
       # 4881CEEE, 70C77F92, 846DD800, 88AF6BD7, AC2191E3). Below, the
       # same box (its top is the first baseline less the font height,
       # its height the stored CY) + 5 holds the canvas open on 95246DCF.
+      #
+      # Drawn text also holds the right and bottom edges open (text
+      # right/bottom + TEXT_MARGIN, symmetric with the origin rule), so
+      # a name wider than its box is not clipped. Checked on the 188
+      # PLATEAU natives: widths/heights unchanged (185/188, 188/188);
+      # 8DAB169F moves 13 closer; no native contradicts it.
       module CanvasAnchor
         CONTENT_MARGIN = 10
         TEXT_MARGIN = 5
@@ -66,18 +72,20 @@ module Ea
           origin_x = origin(shapes && shapes[0], texts && texts[0])
           origin_y = origin(shapes && shapes[1], texts && texts[1])
           Canvas.new(min_x: origin_x, min_y: origin_y,
-                     width: right_edge(shapes, label_reach) - origin_x,
-                     height: bottom_edge(shapes, label_reach, bottom) - origin_y,
+                     width: right_edge(shapes, texts, label_reach) - origin_x,
+                     height: bottom_edge(shapes, texts, label_reach, bottom) - origin_y,
                      insets: [0, 0])
         end
 
-        def right_edge(shapes, label_reach)
+        def right_edge(shapes, texts, label_reach)
           [shapes && shapes[2] + CONTENT_MARGIN,
+           texts && (texts[2] + TEXT_MARGIN).ceil,
            label_reach && label_reach[0] + LABEL_BOX_MARGIN].compact.max
         end
 
-        def bottom_edge(shapes, label_reach, bottom)
+        def bottom_edge(shapes, texts, label_reach, bottom)
           [shapes[3] + bottom,
+           texts && (texts[3] + TEXT_MARGIN).ceil,
            label_reach && label_reach[1] + LABEL_BOX_MARGIN].compact.max
         end
 

data/lib/ea/svg/ea_emitter/compartment/attributes.rb

@@ -6,6 +6,11 @@ module Ea
       module Compartment
         # Attribute compartment. Skipped when no attribute lines.
         module Attributes
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)

data/lib/ea/svg/ea_emitter/compartment/constraints.rb

@@ -11,6 +11,11 @@ module Ea
         # content and suppresses them when they would overflow the
         # stored box height (never truncates rows).
         module Constraints
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)

data/lib/ea/svg/ea_emitter/compartment/enum_literals.rb

@@ -8,6 +8,11 @@ module Ea
         # italic header + each literal name. Skipped when the
         # classifier has no literals or no content geometry.
         module EnumLiterals
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           # Caption and literal rows share the same baseline spacing.

data/lib/ea/svg/ea_emitter/compartment/header.rb

@@ -7,6 +7,11 @@ module Ea
         # Header compartment: stereotype label + class name. Skips
         # rendering when the classifier produces no header lines.
         module Header
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)

data/lib/ea/svg/ea_emitter/compartment/header_divider.rb

@@ -8,6 +8,11 @@ module Ea
         # compartment (attributes / operations / literals / tagged
         # values). Skipped when there is no content below.
         module HeaderDivider
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)

data/lib/ea/svg/ea_emitter/compartment/instance_slots.rb

@@ -12,6 +12,11 @@ module Ea
         # InstanceSpecification or has neither slots nor a
         # classifier.
         module InstanceSlots
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           ROW_OFFSET = 13
           SUBTITLE_OFFSET_FROM_BOTTOM = 15
 

data/lib/ea/svg/ea_emitter/compartment/instance_underline.rb

@@ -8,6 +8,11 @@ module Ea
         # short horizontal line below each instance name to denote
         # that it is an instance (UML convention).
         module InstanceUnderline
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::SQUARE_MITER
+          end
+
           Y_OFFSET = 1
 
           module_function

data/lib/ea/svg/ea_emitter/compartment/marker.rb

@@ -10,6 +10,11 @@ module Ea
         # Real OCL constraints render trailing, after the content —
         # the two are distinct compartments.
         module Marker
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)

data/lib/ea/svg/ea_emitter/compartment/note_body.rb

@@ -15,6 +15,11 @@ module Ea
 
           module_function
 
+          # The text group keeps the pen the note outline was drawn with.
+          def pen(context)
+            context.previous_pen || Pen::INITIAL
+          end
+
           def render(context)
             return nil if context.model_element.is_a?(Ea::Model::Note) &&
                           context.model_element.legend
@@ -63,7 +68,7 @@ module Ea
           # [pitch, first-baseline offset] for the note font.
           def vertical_layout(context)
             size = context.size
-            height = context.logical_height
+            height = Ea::Fonts::Metrics.source_logical_height(context.logical_height)
             height ||= Ea::Fonts::Metrics.gdi_logical_height(size) if context.size_unit == "pt"
             ascent, descent = Ea::Fonts::Metrics.gdi_cell_metrics(context.family, height)
             return [size + 7, size + 9] unless ascent
@@ -121,7 +126,7 @@ module Ea
           # (EA never sets a note pen; 7C44AC09 square/miter, 7D960BD8
           # square/bevel), so the next element inherits the right pen.
           def group_style(context)
-            cap, join = context.previous_pen || Element::NoteShapeRenderer::INITIAL_PEN
+            cap, join = pen(context)
             "stroke-width:1;stroke-linecap:#{cap};stroke-linejoin:#{join}; " \
               "fill:#{context.theme.text_color};fill-opacity:1.00; " \
               "stroke:#000000; stroke-opacity:0.00"

data/lib/ea/svg/ea_emitter/compartment/note_text.rb

@@ -10,6 +10,11 @@ module Ea
         # Lines are estimated by character width and split at word
         # boundaries to fit the element bounds.
         module NoteText
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           X_PADDING = 5
           HAND_DRAW_X_PADDING = 10
           Y_FIRST_OFFSET = 15

data/lib/ea/svg/ea_emitter/compartment/operations.rb

@@ -7,6 +7,11 @@ module Ea
         # Operation compartment: divider line + operation signatures.
         # Skipped when no operations or when geometry cannot fit them.
         module Operations
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)

data/lib/ea/svg/ea_emitter/compartment/package_contents.rb

@@ -11,6 +11,11 @@ module Ea
         # text (Enumeration gets a list-style icon; other classifiers
         # get the "folded paper" silhouette).
         module PackageContents
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::SQUARE_BEVEL
+          end
+
           ROW_HEIGHT = 16
           ICON_X_OFFSET = 5
           TEXT_X_OFFSET = 23

data/lib/ea/svg/ea_emitter/compartment/package_from_parent.rb

@@ -13,6 +13,11 @@ module Ea
         # (379 diagrams, 378 exact): classifiers never render the
         # subtitle, and ShowForeign=0 diagrams render none.
         module PackageFromParent
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           module_function
 
           def render(context)
@@ -49,6 +54,10 @@ module Ea
           ASCENT_FAMILIES = %w[cambria carlito].freeze
           GAP_BELOW_BODY = 5
           LEGACY_Y_OFFSET_FROM_BOTTOM = 15
+          # Heights above this (a 100pt caption is H143) are corrupt
+          # input; they keep the legacy offset instead of pushing the
+          # caption far off the element.
+          MAX_CAPTION_HEIGHT = 60
 
           LINE_PITCH = 13
           WRAP_PADDING = 15
@@ -82,10 +91,12 @@ module Ea
           module_function :subtitle
 
           def offset_from_bottom(context)
-            height = context.logical_height
+            height = Ea::Fonts::Metrics.source_logical_height(context.logical_height)
             height ||= Ea::Fonts::Metrics.gdi_logical_height(context.size) if context.size_unit == "pt"
             return LEGACY_Y_OFFSET_FROM_BOTTOM unless ASCENT_FAMILIES.include?(context.family.to_s.downcase)
 
+            return LEGACY_Y_OFFSET_FROM_BOTTOM unless height.nil? || height <= MAX_CAPTION_HEIGHT
+
             ascent, = Ea::Fonts::Metrics.gdi_cell_metrics(context.family, height)
             ascent ? GAP_BELOW_BODY + ascent : LEGACY_Y_OFFSET_FROM_BOTTOM
           end

data/lib/ea/svg/ea_emitter/compartment/shape.rb

@@ -9,6 +9,19 @@ module Ea
         module Shape
           module_function
 
+          # Notes and legends take the pen the previous drawing left; every
+          # other shape draws its own round/bevel pen.
+          def pen(context)
+            return Pen::ROUND_BEVEL unless pen_inheriting?(context)
+
+            context.previous_pen || Pen::INITIAL
+          end
+
+          def pen_inheriting?(context)
+            legend?(context) || context.model_element.is_a?(Ea::Model::Note)
+          end
+          private_class_method :pen_inheriting?
+
           def render(context)
             if legend?(context)
               Element::LegendRenderer.render(
@@ -17,7 +30,7 @@ module Ea
                 family: context.family,
                 item_font: { size: legend_item_size(context), unit: context.size_unit,
                              logical_height: context.logical_height },
-                first_painted: context.first_painted
+                pen: context.previous_pen
               )
             elsif context.model_element.is_a?(Ea::Model::Note)
               Element::NoteShapeRenderer.render(

data/lib/ea/svg/ea_emitter/compartment/stereotype_icon.rb

@@ -13,6 +13,12 @@ module Ea
         # Rendered after the header so the icon sits inside the
         # element body below the stereotype label.
         module StereotypeIcon
+          # ShapeScript output sets no stroke pen, so the icon leaves the
+          # previous pen in force.
+          def self.pen(_context)
+            nil
+          end
+
           module_function
 
           def render(context)

data/lib/ea/svg/ea_emitter/compartment/tagged_values.rb

@@ -7,6 +7,11 @@ module Ea
         # Tagged value compartment. Skipped when no tagged values
         # or when geometry cannot fit them.
         module TaggedValues
+          # The pen the first group of this compartment leaves behind.
+          def self.pen(_context)
+            Pen::ROUND_BEVEL
+          end
+
           DEFAULT_TEXT_COLOR = "#000000"
 
           module_function

data/lib/ea/svg/ea_emitter/compartment.rb

@@ -49,6 +49,10 @@ module Ea
           InstanceUnderline
         ].freeze
 
+        # One rendered compartment and the pen its first group leaves behind
+        # (nil when it sets none, leaving the previous pen in force).
+        Painted = Struct.new(:svg, :pen)
+
         module_function
 
         # Renders every applicable compartment for the context.
@@ -57,6 +61,15 @@ module Ea
         def render_all(context)
           ALL.map { |compartment| compartment.render(context) }
         end
+
+        # Like render_all, but each applicable compartment comes with the
+        # pen it leaves behind; compartments that do not apply are dropped.
+        def paint_all(context)
+          ALL.filter_map do |compartment|
+            svg = compartment.render(context)
+            Painted.new(svg, compartment.pen(context)) if svg
+          end
+        end
       end
     end
   end

data/lib/ea/svg/ea_emitter/connector_bridges.rb

@@ -21,10 +21,9 @@ module Ea
         def path_for(connector, points)
           priority = priority_for(connector)
           return centerline(connector, points) unless priority
+          return direct_path(connector, priority, points) if points.size == 2 && direct?(connector)
 
-          segments = points.each_cons(2).map do |first, last|
-            crossings_for(connector, priority, first, last)
-          end
+          segments = bridge_segments(connector, priority, points)
           return centerline(connector, points) if segments.all?(&:empty?)
 
           serialize(points, segments)
@@ -32,6 +31,21 @@ module Ea
 
         private
 
+        # Direct lines are written target-first like their centerline, so the
+        # bridges are walked in that travel direction (arc sweeps are relative
+        # to it) and the target repeat closes the path.
+        def direct_path(connector, priority, points)
+          travel = points.reverse
+          segments = bridge_segments(connector, priority, travel)
+          return centerline(connector, points) if segments.all?(&:empty?)
+
+          "#{serialize(travel, segments)} M #{coordinates(travel.first)}"
+        end
+
+        def bridge_segments(connector, priority, points)
+          points.each_cons(2).map { |first, last| crossings_for(connector, priority, first, last) }
+        end
+
         def centerline(connector, points)
           seats = points.map { |point| coordinates(point) }
           # Direct lines retain EA's target-first repeat and source-first model.
@@ -94,7 +108,7 @@ module Ea
 
           @routes.select do |partner, _points, order|
             !partner.equal?(connector) && order.is_a?(Array) && order.size == priority.size &&
-              !same_source?(connector, partner) && (order <=> priority).negative?
+              !same_source?(connector, partner) && (order <=> priority)&.negative?
           end
         end
 

data/lib/ea/svg/ea_emitter/content_extent.rb

@@ -60,13 +60,22 @@ module Ea
           path_data.scan(PATH_COMMAND).flat_map do |command, body|
             numbers = body.scan(NUMBER).map(&:to_f)
             case command
-            when "M", "L", "C" then numbers.each_slice(2).select { |pair| pair.size == 2 }
-            when "A" then numbers.each_slice(7).map { |a| a.last(2) }
+            when "M", "L" then numbers.each_slice(2).select { |pair| pair.size == 2 }
+            when "C" then end_points(numbers, 6)
+            when "A" then end_points(numbers, 7)
             else []
             end
           end
         end
 
+        # The segment end point only: a Bezier's control points lie
+        # outside the drawn curve and EA does not count them (basic
+        # E325B9D8, hand-drawn style: 504 x 274 natively, 508 x 278
+        # with the control points).
+        def self.end_points(numbers, stride)
+          numbers.each_slice(stride).select { |a| a.size == stride }.map { |a| a.last(2) }
+        end
+
         def self.text_box(attrs)
           style = attrs["style"].to_s
           size = style[/font-size:([\d.]+)/, 1].to_f

data/lib/ea/svg/ea_emitter/diagram_frame.rb

@@ -48,6 +48,13 @@ module Ea
           ].compact
         end
 
+        # Narrowest canvas that holds the name tab inside the border
+        # (the border inset on both sides of the tab).
+        def min_width(diagram)
+          2 * theme.frame.inset + tab_label_width(diagram) +
+            theme.frame.tab_slant
+        end
+
         private
 
         def border_layer(canvas)

data/lib/ea/svg/ea_emitter/document.rb

@@ -44,10 +44,25 @@ module Ea
                              content_anchor: content_anchor)
           seq = sequence(canvas)
           canvas, seq = redo_on_drawn(canvas, seq)
-          content_anchor ? anchor_on_content(canvas, seq) : [canvas, seq]
+          return anchor_on_content(canvas, seq) if content_anchor
+
+          frame ? grow_to_drawn_shapes(canvas, seq) : [canvas, seq]
         end
         private :lay_out
 
+        # A framed canvas is sized from element rects, so a stored
+        # connector bend beyond them is drawn outside the viewBox. Grows
+        # the canvas to hold every drawn shape; a diagram whose shapes
+        # already fit keeps its canvas untouched.
+        def grow_to_drawn_shapes(canvas, seq)
+          shapes = ContentExtent.measure(seq.layers.drop(1)).shapes
+          return [canvas, seq] unless shapes
+
+          grown = canvas.holding(shapes)
+          grown.equal?(canvas) ? [canvas, seq] : [grown, sequence(grown)]
+        end
+        private :grow_to_drawn_shapes
+
         def redo_on_drawn(canvas, seq)
           grown = seq.drawn_bounds
           return [canvas, seq] unless grown&.values&.any? &&
@@ -103,13 +118,14 @@ module Ea
           %(<g id="images">\n#{fragments.join("\n")}\n</g>)
         end
 
-        # True when any drawn bound falls outside the stored-rect
-        # canvas content area.
+        # True when any drawn bound falls outside the canvas content
+        # area; the far edges are measured from the canvas' model-space
+        # origin (its insets included).
         def exceeds?(canvas, bounds)
           bounds.any? do |b|
             b.x < canvas.min_x || b.y < canvas.min_y ||
-              b.x + b.width > canvas.min_x + canvas.width ||
-              b.y + b.height > canvas.min_y + canvas.height
+              b.x + b.width > canvas.origin_x + canvas.width ||
+              b.y + b.height > canvas.origin_y + canvas.height
           end
         end