Swift 3.0 beta 6 (acegreen's branch, but with fixes for OS X) #1353
Conversation
pixelspark
force-pushed
the
Swift-3.0-OSX
branch
from
da9a625
to
32caa52
Compare
|
@pixelspark hey thanks. I will merge #1342 soon, could you just pull and update this PR once I merged? |
|
I just merged #1342, could you pull the branch again and perhaps double check everything good so I can merge this PR? |
pixelspark
force-pushed
the
Swift-3.0-OSX
branch
from
32caa52
to
3c01781
Compare
|
@liuxuan30 thanks, I have just rebased my changes atop of your Swift-3.0 branch (a3c03c2). It builds with these changes on OSX & looks fine to me! |
| @@ -357,7 +357,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate | |||
| // 23 is the smallest recommended font size on the TV | |||
| font = NSUIFont.systemFont(ofSize: 23, weight: UIFontWeightMedium) | |||
| #else | |||
| font = NSUIFont.systemFont(ofSize: NSUIFont.systemFontSize) | |||
| font = NSUIFont.systemFont(ofSize: NSUIFont.nsuiSystemFontSize) | |||
There was a problem hiding this comment.
guess it is supposed to start with NSUI ?
|
@pixelspark I have added some line notes. Please review. BTW, some of the changes have weird indents, maybe you want to double check |
| @@ -200,6 +200,12 @@ types are aliased to either their UI* implementation (on iOS) or their NS* imple | |||
| UIGraphicsBeginImageContextWithOptions(size, opaque, scale) | |||
| } | |||
|
|
|||
| extension NSUIFont { | |||
There was a problem hiding this comment.
not sure why, but the indent seems not 4 spaces..
|
@liuxuan30 Thanks. Will check indenting, probably an issue with my XCode settings between projects. Re the other remarks: will have a look into those later today or tomorrow. |
|
@pixelspark One more thing, as SE-1107 introduces |
|
@liuxuan30 I don't think that I need to make any classes 'open' in addition to what your commit will fix. The OSX specific parts are mainly internal to the Charts framework (i.e. none of the NSUI classes should be exposed to users of the framework, let alone be declared open...) |
|
OK, not fully looked into macOS yet, just being careful if it will override access control. It's not only classes but also class members, I have converted all available ones. |
pixelspark
force-pushed
the
Swift-3.0-OSX
branch
from
3c01781
to
e7edc75
Compare
|
@liuxuan30 fixed open/public for OSX (this PR is now based on your latest Swift-3.0 commit, e.g. ce4e180). Feel free to fix any whitespace or code styling issues yourself :) |
|
Thanks. |
As for some reason I can't seem to submit a pull request to @acegreen's branch, I'll submit it here: this is @acegreen's branch for Swift 3 (XCode beta 6), but now with fixes that let it build under OS X.
Further discussion is here: #1342