Fix spacing

FluidGroup · Sep 10, 2022 · 677a931 · 677a931
1 parent 196a47d
commit 677a931
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Sources/WrapLayout/WrapLayout.swift b/Sources/WrapLayout/WrapLayout.swift
@@ -72,7 +72,7 @@ public struct WrapLayout: Layout {
 
       let calculatedSize = view.sizeThatFits(.init(width: bounds.width, height: bounds.height))
 
-      if (calculatedSize.width + offsetX) >= bounds.width {
+      if (calculatedSize.width + offsetX + horizontalSpacing) >= bounds.width {
         // line break
         currentLine.width = offsetX
 
@@ -88,14 +88,15 @@ public struct WrapLayout: Layout {
 
       currentLine.elements.append(calculatedElement)
 
-      offsetX += calculatedSize.width + horizontalSpacing
+      offsetX += calculatedSize.width
 
       if currentLine.height < calculatedElement.size.height {
         currentLine.height = calculatedElement.size.height
       }
 
     }
 
+    currentLine.width = offsetX
     cache.lines.append(currentLine)
 
     let size = cache.calculateSize(verticalSpacing: verticalSpacing)