gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-20 20:46:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change NSBezierPath to use NSInteger and CGFloat and adjust uses to

Browse source 
this.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36054 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-02-01 14:03:08 +00:00
parent a2aa2001da
commit e62fddeea0
6 changed files with 104 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/NSLayoutManager.m
View file

@ -2017,22 +2017,22 @@ static void GSDrawPatternLine(NSPoint start, NSPoint end, NSInteger pattern, CGF
// FIXME: setLineDash should take CGFloat
if ((pattern & NSUnderlinePatternDot) == NSUnderlinePatternDot)
{
const float dot[2] = {2.5 * thickness, 2.5 * thickness};
const CGFloat dot[2] = {2.5 * thickness, 2.5 * thickness};
[path setLineDash: dot count: 2 phase: phase];
}
else if ((pattern & NSUnderlinePatternDash) == NSUnderlinePatternDash)
{
const float dash[2] = {10 * thickness, 5 * thickness};
const CGFloat dash[2] = {10 * thickness, 5 * thickness};
[path setLineDash: dash count: 2 phase: phase];
}
else if ((pattern & NSUnderlinePatternDashDot) == NSUnderlinePatternDashDot)
{
const float dashdot[4] = {10 * thickness, 3 * thickness, 3 * thickness, 3 * thickness};
const CGFloat dashdot[4] = {10 * thickness, 3 * thickness, 3 * thickness, 3 * thickness};
[path setLineDash: dashdot count: 4 phase: phase];
}
else if ((pattern & NSUnderlinePatternDashDotDot) == NSUnderlinePatternDashDotDot)
{
const float dashdotdot[6] = {10 * thickness, 3 * thickness, 3 * thickness, 3 * thickness, 3 * thickness, 3 * thickness};
const CGFloat dashdotdot[6] = {10 * thickness, 3 * thickness, 3 * thickness, 3 * thickness, 3 * thickness, 3 * thickness};
[path setLineDash: dashdotdot count: 6 phase: phase];
}
@ -2190,7 +2190,7 @@ static void GSDrawPatternLine(NSPoint start, NSPoint end, NSInteger pattern, CGF
containerOrigin: (NSPoint)containerOrigin
{
NSBezierPath *path;
const float pattern[2] = {2.5, 1.0};
const CGFloat pattern[2] = {2.5, 1.0};
NSFont *largestFont = [self effectiveFontForGlyphAtIndex: range.location // NOTE: GS private method
range: NULL];
NSPoint start = [self locationForGlyphAtIndex: range.location];