Merge pull request #277 from fassko/UIBEZIERPATH_MACOS

macOS doesn’t have UIBezierPath
exyte · Mar 19, 2018 · 8ed98b1 · 8ed98b1
2 parents 9e268ec + 5e2c412
commit 8ed98b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.2
 
 branches:
     only:
     - master
 
 script:
-  set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=11.0' | xcpretty;
+  - set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=11.2' | xcpretty;
+  - set -o pipefail && xcodebuild build -project Macaw.xcodeproj -scheme 'MacawOSX' ONLY_ACTIVE_ARCH=NO | xcpretty;
diff --git a/Source/render/RenderUtils.swift b/Source/render/RenderUtils.swift
@@ -422,10 +422,18 @@ class RenderUtils {
             } else {
                 let maxSize = CGFloat(max(w, h))
                 let path = MBezierPath(arcCenter: CGPoint.zero, radius: maxSize / 2, startAngle: extent, endAngle: end, clockwise: arcAngle >= 0)
-                var transform = CGAffineTransform(translationX: cx, y: cy)
-                transform = transform.rotated(by: CGFloat(rotation))
-
-                path.apply(transform.scaledBy(x: CGFloat(w) / maxSize, y: CGFloat(h) / maxSize))
+
+                #if os(iOS)
+                    var transform = CGAffineTransform(translationX: cx, y: cy)
+                    transform = transform.rotated(by: CGFloat(rotation))
+                    path.apply(transform.scaledBy(x: CGFloat(w) / maxSize, y: CGFloat(h) / maxSize))
+                #elseif os(OSX)
+                    var transform = AffineTransform(translationByX: cx, byY: cy)
+                    transform.rotate(byDegrees: CGFloat(rotation))
+                    path.transform(using: transform)
+                #endif
+
+                bezierPath.append(path)
             }
         }