Revision: 7578
http://skim-app.svn.sourceforge.net/skim-app/?rev=7578&view=rev
Author: hofman
Date: 2011-12-16 15:07:18 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
only draw expansion tooltip for download file name as the status message is
always short
Modified Paths:
--------------
trunk/SKProgressCell.m
Modified: trunk/SKProgressCell.m
===================================================================
--- trunk/SKProgressCell.m 2011-12-16 12:41:44 UTC (rev 7577)
+++ trunk/SKProgressCell.m 2011-12-16 15:07:18 UTC (rev 7578)
@@ -137,13 +137,7 @@
- (NSSize)cellSizeForBounds:(NSRect)aRect {
NSSize cellSize = [super cellSizeForBounds:aRect];
- if (nil == objectValueForKey([self objectValue],
SKDownloadProgressIndicatorKey)) {
- NSSize statusSize = [statusCell cellSize];
- cellSize.width = fmax(cellSize.width, statusSize.width);
- cellSize.height += statusSize.height;
- }
- cellSize.width += 2.0 * MARGIN_X;
- cellSize.height += MARGIN_Y;
+ cellSize.width = fmin(cellSize.width + 2.0 * MARGIN_X, NSWidth(aRect));
return cellSize;
}
@@ -166,15 +160,11 @@
}
- (void)drawWithExpansionFrame:(NSRect)cellFrame inView:(NSView *)view {
- [self drawInteriorWithFrame:SKSliceRect(cellFrame, [super
cellSizeForBounds:cellFrame].height, [view isFlipped] ? NSMinYEdge :
NSMaxYEdge) inView:view];
-
- if (nil == objectValueForKey([self objectValue],
SKDownloadProgressIndicatorKey))
- [statusCell drawInteriorWithFrame:SKSliceRect(cellFrame, [statusCell
cellSize].height, [view isFlipped] ? NSMaxYEdge : NSMinYEdge) inView:view];
+ [self drawInteriorWithFrame:cellFrame inView:view];
}
- (NSRect)expansionFrameWithFrame:(NSRect)cellFrame inView:(NSView *)view {
- NSRect rect = [super expansionFrameWithFrame:cellFrame inView:view];
- return SKShrinkRect(NSInsetRect(rect, MARGIN_X, 0.0), MARGIN_Y, [view
isFlipped] ? NSMaxYEdge : NSMinYEdge);
+ return NSInsetRect([super expansionFrameWithFrame:cellFrame inView:view],
MARGIN_X, 0.0);
}
#pragma mark Accessibility
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
