Revision: 5525
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5525&view=rev
Author:   hofman
Date:     2009-08-09 13:52:56 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
move cell tracking rect handling from SKFindTableView to SKTableView

Modified Paths:
--------------
    trunk/SKFindTableView.h
    trunk/SKFindTableView.m
    trunk/SKTableView.h
    trunk/SKTableView.m

Modified: trunk/SKFindTableView.h
===================================================================
--- trunk/SKFindTableView.h     2009-08-09 13:51:44 UTC (rev 5524)
+++ trunk/SKFindTableView.h     2009-08-09 13:52:56 UTC (rev 5525)
@@ -37,18 +37,8 @@
  */
 
 #import <Cocoa/Cocoa.h>
-#import <Carbon/Carbon.h>
 #import "SKTableView.h"
 
 
-...@interface SKFindTableView : SKTableView {
-    CFMutableArrayRef trackingRects;
-}
+...@interface SKFindTableView : SKTableView
 @end
-
-
-...@interface NSObject (SKFindTableViewDelegate)
-- (BOOL)tableView:(NSTableView *)aTableView 
shouldTrackTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
-- (void)tableView:(NSTableView *)aTableView 
mouseEnteredTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
-- (void)tableView:(NSTableView *)aTableView 
mouseExitedTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
-...@end

Modified: trunk/SKFindTableView.m
===================================================================
--- trunk/SKFindTableView.m     2009-08-09 13:51:44 UTC (rev 5524)
+++ trunk/SKFindTableView.m     2009-08-09 13:52:56 UTC (rev 5525)
@@ -43,101 +43,4 @@
 
 + (BOOL)usesDefaultFontSize { return YES; }
 
-- (void)dealloc{
-    if (trackingRects != NULL)
-        CFRelease(trackingRects);
-    [super dealloc];
-}
-
-- (void)removeTrackingRects {
-    if (trackingRects) {
-        CFIndex idx = CFArrayGetCount(trackingRects);
-        while(idx--)
-            [self 
removeTrackingRect:(NSTrackingRectTag)CFArrayGetValueAtIndex(trackingRects, 
idx)];
-        CFArrayRemoveAllValues(trackingRects);
-    }
-}
-
-- (void)rebuildTrackingRects {
-    if ([[self delegate] 
respondsToSelector:@selector(tableView:shouldTrackTableColumn:row:)] == NO)
-        return;
-    
-    if (trackingRects == nil)
-        trackingRects = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
-    else
-        [self removeTrackingRects];
-    
-    if ([self window]) {
-        NSRange rowRange = [self rowsInRect:[self visibleRect]];
-        NSRange columnRange = [self columnsInRect:[self visibleRect]];
-        NSUInteger row, column;
-        NSTableColumn *tableColumn;
-        NSInteger 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);
-                }
-            }
-        }
-    }
-}
-
-- (void)reloadData{
-    [super reloadData];
-       [self rebuildTrackingRects];
-}
-
-- (void)resetCursorRects {
-       [super resetCursorRects];
-    [self rebuildTrackingRects];
-}
-
-- (void)setDataSource:(id)anObject {
-       [super setDataSource:anObject];
-       [self rebuildTrackingRects];
-}
-
-- (void)noteNumberOfRowsChanged {
-       [super noteNumberOfRowsChanged];
-       [self rebuildTrackingRects];
-}
-
-- (void)viewWillMoveToWindow:(NSWindow *)newWindow {
-    if ([self window])
-        [self removeTrackingRects];
-}
-
-- (void)viewDidMoveToWindow {
-       if ([self window])
-        [self rebuildTrackingRects];
-}
-
-- (void)mouseEntered:(NSEvent *)theEvent{
-    if ([[self delegate] 
respondsToSelector:@selector(tableView:mouseEnteredTableColumn:row:)]) {
-        NSInteger userData = (NSInteger)[theEvent userData];
-        NSInteger numCols = [self numberOfColumns];
-               NSInteger column = userData % numCols;
-               NSInteger row = userData / numCols;
-        NSTableColumn *tableColumn = [[self tableColumns] 
objectAtIndex:column];
-        [[self delegate] tableView:self mouseEnteredTableColumn:tableColumn 
row:row];
-       }
-}
-
-- (void)mouseExited:(NSEvent *)theEvent{
-    if ([[self delegate] 
respondsToSelector:@selector(tableView:mouseExitedTableColumn:row:)]) {
-        NSInteger userData = (NSInteger)[theEvent userData];
-        NSInteger numCols = [self numberOfColumns];
-               NSInteger column = userData % numCols;
-               NSInteger row = userData / numCols;
-        NSTableColumn *tableColumn = [[self tableColumns] 
objectAtIndex:column];
-        [[self delegate] tableView:self mouseExitedTableColumn:tableColumn 
row:row];
-       }
-}
-
 @end

Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h 2009-08-09 13:51:44 UTC (rev 5524)
+++ trunk/SKTableView.h 2009-08-09 13:52:56 UTC (rev 5525)
@@ -41,6 +41,7 @@
 @class SKTypeSelectHelper;
 
 @interface SKTableView : NSTableView {
+    CFMutableArrayRef trackingRects;
     SKTypeSelectHelper *typeSelectHelper;
 }
 
