Revision: 5718
http://skim-app.svn.sourceforge.net/skim-app/?rev=5718&view=rev
Author: hofman
Date: 2009-09-08 16:24:59 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
remove some more unused method, avoid defining more method than necessary
Modified Paths:
--------------
trunk/NSBezierPath_SKExtensions.h
trunk/NSBezierPath_SKExtensions.m
trunk/SKPDFToolTipWindow.m
trunk/SKSideWindow.m
Modified: trunk/NSBezierPath_SKExtensions.h
===================================================================
--- trunk/NSBezierPath_SKExtensions.h 2009-09-08 16:19:26 UTC (rev 5717)
+++ trunk/NSBezierPath_SKExtensions.h 2009-09-08 16:24:59 UTC (rev 5718)
@@ -40,15 +40,9 @@
@interface NSBezierPath (SKExtensions)
-+ (void)fillLeftRoundRectInRect:(NSRect)rect radius:(CGFloat)radius;
-+ (void)strokeLeftRoundRectInRect:(NSRect)rect radius:(CGFloat)radius;
-+ (NSBezierPath *)bezierPathWithLeftRoundRectInRect:(NSRect)rect
radius:(CGFloat)radius;
-+ (void)fillRightRoundRectInRect:(NSRect)rect radius:(CGFloat)radius;
-+ (void)strokeRightRoundRectInRect:(NSRect)rect radius:(CGFloat)radius;
-+ (NSBezierPath *)bezierPathWithRightRoundRectInRect:(NSRect)rect
radius:(CGFloat)radius;
++ (NSBezierPath *)bezierPathWithLeftRoundedRect:(NSRect)rect
radius:(CGFloat)radius;
++ (NSBezierPath *)bezierPathWithRightRoundedRect:(NSRect)rect
radius:(CGFloat)radius;
-+ (void)fillHorizontalOvalAroundRect:(NSRect)rect;
-+ (void)strokeHorizontalOvalAroundRect:(NSRect)rect;
+ (NSBezierPath*)bezierPathWithHorizontalOvalAroundRect:(NSRect)rect;
- (NSRect)nonEmptyBounds;
Modified: trunk/NSBezierPath_SKExtensions.m
===================================================================
--- trunk/NSBezierPath_SKExtensions.m 2009-09-08 16:19:26 UTC (rev 5717)
+++ trunk/NSBezierPath_SKExtensions.m 2009-09-08 16:24:59 UTC (rev 5718)
@@ -41,21 +41,8 @@
@implementation NSBezierPath (SKExtensions)
-+ (void)fillLeftRoundRectInRect:(NSRect)rect radius:(CGFloat)radius
++ (NSBezierPath *)bezierPathWithLeftRoundedRect:(NSRect)rect
radius:(CGFloat)radius
{
- NSBezierPath *p = [self bezierPathWithLeftRoundRectInRect:rect
radius:radius];
- [p fill];
-}
-
-
-+ (void)strokeLeftRoundRectInRect:(NSRect)rect radius:(CGFloat)radius
-{
- NSBezierPath *p = [self bezierPathWithLeftRoundRectInRect:rect
radius:radius];
- [p stroke];
-}
-
-+ (NSBezierPath *)bezierPathWithLeftRoundRectInRect:(NSRect)rect
radius:(CGFloat)radius
-{
// Make sure radius doesn't exceed a maximum size to avoid artifacts:
radius = SKMin(radius, SKMin(0.5f * NSHeight(rect), NSWidth(rect)));
@@ -82,21 +69,8 @@
return path;
}
-+ (void)fillRightRoundRectInRect:(NSRect)rect radius:(CGFloat)radius
++ (NSBezierPath *)bezierPathWithRightRoundedRect:(NSRect)rect
radius:(CGFloat)radius
{
- NSBezierPath *p = [self bezierPathWithRightRoundRectInRect:rect
radius:radius];
- [p fill];
-}
-
-
-+ (void)strokeRightRoundRectInRect:(NSRect)rect radius:(CGFloat)radius
-{
- NSBezierPath *p = [self bezierPathWithRightRoundRectInRect:rect
radius:radius];
- [p stroke];
-}
-
-+ (NSBezierPath *)bezierPathWithRightRoundRectInRect:(NSRect)rect
radius:(CGFloat)radius
-{
// Make sure radius doesn't exceed a maximum size to avoid artifacts:
radius = SKMin(radius, SKMin(0.5f * NSHeight(rect), NSWidth(rect)));
@@ -123,19 +97,6 @@
return path;
}
-+ (void)fillHorizontalOvalAroundRect:(NSRect)rect
-{
- NSBezierPath *p = [self bezierPathWithHorizontalOvalAroundRect:rect];
- [p fill];
-}
-
-
-+ (void)strokeHorizontalOvalAroundRect:(NSRect)rect
-{
- NSBezierPath *p = [self bezierPathWithHorizontalOvalAroundRect:rect];
- [p stroke];
-}
-
+ (NSBezierPath *)bezierPathWithHorizontalOvalAroundRect:(NSRect)rect
{
CGFloat radius = 0.5f * rect.size.height;
Modified: trunk/SKPDFToolTipWindow.m
===================================================================
--- trunk/SKPDFToolTipWindow.m 2009-09-08 16:19:26 UTC (rev 5717)
+++ trunk/SKPDFToolTipWindow.m 2009-09-08 16:24:59 UTC (rev 5718)
@@ -264,7 +264,7 @@
[image lockFocus];
[pageImage drawInRect:targetRect fromRect:sourceRect
operation:NSCompositeCopy fraction:1.0];
[labelColor setFill];
- [NSBezierPath fillHorizontalOvalAroundRect:labelRect];
+ [[NSBezierPath bezierPathWithHorizontalOvalAroundRect:labelRect]
fill];
[labelString drawWithRect:labelRect
options:NSStringDrawingUsesLineFragmentOrigin];
[image unlockFocus];
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2009-09-08 16:19:26 UTC (rev 5717)
+++ trunk/SKSideWindow.m 2009-09-08 16:24:59 UTC (rev 5718)
@@ -287,18 +287,18 @@
if (edge == NSMinXEdge) {
[[NSColor colorWithCalibratedWhite:0.9 alpha:1.0] set];
- [NSBezierPath fillRightRoundRectInRect:topRect radius:CORNER_RADIUS];
+ [[NSBezierPath bezierPathWithRightRoundedRect:topRect
radius:CORNER_RADIUS] fill];
[[NSColor colorWithCalibratedWhite:0.4 alpha:1.0] set];
- [NSBezierPath fillRightRoundRectInRect:bottomRect
radius:CORNER_RADIUS];
+ [[NSBezierPath bezierPathWithRightRoundedRect:bottomRect
radius:CORNER_RADIUS] fill];
[[NSColor colorWithCalibratedWhite:0.8 alpha:1.0] set];
- [NSBezierPath fillRightRoundRectInRect:NSInsetRect(rect, 0.0, 1.5)
radius:CORNER_RADIUS];
+ [[NSBezierPath bezierPathWithRightRoundedRect:NSInsetRect(rect, 0.0,
1.5) radius:CORNER_RADIUS] fill];
} else {
[[NSColor colorWithCalibratedWhite:0.9 alpha:1.0] set];
- [NSBezierPath fillLeftRoundRectInRect:topRect radius:CORNER_RADIUS];
+ [[NSBezierPath bezierPathWithLeftRoundedRect:topRect
radius:CORNER_RADIUS] fill];
[[NSColor colorWithCalibratedWhite:0.4 alpha:1.0] set];
- [NSBezierPath fillLeftRoundRectInRect:bottomRect radius:CORNER_RADIUS];
+ [[NSBezierPath bezierPathWithLeftRoundedRect:bottomRect
radius:CORNER_RADIUS] fill];
[[NSColor colorWithCalibratedWhite:0.8 alpha:1.0] set];
- [NSBezierPath fillLeftRoundRectInRect:NSInsetRect(rect, 0.0, 1.5)
radius:CORNER_RADIUS];
+ [[NSBezierPath bezierPathWithLeftRoundedRect:NSInsetRect(rect, 0.0,
1.5) radius:CORNER_RADIUS] fill];
}
[shade setShadowBlurRadius:0.0];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit