Merge pull request #2226 from uraimo/patch-1

millenomi · web-flow · commit 9971110e2f10 · 2019-05-08T17:14:23.000-07:00
Fix NSRect init invocation on 32bit platforms
diff --git a/Foundation/NSGeometry.swift b/Foundation/NSGeometry.swift
@@ -704,7 +704,7 @@ public func NSInsetRect(_ aRect: NSRect, _ dX: CGFloat, _ dY: CGFloat) -> NSRect
     let y = aRect.origin.y.native + dY.native
     let w = aRect.size.width.native - (dX.native * 2)
     let h = aRect.size.height.native - (dY.native * 2)
-    return NSRect(x: x, y: y, width: w, height: h)
+    return NSRect(x: CGFloat(x), y: CGFloat(y), width: CGFloat(w), height: CGFloat(h))
 }
 
 public func NSIntegralRect(_ aRect: NSRect) -> NSRect {

Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,7 @@ public func NSInsetRect(_ aRect: NSRect, _ dX: CGFloat, _ dY: CGFloat) -> NSRect`
`704`	`704`	`let y = aRect.origin.y.native + dY.native`
`705`	`705`	`let w = aRect.size.width.native - (dX.native * 2)`
`706`	`706`	`let h = aRect.size.height.native - (dY.native * 2)`
`707`		`- return NSRect(x: x, y: y, width: w, height: h)`
	`707`	`+ return NSRect(x: CGFloat(x), y: CGFloat(y), width: CGFloat(w), height: CGFloat(h))`
`708`	`708`	`}`
`709`	`709`
`710`	`710`	`public func NSIntegralRect(_ aRect: NSRect) -> NSRect {`