@@ -77,6 +78,10 @@
 
 - (NSMenu *)tableView:(NSTableView *)aTableView 
menuForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;
 
+- (BOOL)tableView:(NSTableView *)aTableView 
shouldTrackTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;
+- (void)tableView:(NSTableView *)aTableView 
mouseEnteredTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;
+- (void)tableView:(NSTableView *)aTableView 
mouseExitedTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;
+
 - (NSArray *)tableView:(NSTableView *)aTableView 
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)aTypeSelectHelper;
 - (void)tableView:(NSTableView *)aTableView 
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper 
didFailToFindMatchForSearchString:(NSString *)searchString;
 - (void)tableView:(NSTableView *)aTableView 
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper 
updateSearchString:(NSString *)searchString;

Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2009-08-09 13:51:44 UTC (rev 5524)
+++ trunk/SKTableView.m 2009-08-09 13:52:56 UTC (rev 5525)
@@ -46,6 +46,11 @@
 static char SKTableViewDefaultsObservationContext;
 
 
+...@interface SKTableView (SKPrivate)
+- (void)rebuildTrackingRects;
+...@end
+
+
 @implementation SKTableView
 
 + (BOOL)usesDefaultFontSize { return NO; }
@@ -55,6 +60,8 @@
         @try { [[NSUserDefaultsController sharedUserDefaultsController] 
removeObserver:self forKey:SKTableFontSizeKey]; }
         @catch (id e) {}
     }
+    if (trackingRects != NULL)
+        CFRelease(trackingRects);
     [typeSelectHelper setDataSource:nil];
     [typeSelectHelper release];
     [super dealloc];
@@ -96,6 +103,7 @@
 
 - (void)reloadData {
     [super reloadData];
+       [self rebuildTrackingRects];
     [typeSelectHelper rebuildTypeSelectSearchCache];
 }
 
@@ -235,6 +243,94 @@
     [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet 
indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
 }
 
+#pragma mark Tracking
+
+- (void)removeTrackingRects {
+    if (trackingRects) {
+        CFIndex idx = CFArrayGetCount(trackingRects);
+        while(idx--)
+            [self 
removeTrackingRect:(NSTrackingRectTag)CFArrayGetValueAtIndex(trackingRects, 
idx)];
+        CFArrayRemoveAllValues(trackingRects);
+    }
+}
+
+- (void)rebuildTrackingRects {
+    if ([[self delegate] 
respondsToSelector:@selector(tableView:shouldTrackTableColumn:row:)] == NO)
+        return;
+    
+    if (trackingRects == nil)
+        trackingRects = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
+    else
+        [self removeTrackingRects];
+    
+    if ([self window]) {
+        NSRange rowRange = [self rowsInRect:[self visibleRect]];
+        NSRange columnRange = [self columnsInRect:[self visibleRect]];
+        NSUInteger row, column;
+        NSTableColumn *tableColumn;
+        NSInteger 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);
+                }
+            }
+        }
+    }
+}
+
+- (void)resetCursorRects {
+       [super resetCursorRects];
+    [self rebuildTrackingRects];
+}
+
+- (void)setDataSource:(id)anObject {
+       [super setDataSource:anObject];
+       [self rebuildTrackingRects];
+}
+
+- (void)noteNumberOfRowsChanged {
+       [super noteNumberOfRowsChanged];
+       [self rebuildTrackingRects];
+}
+
+- (void)viewWillMoveToWindow:(NSWindow *)newWindow {
+    if ([self window])
+        [self removeTrackingRects];
+}
+
+- (void)viewDidMoveToWindow {
+       if ([self window])
+        [self rebuildTrackingRects];
+}
+
+- (void)mouseEntered:(NSEvent *)theEvent{
+    if ([[self delegate] 
respondsToSelector:@selector(tableView:mouseEnteredTableColumn:row:)]) {
+        NSInteger userData = (NSInteger)[theEvent userData];
+        NSInteger numCols = [self numberOfColumns];
+               NSInteger column = userData % numCols;
+               NSInteger row = userData / numCols;
+        NSTableColumn *tableColumn = [[self tableColumns] 
objectAtIndex:column];
+        [[self delegate] tableView:self mouseEnteredTableColumn:tableColumn 
row:row];
+       }
+}
+
+- (void)mouseExited:(NSEvent *)theEvent{
+    if ([[self delegate] 
respondsToSelector:@selector(tableView:mouseExitedTableColumn:row:)]) {
+        NSInteger userData = (NSInteger)[theEvent userData];
+        NSInteger numCols = [self numberOfColumns];
+               NSInteger column = userData % numCols;
+               NSInteger row = userData / numCols;
+        NSTableColumn *tableColumn = [[self tableColumns] 
objectAtIndex:column];
+        [[self delegate] tableView:self mouseExitedTableColumn:tableColumn 
row:row];
+       }
+}
+
 #pragma mark SKTypeSelectHelper datasource protocol
 
 - (NSArray *)typeSelectHelperSelectionItems:(SKTypeSelectHelper 
*)aTypeSelectHelper {


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

Reply via email to