diff options
| author | randomguy3 <randomguy3@7c02a99a-9b00-45e3-bf44-6f3dd7fddb64> | 2012-01-10 15:40:11 +0000 |
|---|---|---|
| committer | randomguy3 <randomguy3@7c02a99a-9b00-45e3-bf44-6f3dd7fddb64> | 2012-01-10 15:40:11 +0000 |
| commit | 87294b7ebc03156f223052ca2a6c70463df568f0 (patch) | |
| tree | 7200a2cb348b18c8d255931058ffab260f4225c3 /tikzit/src/linux/Edge+Render.m | |
| parent | c372b719b84a320f6fb7cab6dc0d1ab94beacd78 (diff) | |
GTK: Edge style support
git-svn-id: https://tikzit.svn.sourceforge.net/svnroot/tikzit/trunk@375 7c02a99a-9b00-45e3-bf44-6f3dd7fddb64
Diffstat (limited to 'tikzit/src/linux/Edge+Render.m')
| -rw-r--r-- | tikzit/src/linux/Edge+Render.m | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/tikzit/src/linux/Edge+Render.m b/tikzit/src/linux/Edge+Render.m index 2e5f127..a6738b7 100644 --- a/tikzit/src/linux/Edge+Render.m +++ b/tikzit/src/linux/Edge+Render.m @@ -134,19 +134,19 @@ static const float cpLineWidth = 1.0; [context moveTo:c_source]; [context curveTo:c_target withCp1:c_cp1 andCp2:c_cp2]; - if ([self style] != nil) { + if ([self style] != nil) { // draw edge decoration switch ([[self style] decorationStyle]) { case ED_None: break; case ED_Tick: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; + [context moveTo:[transformer toScreen:[self leftNormal]]]; + [context lineTo:[transformer toScreen:[self rightNormal]]]; break; case ED_Arrow: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self midTan]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; + [context moveTo:[transformer toScreen:[self leftNormal]]]; + [context lineTo:[transformer toScreen:[self midTan]]]; + [context lineTo:[transformer toScreen:[self rightNormal]]]; break; } } @@ -157,7 +157,8 @@ static const float cpLineWidth = 1.0; [self updateControls]; [context saveState]; - [context setLineWidth:edgeWidth]; + const CGFloat lineWidth = style ? [style thickness] : edgeWidth; + [context setLineWidth:lineWidth]; [self createStrokePathInContext:context withTransformer:[surface transformer]]; RColor color = BlackRColor; if (selected) { @@ -170,11 +171,11 @@ static const float cpLineWidth = 1.0; [self renderControlsToSurface:surface withContext:context]; } - if ([self hasEdgeNode]) { - NSPoint labelPt = [[surface transformer] toScreen:[self mid]]; - [[self edgeNode] renderLabelAt:labelPt - withContext:context]; - } + if ([self hasEdgeNode]) { + NSPoint labelPt = [[surface transformer] toScreen:[self mid]]; + [[self edgeNode] renderLabelAt:labelPt + withContext:context]; + } } - (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected { @@ -205,4 +206,4 @@ static const float cpLineWidth = 1.0; @end -// vim:ft=objc:ts=4:noet:sts=4:sw=4 +// vim:ft=objc:ts=4:et:sts=4:sw=4 |