Skip to content

[NSGeometry] Use CGFloat.NativeType instead of hardcoded Double #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2016
Merged

[NSGeometry] Use CGFloat.NativeType instead of hardcoded Double #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Foundation/NSGeometry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,12 @@ public func NSIntegralRectWithOptions(_ aRect: NSRect, _ opts: NSAlignmentOption
NSUnimplemented()
}

var width = Double.nan
var height = Double.nan
var minX = Double.nan
var minY = Double.nan
var maxX = Double.nan
var maxY = Double.nan
var width = CGFloat.NativeType.nan
var height = CGFloat.NativeType.nan
var minX = CGFloat.NativeType.nan
var minY = CGFloat.NativeType.nan
var maxX = CGFloat.NativeType.nan
var maxY = CGFloat.NativeType.nan

if aRect.size.height.native < 0 {
height = 0
Expand Down Expand Up @@ -538,10 +538,10 @@ public func NSIntegralRectWithOptions(_ aRect: NSRect, _ opts: NSAlignmentOption
maxY = round(aRect.origin.y.native + aRect.size.height.native)
}

var resultOriginX = Double.nan
var resultOriginY = Double.nan
var resultWidth = Double.nan
var resultHeight = Double.nan
var resultOriginX = CGFloat.NativeType.nan
var resultOriginY = CGFloat.NativeType.nan
var resultWidth = CGFloat.NativeType.nan
var resultHeight = CGFloat.NativeType.nan

if !minX.isNaN {
resultOriginX = minX
Expand Down
12 changes: 6 additions & 6 deletions TestFoundation/TestNSGeometry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class TestNSGeometry : XCTestCase {
let r2 = NSOffsetRect(r1, CGFloat(2.0), CGFloat(-5.0))
let expectedRect = NSMakeRect(CGFloat(3.2), CGFloat(-1.9), CGFloat(10.0), CGFloat(10.0))

XCTAssertTrue(NSEqualRects(r2, expectedRect))
XCTAssertTrue(_NSRect(expectedRect, equalsToRect: r2))
}

func test_NSPointInRect() {
Expand Down Expand Up @@ -608,23 +608,23 @@ class TestNSGeometry : XCTestCase {

// MARK: Private

func _NSRect(_ rect: NSRect, equalsToRect rect2: NSRect, withPrecision precision: Double = DBL_EPSILON) -> Bool {
func _NSRect(_ rect: NSRect, equalsToRect rect2: NSRect, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
return _NSPoint(rect.origin, equalsToPoint: rect2.origin, withPrecision: precision)
&& _NSSize(rect.size, equalsToSize: rect2.size, withPrecision: precision)
}

func _NSSize(_ size: NSSize, equalsToSize size2: NSSize, withPrecision precision: Double = DBL_EPSILON) -> Bool {
func _NSSize(_ size: NSSize, equalsToSize size2: NSSize, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
return _CGFloat(size.width, equalsToCGFloat: size2.width, withPrecision: precision)
&& _CGFloat(size.height, equalsToCGFloat: size2.height, withPrecision: precision)
}

func _NSPoint(_ point: NSPoint, equalsToPoint point2: NSPoint, withPrecision precision: Double = DBL_EPSILON) -> Bool {
func _NSPoint(_ point: NSPoint, equalsToPoint point2: NSPoint, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
return _CGFloat(point.x, equalsToCGFloat: point2.x, withPrecision: precision)
&& _CGFloat(point.y, equalsToCGFloat: point2.y, withPrecision: precision)
}

func _CGFloat(_ float: CGFloat, equalsToCGFloat float2: CGFloat, withPrecision precision: Double = DBL_EPSILON) -> Bool {
return fabs(float.native - float2.native) < precision
func _CGFloat(_ float: CGFloat, equalsToCGFloat float2: CGFloat, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
return fabs(float.native - float2.native) <= precision
}

}