Revision: 18311
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18311&view=rev
Author: hofman
Date: 2011-12-12 17:48:35 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
override cellSizeForBounds: instead of cellSize, because the latter just calls
the former
Modified Paths:
--------------
trunk/bibdesk/BDSKAddressTextFieldCell.m
trunk/bibdesk/BDSKEditorTextFieldCell.m
trunk/bibdesk/BDSKGroupCell.m
trunk/bibdesk/BDSKImagePopUpButtonCell.m
trunk/bibdesk/BDSKLevelIndicatorCell.m
trunk/bibdesk/BDSKMainTableView.m
trunk/bibdesk/BDSKRatingButtonCell.m
trunk/bibdesk/BDSKTextWithIconCell.m
Modified: trunk/bibdesk/BDSKAddressTextFieldCell.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextFieldCell.m 2011-12-12 07:35:27 UTC (rev
18310)
+++ trunk/bibdesk/BDSKAddressTextFieldCell.m 2011-12-12 17:48:35 UTC (rev
18311)
@@ -43,8 +43,8 @@
+ (Class)formatterClass { return Nil; }
-- (NSSize)cellSize {
- NSSize cellSize = [super cellSize];
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
+ NSSize cellSize = [super cellSizeForBounds:aRect];
cellSize.height += 1.0;
return cellSize;
}
Modified: trunk/bibdesk/BDSKEditorTextFieldCell.m
===================================================================
--- trunk/bibdesk/BDSKEditorTextFieldCell.m 2011-12-12 07:35:27 UTC (rev
18310)
+++ trunk/bibdesk/BDSKEditorTextFieldCell.m 2011-12-12 17:48:35 UTC (rev
18311)
@@ -220,9 +220,8 @@
- (NSBackgroundStyle)backgroundStyle { return NSBackgroundStyleLight; }
- (NSBackgroundStyle)interiorBackgroundStyle { return NSBackgroundStyleLight; }
-- (NSSize)cellSize
-{
- NSSize cellSize = [super cellSize];
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
+ NSSize cellSize = [super cellSizeForBounds:aRect];
if ([self hasButton] || [self URL])
cellSize.width += BUTTON_SIZE.width + BUTTON_MARGIN;
return cellSize;
Modified: trunk/bibdesk/BDSKGroupCell.m
===================================================================
--- trunk/bibdesk/BDSKGroupCell.m 2011-12-12 07:35:27 UTC (rev 18310)
+++ trunk/bibdesk/BDSKGroupCell.m 2011-12-12 17:48:35 UTC (rev 18311)
@@ -265,8 +265,8 @@
return [[labelCell font] defaultViewLineHeight];
}
-- (NSSize)cellSize {
- NSSize cellSize = [super cellSize];
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
+ NSSize cellSize = [super cellSizeForBounds:aRect];
NSSize countSize = NSZeroSize;
CGFloat iconHeight = cellSize.height + IMAGE_SIZE_OFFSET;
if ([self label]) {
Modified: trunk/bibdesk/BDSKImagePopUpButtonCell.m
===================================================================
--- trunk/bibdesk/BDSKImagePopUpButtonCell.m 2011-12-12 07:35:27 UTC (rev
18310)
+++ trunk/bibdesk/BDSKImagePopUpButtonCell.m 2011-12-12 17:48:35 UTC (rev
18311)
@@ -102,9 +102,9 @@
#pragma mark Drawing and highlighting
-- (NSSize)cellSize {
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
[buttonCell setImage:[self numberOfItems] ? [[self itemAtIndex:0] image] :
nil];
- NSSize size = [buttonCell cellSize];
+ NSSize size = [buttonCell cellSizeForBounds:aRect];
if ([self controlSize] != NSRegularControlSize) {
size = NSMakeSize(round(0.75 * size.width), round(0.75 * size.height));
if ([self arrowPosition] != NSPopUpNoArrow)
Modified: trunk/bibdesk/BDSKLevelIndicatorCell.m
===================================================================
--- trunk/bibdesk/BDSKLevelIndicatorCell.m 2011-12-12 07:35:27 UTC (rev
18310)
+++ trunk/bibdesk/BDSKLevelIndicatorCell.m 2011-12-12 17:48:35 UTC (rev
18311)
@@ -58,9 +58,9 @@
return obj;
}
-- (NSSize)cellSize {
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
// this is used for column auto-resizing, and NSLevelIndicatorCell seems
to return an insanely large size
- NSSize cellSize = [super cellSize];
+ NSSize cellSize = [super cellSizeForBounds:aRect];
cellSize.width = fmin(100.0, cellSize.width);
return cellSize;
}
Modified: trunk/bibdesk/BDSKMainTableView.m
===================================================================
--- trunk/bibdesk/BDSKMainTableView.m 2011-12-12 07:35:27 UTC (rev 18310)
+++ trunk/bibdesk/BDSKMainTableView.m 2011-12-12 17:48:35 UTC (rev 18311)
@@ -782,7 +782,7 @@
@implementation BDSKColorCell
-- (NSSize)cellSize {
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
return NSMakeSize(16.0, 16.0);
}
Modified: trunk/bibdesk/BDSKRatingButtonCell.m
===================================================================
--- trunk/bibdesk/BDSKRatingButtonCell.m 2011-12-12 07:35:27 UTC (rev
18310)
+++ trunk/bibdesk/BDSKRatingButtonCell.m 2011-12-12 17:48:35 UTC (rev
18311)
@@ -224,7 +224,7 @@
return YES;
}
-- (NSSize)cellSize {
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
NSSize titleSize = [[self attributedTitle] size];
NSSize buttonSize = NSMakeSize(OUTER_SIZE * maxRating, OUTER_SIZE);
NSSize size = NSZeroSize;
Modified: trunk/bibdesk/BDSKTextWithIconCell.m
===================================================================
--- trunk/bibdesk/BDSKTextWithIconCell.m 2011-12-12 07:35:27 UTC (rev
18310)
+++ trunk/bibdesk/BDSKTextWithIconCell.m 2011-12-12 17:48:35 UTC (rev
18311)
@@ -111,8 +111,8 @@
[imageCell setBackgroundStyle:style];
}
-- (NSSize)cellSize {
- NSSize cellSize = [super cellSize];
+- (NSSize)cellSizeForBounds:(NSRect)aRect {
+ NSSize cellSize = [super cellSizeForBounds:aRect];
if ([self isBordered])
cellSize.width += cellSize.height -
BORDER_BETWEEN_EDGE_AND_IMAGE_BORDERED + BORDER_BETWEEN_IMAGE_AND_TEXT_BORDERED;
else if ([self isBezeled])
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
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
