[Gardening] Rename semicircular to capsule, handle narrow capsule case

meherkasam-square · Sep 14, 2020 · e2772d1 · e2772d1
1 parent 5b59899
commit e2772d1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/BlueprintUICommonControls/Sources/Box.swift b/BlueprintUICommonControls/Sources/Box.swift
@@ -102,7 +102,7 @@ extension Box {
 
     public enum CornerStyle {
         case square
-        case semicircular
+        case capsule
         case rounded(radius: CGFloat)
     }
 
@@ -145,8 +145,8 @@ extension Box.CornerStyle {
         switch self {
         case .square:
             return 0
-        case .semicircular:
-            return bounds.height / 2.0
+        case .capsule:
+            return min(bounds.height, bounds.width) / 2.0
         case let .rounded(radius: radius):
             return radius
         }

diff --git a/BlueprintUICommonControls/Tests/Sources/BoxTests.swift b/BlueprintUICommonControls/Tests/Sources/BoxTests.swift
@@ -22,11 +22,16 @@ class BoxTests: XCTestCase {
         do {
             var box = Box()
             box.backgroundColor = .blue
-            box.cornerStyle = .semicircular
+            box.cornerStyle = .capsule
             compareSnapshot(
                 of: box,
                 size: CGSize(width: 200, height: 100),
-                identifier: "semicircular")
+                identifier: "wideCapsule")
+
+            compareSnapshot(
+                of: box,
+                size: CGSize(width: 100, height: 200),
+                identifier: "longCapsule")
         }
 
         do {

diff --git a/...ontrols/Tests/Sources/ReferenceImages/BoxTests/test_cornerStyle_longCapsule.png b/...ontrols/Tests/Sources/ReferenceImages/BoxTests/test_cornerStyle_longCapsule.png
diff --git a/...oxTests/test_cornerStyle_semicircular.png → ...BoxTests/test_cornerStyle_wideCapsule.png b/...oxTests/test_cornerStyle_semicircular.png → ...BoxTests/test_cornerStyle_wideCapsule.png
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add `addFixed(child:)` and `addFlexible(child:)` methods to `StackElement` for adding children with a grow & shrink priority of 0.0 and 1.0 respectively.
 
-- Add `semicircular` case to `Box.CornerStyle` ([#145]). This addition sugars the following pattern  
+- Add `capsule` case to `Box.CornerStyle` ([#145]). This addition sugars the following pattern  
 
 ```
 GeometryReader { geometry in
@@ -24,7 +24,7 @@ GeometryReader { geometry in
 into
 
 ```
-Box(cornerStyle: .semicircular)
+Box(cornerStyle: .capsule)
 ```
 
 ### Removed