Revision: 3366
http://skim-app.svn.sourceforge.net/skim-app/?rev=3366&view=rev
Author: hofman
Date: 2008-01-10 06:07:22 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
Don't add tracking rects without a window.
Modified Paths:
--------------
trunk/SKFindTableView.m
trunk/SKTocOutlineView.m
Modified: trunk/SKFindTableView.m
===================================================================
--- trunk/SKFindTableView.m 2008-01-10 13:52:53 UTC (rev 3365)
+++ trunk/SKFindTableView.m 2008-01-10 14:07:22 UTC (rev 3366)
@@ -73,20 +73,22 @@
else
[self removeTrackingRects];
- NSRange rowRange = [self rowsInRect:[self visibleRect]];
- NSRange columnRange = [self columnsInRect:[self visibleRect]];
- unsigned int row, column;
- NSTableColumn *tableColumn;
- int userData;
- NSTrackingRectTag tag;
-
- for (column = columnRange.location; column < NSMaxRange(columnRange);
column++) {
- tableColumn = [[self tableColumns] objectAtIndex:column];
- for (row = rowRange.location; row < NSMaxRange(rowRange);
row++) {
- if ([[self delegate] tableView:self
shouldTrackTableColumn:tableColumn row:row]) {
- userData = row * [self numberOfColumns] + column;
- tag = [self addTrackingRect:[self frameOfCellAtColumn:column
row:row] owner:self userData:(void *)userData assumeInside:NO];
- CFArrayAppendValue(trackingRects, (const void *)tag);
+ if ([self window]) {
+ NSRange rowRange = [self rowsInRect:[self visibleRect]];
+ NSRange columnRange = [self columnsInRect:[self visibleRect]];
+ unsigned int row, column;
+ NSTableColumn *tableColumn;
+ int userData;
+ NSTrackingRectTag tag;
+
+ for (column = columnRange.location; column < NSMaxRange(columnRange);
column++) {
+ tableColumn = [[self tableColumns] objectAtIndex:column];
+ for (row = rowRange.location; row < NSMaxRange(rowRange); row++) {
+ if ([[self delegate] tableView:self
shouldTrackTableColumn:tableColumn row:row]) {
+ userData = row * [self numberOfColumns] + column;
+ tag = [self addTrackingRect:[self
frameOfCellAtColumn:column row:row] owner:self userData:(void *)userData
assumeInside:NO];
+ CFArrayAppendValue(trackingRects, (const void *)tag);
+ }
}
}
}
Modified: trunk/SKTocOutlineView.m
===================================================================
--- trunk/SKTocOutlineView.m 2008-01-10 13:52:53 UTC (rev 3365)
+++ trunk/SKTocOutlineView.m 2008-01-10 14:07:22 UTC (rev 3366)
@@ -130,20 +130,22 @@
else
[self removeTrackingRects];
- NSRange rowRange = [self rowsInRect:[self visibleRect]];
- NSRange columnRange = [self columnsInRect:[self visibleRect]];
- unsigned int row, column;
- NSTableColumn *tableColumn;
- int userData;
- NSTrackingRectTag tag;
-
- for (column = columnRange.location; column < NSMaxRange(columnRange);
column++) {
- tableColumn = [[self tableColumns] objectAtIndex:column];
- for (row = rowRange.location; row < NSMaxRange(rowRange);
row++) {
- if ([[self delegate] outlineView:self
shouldTrackTableColumn:tableColumn item:[self itemAtRow:row]]) {
- userData = row * [self numberOfColumns] + column;
- tag = [self addTrackingRect:[self frameOfCellAtColumn:column
row:row] owner:self userData:(void *)userData assumeInside:NO];
- CFArrayAppendValue(trackingRects, (const void *)tag);
+ if ([self window]) {
+ NSRange rowRange = [self rowsInRect:[self visibleRect]];
+ NSRange columnRange = [self columnsInRect:[self visibleRect]];
+ unsigned int row, column;
+ NSTableColumn *tableColumn;
+ int userData;
+ NSTrackingRectTag tag;
+
+ for (column = columnRange.location; column < NSMaxRange(columnRange);
column++) {
+ tableColumn = [[self tableColumns] objectAtIndex:column];
+ for (row = rowRange.location; row < NSMaxRange(rowRange); row++) {
+ if ([[self delegate] outlineView:self
shouldTrackTableColumn:tableColumn item:[self itemAtRow:row]]) {
+ userData = row * [self numberOfColumns] + column;
+ tag = [self addTrackingRect:[self
frameOfCellAtColumn:column row:row] owner:self userData:(void *)userData
assumeInside:NO];
+ CFArrayAppendValue(trackingRects, (const void *)tag);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
