Add inverted corners for negative values

ChartsOrg · Mar 27, 2024 · 2047fe6 · 2047fe6
1 parent c14ed45
commit 2047fe6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/Source/Charts/Renderers/BarChartRenderer.swift b/Source/Charts/Renderers/BarChartRenderer.swift
@@ -352,7 +352,11 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
 
                 context.setFillColor(dataSet.barShadowColor.cgColor)
 
-                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: dataSet.roundedCorners,
+                var roundedCorners = dataSet.roundedCorners
+                if barRect.minY < 0 {
+                    roundedCorners.update(with: [.bottomLeft, .bottomRight, .topLeft, .topRight])
+                }
+                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
                                               cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
                 context.addPath(bezierPath.cgPath)
                 context.drawPath(using: .fill)
@@ -383,7 +387,11 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 context.setFillColor(dataSet.color(atIndex: j).cgColor)
             }
 
-            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: dataSet.roundedCorners,
+            var roundedCorners = dataSet.roundedCorners
+            if barRect.minY < 0 {
+                roundedCorners.update(with: [.bottomLeft, .bottomRight, .topLeft, .topRight])
+            }
+            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
                                           cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
             context.addPath(bezierPath.cgPath)
             context.drawPath(using: .fill)
@@ -751,7 +759,11 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
 
                 setHighlightDrawPos(highlight: high, barRect: barRect)
 
-                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: set.roundedCorners,
+                var roundedCorners = set.roundedCorners
+                if barRect.minY < 0 {
+                    roundedCorners.update(with: [.bottomLeft, .bottomRight, .topLeft, .topRight])
+                }
+                let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
                                               cornerRadii: .init(width: set.cornerRadius, height: set.cornerRadius))
                 context.addPath(bezierPath.cgPath)
                 context.drawPath(using: .fill)

diff --git a/Source/Charts/Renderers/HorizontalBarChartRenderer.swift b/Source/Charts/Renderers/HorizontalBarChartRenderer.swift
@@ -229,7 +229,11 @@ open class HorizontalBarChartRenderer: BarChartRenderer
 
                 context.setFillColor(dataSet.barShadowColor.cgColor)
 
-                let bezierPath = UIBezierPath(roundedRect: _barShadowRectBuffer, byRoundingCorners: dataSet.roundedCorners,
+                var roundedCorners = dataSet.roundedCorners
+                if _barShadowRectBuffer.minX < 0 {
+                    roundedCorners.update(with: [.bottomLeft, .bottomRight, .topLeft, .topRight])
+                }
+                let bezierPath = UIBezierPath(roundedRect: _barShadowRectBuffer, byRoundingCorners: roundedCorners,
                                               cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
                 context.addPath(bezierPath.cgPath)
                 context.drawPath(using: .fill)
@@ -269,7 +273,11 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 context.setFillColor(dataSet.color(atIndex: j).cgColor)
             }
 
-            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: dataSet.roundedCorners,
+            var roundedCorners = dataSet.roundedCorners
+            if barRect.minX < 0 {
+                roundedCorners.update(with: [.bottomLeft, .bottomRight, .topLeft, .topRight])
+            }
+            let bezierPath = UIBezierPath(roundedRect: barRect, byRoundingCorners: roundedCorners,
                                           cornerRadii: .init(width: dataSet.cornerRadius, height: dataSet.cornerRadius))
             context.addPath(bezierPath.cgPath)
             context.drawPath(using: .fill)