@@ -119,7 +119,7 @@ public struct CGSize {
119
119
120
120
extension CGSize {
121
121
public static var zero : CGSize {
122
- return CGSize ( width: CGFloat ( 0 ) , height: CGFloat ( 0 ) )
122
+ return CGSize ( width: 0 , height: 0 )
123
123
}
124
124
125
125
public init ( width: Int , height: Int ) {
@@ -682,10 +682,10 @@ public func NSEdgeInsetsEqual(_ aInsets: NSEdgeInsets, _ bInsets: NSEdgeInsets)
682
682
}
683
683
684
684
public func NSInsetRect( _ aRect: NSRect , _ dX: CGFloat , _ dY: CGFloat ) -> NSRect {
685
- let x = CGFloat ( aRect. origin. x. native + dX. native)
686
- let y = CGFloat ( aRect. origin. y. native + dY. native)
687
- let w = CGFloat ( aRect. size. width. native - ( dX. native * 2 ) )
688
- let h = CGFloat ( aRect. size. height. native - ( dY. native * 2 ) )
685
+ let x = aRect. origin. x. native + dX. native
686
+ let y = aRect. origin. y. native + dY. native
687
+ let w = aRect. size. width. native - ( dX. native * 2 )
688
+ let h = aRect. size. height. native - ( dY. native * 2 )
689
689
return NSRect ( x: x, y: y, width: w, height: h)
690
690
}
691
691
@@ -990,25 +990,19 @@ public func NSPointFromString(_ aString: String) -> NSPoint {
990
990
}
991
991
992
992
let parsedNumbers = _scanDoublesFromString ( aString, number: 2 )
993
-
994
993
let x = parsedNumbers [ 0 ]
995
994
let y = parsedNumbers [ 1 ]
996
- let result = NSPoint ( x: CGFloat ( x) , y: CGFloat ( y) )
997
-
998
- return result
995
+ return NSPoint ( x: x, y: y)
999
996
}
1000
997
1001
998
public func NSSizeFromString( _ aString: String ) -> NSSize {
1002
999
if aString. isEmpty {
1003
1000
return . zero
1004
1001
}
1005
1002
let parsedNumbers = _scanDoublesFromString ( aString, number: 2 )
1006
-
1007
1003
let w = parsedNumbers [ 0 ]
1008
1004
let h = parsedNumbers [ 1 ]
1009
- let result = NSSize ( width: CGFloat ( w) , height: CGFloat ( h) )
1010
-
1011
- return result
1005
+ return NSSize ( width: w, height: h)
1012
1006
}
1013
1007
1014
1008
public func NSRectFromString( _ aString: String ) -> NSRect {
@@ -1017,15 +1011,11 @@ public func NSRectFromString(_ aString: String) -> NSRect {
1017
1011
}
1018
1012
1019
1013
let parsedNumbers = _scanDoublesFromString ( aString, number: 4 )
1020
-
1021
1014
let x = parsedNumbers [ 0 ]
1022
1015
let y = parsedNumbers [ 1 ]
1023
1016
let w = parsedNumbers [ 2 ]
1024
1017
let h = parsedNumbers [ 3 ]
1025
-
1026
- let result = NSRect ( x: CGFloat ( x) , y: CGFloat ( y) , width: CGFloat ( w) , height: CGFloat ( h) )
1027
-
1028
- return result
1018
+ return NSRect ( x: x, y: y, width: w, height: h)
1029
1019
}
1030
1020
1031
1021
extension NSValue {
0 commit comments