Revision: 3393
http://skim-app.svn.sourceforge.net/skim-app/?rev=3393&view=rev
Author: hofman
Date: 2008-02-12 09:07:30 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
Revert an earlier change to adorn images: shift them back up by 1pt. The real
problem was the height of the segmented controls rather than the size of the
images.
Modified Paths:
--------------
trunk/NSImage_SKExtensions.m
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2008-02-12 16:56:26 UTC (rev 3392)
+++ trunk/NSImage_SKExtensions.m 2008-02-12 17:07:30 UTC (rev 3393)
@@ -131,9 +131,9 @@
//[shadow set];
[[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(16.0, 1.5)];
- [path lineToPoint:NSMakePoint(7.5, 6.0)];
- [path lineToPoint:NSMakePoint(16.0, 10.5)];
+ [path moveToPoint:NSMakePoint(16.0, 2.5)];
+ [path lineToPoint:NSMakePoint(7.5, 7.0)];
+ [path lineToPoint:NSMakePoint(16.0, 11.5)];
[path closePath];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
@@ -146,9 +146,9 @@
//[shadow set];
[[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(9.0, 1.5)];
- [path lineToPoint:NSMakePoint(17.5, 6.0)];
- [path lineToPoint:NSMakePoint(9.0, 10.5)];
+ [path moveToPoint:NSMakePoint(9.0, 2.5)];
+ [path lineToPoint:NSMakePoint(17.5, 7.0)];
+ [path lineToPoint:NSMakePoint(9.0, 11.5)];
[path closePath];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
@@ -161,11 +161,11 @@
//[shadow set];
[[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(18.0, 1.5)];
- [path lineToPoint:NSMakePoint(9.5, 6.0)];
- [path lineToPoint:NSMakePoint(18.0, 10.5)];
+ [path moveToPoint:NSMakePoint(18.0, 2.5)];
+ [path lineToPoint:NSMakePoint(9.5, 7.0)];
+ [path lineToPoint:NSMakePoint(18.0, 11.5)];
[path closePath];
- [path appendBezierPathWithRect:NSMakeRect(5.0, 2.0, 3.0, 8.0)];
+ [path appendBezierPathWithRect:NSMakeRect(5.0, 3.0, 3.0, 8.0)];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[firstAdornImage unlockFocus];
@@ -177,11 +177,11 @@
//[shadow set];
[[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(7.0, 1.5)];
- [path lineToPoint:NSMakePoint(15.5, 6.0)];
- [path lineToPoint:NSMakePoint(7.0, 10.5)];
+ [path moveToPoint:NSMakePoint(7.0, 2.5)];
+ [path lineToPoint:NSMakePoint(15.5, 7.0)];
+ [path lineToPoint:NSMakePoint(7.0, 11.5)];
[path closePath];
- [path appendBezierPathWithRect:NSMakeRect(17.0, 2.0, 3.0, 8.0)];
+ [path appendBezierPathWithRect:NSMakeRect(17.0, 3.0, 3.0, 8.0)];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[lastAdornImage unlockFocus];
@@ -193,8 +193,8 @@
[shadow set];
[[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill];
path = [NSBezierPath bezierPath];
- [path appendBezierPathWithRect:NSMakeRect(8.0, 5.0, 11.0, 3.0)];
- [path appendBezierPathWithRect:NSMakeRect(12.0, 1.0, 3.0, 11.0)];
+ [path appendBezierPathWithRect:NSMakeRect(8.0, 6.0, 11.0, 3.0)];
+ [path appendBezierPathWithRect:NSMakeRect(12.0, 2.0, 3.0, 11.0)];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[zoomInAdornImage unlockFocus];
@@ -206,7 +206,7 @@
[shadow set];
[[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill];
path = [NSBezierPath bezierPath];
- [path appendBezierPathWithRect:NSMakeRect(6.0, 5.0, 11.0, 3.0)];
+ [path appendBezierPathWithRect:NSMakeRect(6.0, 6.0, 11.0, 3.0)];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[zoomOutAdornImage unlockFocus];
@@ -218,8 +218,8 @@
[shadow set];
[[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill];
path = [NSBezierPath bezierPath];
- [path appendBezierPathWithRect:NSMakeRect(7.0, 3.0, 11.0, 3.0)];
- [path appendBezierPathWithRect:NSMakeRect(7.0, 7.0, 11.0, 3.0)];
+ [path appendBezierPathWithRect:NSMakeRect(7.0, 4.0, 11.0, 3.0)];
+ [path appendBezierPathWithRect:NSMakeRect(7.0, 8.0, 11.0, 3.0)];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[zoomActualAdornImage unlockFocus];
@@ -231,14 +231,14 @@
[shadow set];
[color setStroke];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(8.0, 1.5)];
- [path lineToPoint:NSMakePoint(19.0, 1.5)];
- [path moveToPoint:NSMakePoint(8.0, 4.5)];
- [path lineToPoint:NSMakePoint(19.0, 4.5)];
- [path moveToPoint:NSMakePoint(8.0, 7.5)];
- [path lineToPoint:NSMakePoint(19.0, 7.5)];
- [path moveToPoint:NSMakePoint(8.0, 10.5)];
- [path lineToPoint:NSMakePoint(19.0, 10.5)];
+ [path moveToPoint:NSMakePoint(8.0, 2.5)];
+ [path lineToPoint:NSMakePoint(19.0, 2.5)];
+ [path moveToPoint:NSMakePoint(8.0, 5.5)];
+ [path lineToPoint:NSMakePoint(19.0, 5.5)];
+ [path moveToPoint:NSMakePoint(8.0, 8.5)];
+ [path lineToPoint:NSMakePoint(19.0, 8.5)];
+ [path moveToPoint:NSMakePoint(8.0, 11.5)];
+ [path lineToPoint:NSMakePoint(19.0, 11.5)];
[path stroke];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[outlineViewAdornImage unlockFocus];
@@ -250,12 +250,12 @@
[shadow set];
[color setStroke];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(14.0, 2.5)];
- [path lineToPoint:NSMakePoint(19.0, 2.5)];
- [path moveToPoint:NSMakePoint(14.0, 9.5)];
- [path lineToPoint:NSMakePoint(19.0, 9.5)];
- [path appendBezierPathWithRect:NSMakeRect(8.5, 0.5, 4.0, 4.0)];
- [path appendBezierPathWithRect:NSMakeRect(8.5, 7.5, 4.0, 4.0)];
+ [path moveToPoint:NSMakePoint(14.0, 3.5)];
+ [path lineToPoint:NSMakePoint(19.0, 3.5)];
+ [path moveToPoint:NSMakePoint(14.0, 10.5)];
+ [path lineToPoint:NSMakePoint(19.0, 10.5)];
+ [path appendBezierPathWithRect:NSMakeRect(8.5, 1.5, 4.0, 4.0)];
+ [path appendBezierPathWithRect:NSMakeRect(8.5, 8.5, 4.0, 4.0)];
[path stroke];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[thumbnailViewAdornImage unlockFocus];
@@ -267,28 +267,28 @@
[shadow set];
[color setStroke];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(14.0, 2.5)];
- [path lineToPoint:NSMakePoint(19.0, 2.5)];
- [path moveToPoint:NSMakePoint(14.0, 9.5)];
- [path lineToPoint:NSMakePoint(19.0, 9.5)];
- [path moveToPoint:NSMakePoint(11.0, 0.5)];
- [path lineToPoint:NSMakePoint(8.5, 0.5)];
- [path lineToPoint:NSMakePoint(8.5, 4.5)];
- [path lineToPoint:NSMakePoint(12.5, 4.5)];
- [path lineToPoint:NSMakePoint(12.5, 2.0)];
+ [path moveToPoint:NSMakePoint(14.0, 3.5)];
+ [path lineToPoint:NSMakePoint(19.0, 3.5)];
+ [path moveToPoint:NSMakePoint(14.0, 10.5)];
+ [path lineToPoint:NSMakePoint(19.0, 10.5)];
+ [path moveToPoint:NSMakePoint(11.0, 1.5)];
+ [path lineToPoint:NSMakePoint(8.5, 1.5)];
+ [path lineToPoint:NSMakePoint(8.5, 5.5)];
+ [path lineToPoint:NSMakePoint(12.5, 5.5)];
+ [path lineToPoint:NSMakePoint(12.5, 3.0)];
[path closePath];
- [path moveToPoint:NSMakePoint(11.5, 0.5)];
- [path lineToPoint:NSMakePoint(11.5, 1.5)];
- [path lineToPoint:NSMakePoint(12.5, 1.5)];
- [path moveToPoint:NSMakePoint(11.0, 7.5)];
- [path lineToPoint:NSMakePoint(8.5, 7.5)];
- [path lineToPoint:NSMakePoint(8.5, 11.5)];
- [path lineToPoint:NSMakePoint(12.5, 11.5)];
- [path lineToPoint:NSMakePoint(12.5, 9.0)];
+ [path moveToPoint:NSMakePoint(11.5, 1.5)];
+ [path lineToPoint:NSMakePoint(11.5, 2.5)];
+ [path lineToPoint:NSMakePoint(12.5, 2.5)];
+ [path moveToPoint:NSMakePoint(11.0, 8.5)];
+ [path lineToPoint:NSMakePoint(8.5, 8.5)];
+ [path lineToPoint:NSMakePoint(8.5, 12.5)];
+ [path lineToPoint:NSMakePoint(12.5, 12.5)];
+ [path lineToPoint:NSMakePoint(12.5, 10.0)];
[path closePath];
- [path moveToPoint:NSMakePoint(11.5, 7.5)];
- [path lineToPoint:NSMakePoint(11.5, 8.5)];
- [path lineToPoint:NSMakePoint(12.5, 8.5)];
+ [path moveToPoint:NSMakePoint(11.5, 8.5)];
+ [path lineToPoint:NSMakePoint(11.5, 9.5)];
+ [path lineToPoint:NSMakePoint(12.5, 9.5)];
[path stroke];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[noteViewAdornImage unlockFocus];
@@ -300,8 +300,8 @@
[shadow set];
[color setStroke];
path = [NSBezierPath bezierPath];
- [path appendBezierPathWithRect:NSMakeRect(8.5, 0.5, 10.0, 4.0)];
- [path appendBezierPathWithRect:NSMakeRect(8.5, 7.5, 10.0, 4.0)];
+ [path appendBezierPathWithRect:NSMakeRect(8.5, 1.5, 10.0, 4.0)];
+ [path appendBezierPathWithRect:NSMakeRect(8.5, 8.5, 10.0, 4.0)];
[path stroke];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[snapshotViewAdornImage unlockFocus];
@@ -313,14 +313,14 @@
[shadow set];
[color setStroke];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(8.0, 1.5)];
- [path lineToPoint:NSMakePoint(19.0, 1.5)];
- [path moveToPoint:NSMakePoint(8.0, 4.5)];
- [path lineToPoint:NSMakePoint(19.0, 4.5)];
- [path moveToPoint:NSMakePoint(8.0, 7.5)];
- [path lineToPoint:NSMakePoint(19.0, 7.5)];
- [path moveToPoint:NSMakePoint(8.0, 10.5)];
- [path lineToPoint:NSMakePoint(19.0, 10.5)];
+ [path moveToPoint:NSMakePoint(8.0, 2.5)];
+ [path lineToPoint:NSMakePoint(19.0, 2.5)];
+ [path moveToPoint:NSMakePoint(8.0, 5.5)];
+ [path lineToPoint:NSMakePoint(19.0, 5.5)];
+ [path moveToPoint:NSMakePoint(8.0, 8.5)];
+ [path lineToPoint:NSMakePoint(19.0, 8.5)];
+ [path moveToPoint:NSMakePoint(8.0, 11.5)];
+ [path lineToPoint:NSMakePoint(19.0, 11.5)];
[path stroke];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[findViewAdornImage unlockFocus];
@@ -332,12 +332,12 @@
[shadow set];
[color setStroke];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(8.0, 2.0)];
- [path lineToPoint:NSMakePoint(13.0, 2.0)];
- [path moveToPoint:NSMakePoint(8.0, 6.0)];
- [path lineToPoint:NSMakePoint(17.0, 6.0)];
- [path moveToPoint:NSMakePoint(8.0, 10.0)];
- [path lineToPoint:NSMakePoint(19.0, 10.0)];
+ [path moveToPoint:NSMakePoint(8.0, 3.0)];
+ [path lineToPoint:NSMakePoint(13.0, 3.0)];
+ [path moveToPoint:NSMakePoint(8.0, 7.0)];
+ [path lineToPoint:NSMakePoint(17.0, 7.0)];
+ [path moveToPoint:NSMakePoint(8.0, 11.0)];
+ [path lineToPoint:NSMakePoint(19.0, 11.0)];
[path setLineWidth:2.0];
[path stroke];
[[NSGraphicsContext currentContext] restoreGraphicsState];
@@ -374,30 +374,30 @@
[shadow set];
[[NSColor blackColor] set];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(9.0, 4.5)];
- [path lineToPoint:NSMakePoint(7.0, 6.5)];
- [path lineToPoint:NSMakePoint(9.0, 8.5)];
+ [path moveToPoint:NSMakePoint(9.0, 5.5)];
+ [path lineToPoint:NSMakePoint(7.0, 7.5)];
+ [path lineToPoint:NSMakePoint(9.0, 9.5)];
+ [path lineToPoint:NSMakePoint(9.0, 8.0)];
+ [path lineToPoint:NSMakePoint(12.0, 8.0)];
+ [path lineToPoint:NSMakePoint(12.0, 11.0)];
+ [path lineToPoint:NSMakePoint(10.5, 11.0)];
+ [path lineToPoint:NSMakePoint(12.5, 13.0)];
+ [path lineToPoint:NSMakePoint(14.5, 11.0)];
+ [path lineToPoint:NSMakePoint(13.0, 11.0)];
+ [path lineToPoint:NSMakePoint(13.0, 8.0)];
+ [path lineToPoint:NSMakePoint(16.0, 8.0)];
+ [path lineToPoint:NSMakePoint(16.0, 9.5)];
+ [path lineToPoint:NSMakePoint(18.0, 7.5)];
+ [path lineToPoint:NSMakePoint(16.0, 5.5)];
+ [path lineToPoint:NSMakePoint(16.0, 7.0)];
+ [path lineToPoint:NSMakePoint(13.0, 7.0)];
+ [path lineToPoint:NSMakePoint(13.0, 4.0)];
+ [path lineToPoint:NSMakePoint(14.5, 4.0)];
+ [path lineToPoint:NSMakePoint(12.5, 2.0)];
+ [path lineToPoint:NSMakePoint(10.5, 4.0)];
+ [path lineToPoint:NSMakePoint(12.0, 4.0)];
+ [path lineToPoint:NSMakePoint(12.0, 7.0)];
[path lineToPoint:NSMakePoint(9.0, 7.0)];
- [path lineToPoint:NSMakePoint(12.0, 7.0)];
- [path lineToPoint:NSMakePoint(12.0, 10.0)];
- [path lineToPoint:NSMakePoint(10.5, 10.0)];
- [path lineToPoint:NSMakePoint(12.5, 12.0)];
- [path lineToPoint:NSMakePoint(14.5, 10.0)];
- [path lineToPoint:NSMakePoint(13.0, 10.0)];
- [path lineToPoint:NSMakePoint(13.0, 7.0)];
- [path lineToPoint:NSMakePoint(16.0, 7.0)];
- [path lineToPoint:NSMakePoint(16.0, 8.5)];
- [path lineToPoint:NSMakePoint(18.0, 6.5)];
- [path lineToPoint:NSMakePoint(16.0, 4.5)];
- [path lineToPoint:NSMakePoint(16.0, 6.0)];
- [path lineToPoint:NSMakePoint(13.0, 6.0)];
- [path lineToPoint:NSMakePoint(13.0, 3.0)];
- [path lineToPoint:NSMakePoint(14.5, 3.0)];
- [path lineToPoint:NSMakePoint(12.5, 1.0)];
- [path lineToPoint:NSMakePoint(10.5, 3.0)];
- [path lineToPoint:NSMakePoint(12.0, 3.0)];
- [path lineToPoint:NSMakePoint(12.0, 6.0)];
- [path lineToPoint:NSMakePoint(9.0, 6.0)];
[path closePath];
[path fill];
[[NSGraphicsContext currentContext] restoreGraphicsState];
@@ -425,26 +425,26 @@
[shadow set];
[color setStroke];
path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(7.5, 8.0)];
- [path lineToPoint:NSMakePoint(7.5, 10.5)];
- [path lineToPoint:NSMakePoint(10.0, 10.5)];
- [path moveToPoint:NSMakePoint(11.0, 10.5)];
- [path lineToPoint:NSMakePoint(14.0, 10.5)];
- [path moveToPoint:NSMakePoint(15.0, 10.5)];
- [path lineToPoint:NSMakePoint(17.5, 10.5)];
- [path lineToPoint:NSMakePoint(17.5, 8.0)];
- [path moveToPoint:NSMakePoint(17.5, 7.0)];
- [path lineToPoint:NSMakePoint(17.5, 5.0)];
- [path moveToPoint:NSMakePoint(17.5, 4.0)];
- [path lineToPoint:NSMakePoint(17.5, 1.5)];
- [path lineToPoint:NSMakePoint(15.0, 1.5)];
- [path moveToPoint:NSMakePoint(14.0, 1.5)];
- [path lineToPoint:NSMakePoint(11.0, 1.5)];
- [path moveToPoint:NSMakePoint(10.0, 1.5)];
- [path lineToPoint:NSMakePoint(7.5, 1.5)];
- [path lineToPoint:NSMakePoint(7.5, 4.0)];
- [path moveToPoint:NSMakePoint(7.5, 5.0)];
- [path lineToPoint:NSMakePoint(7.5, 7.0)];
+ [path moveToPoint:NSMakePoint(7.5, 9.0)];
+ [path lineToPoint:NSMakePoint(7.5, 11.5)];
+ [path lineToPoint:NSMakePoint(10.0, 11.5)];
+ [path moveToPoint:NSMakePoint(11.0, 11.5)];
+ [path lineToPoint:NSMakePoint(14.0, 11.5)];
+ [path moveToPoint:NSMakePoint(15.0, 11.5)];
+ [path lineToPoint:NSMakePoint(17.5, 11.5)];
+ [path lineToPoint:NSMakePoint(17.5, 9.0)];
+ [path moveToPoint:NSMakePoint(17.5, 8.0)];
+ [path lineToPoint:NSMakePoint(17.5, 6.0)];
+ [path moveToPoint:NSMakePoint(17.5, 5.0)];
+ [path lineToPoint:NSMakePoint(17.5, 2.5)];
+ [path lineToPoint:NSMakePoint(15.0, 2.5)];
+ [path moveToPoint:NSMakePoint(14.0, 2.5)];
+ [path lineToPoint:NSMakePoint(11.0, 2.5)];
+ [path moveToPoint:NSMakePoint(10.0, 2.5)];
+ [path lineToPoint:NSMakePoint(7.5, 2.5)];
+ [path lineToPoint:NSMakePoint(7.5, 5.0)];
+ [path moveToPoint:NSMakePoint(7.5, 6.0)];
+ [path lineToPoint:NSMakePoint(7.5, 8.0)];
[path stroke];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[selectToolAdornImage unlockFocus];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
