use enum orientation for widthLarger

merge with master and solve conficts
ChartsOrg · Mar 30, 2020 · 219e67e · 219e67e
1 parent 0fd0ef6
commit 219e67e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Source/Charts/Charts/PieChartView.swift b/Source/Charts/Charts/PieChartView.swift
@@ -132,7 +132,7 @@ open class PieChartView: PieRadarChartViewBase
     /// if width is larger than height
     private var widthLarger: Bool
     {
-        return _viewPortHandler.contentRect.size.width > _viewPortHandler.contentRect.size.height
+        return _viewPortHandler.contentRect.orientation == .landscape
     }
 
     /// adjusted radius. Use diameter when it's half pie and width is larger

diff --git a/Source/Charts/Utils/Platform.swift b/Source/Charts/Utils/Platform.swift
@@ -39,6 +39,21 @@ extension UIScreen
     }
 }
 
+enum Orientation
+{
+    case portrait, landscape
+}
+
+extension CGSize
+{
+    var orientation: Orientation { return width > height ? .landscape : .portrait }
+}
+
+extension CGRect
+{
+    var orientation: Orientation { size.orientation }
+}
+
 func NSUIMainScreen() -> NSUIScreen?
 {
     return NSUIScreen.main