Changeset 24110

Timestamp:

06/30/2008 11:13:06 AM (6 months ago)

Author:

evands

Message:

Greatly improved the appearance of the between-row drop targeter in the contact list. Credit to Cathy Shive's "Styling an NSTableView" sample code for the starting point.

Files:

• trunk/Frameworks/Adium Framework/Source/AIListOutlineView.h (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIListOutlineView.m (modified) (4 diffs)

trunk/Frameworks/Adium Framework/Source/AIListOutlineView.h

@@ -104 +104 @@
-- (NSCell *)outlineViewDataCellForGroup:(NSOutlineView *)outlineView;
-@end
-
-

trunk/Frameworks/Adium Framework/Source/AIListOutlineView.m

@@ -552 +552 @@
-
-#pragma mark Drag & Drop Drawing
+/* The drop highlight hackery below was heavily inspired by Cathy Shive's "Styling an NSTableView" sample code at http://katidev.com/blog/tag/nstableview/
+ * which is distributed under the following license:
+ *
+ * Copyright (c) 2008 Cathy Shive
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this code to reuse the code without restriction, subject to the following conditions:
+ * 
+ * My name may not be used to endorse or promote products derived from this software without prior written permission from me.
+ * 
+ * THIS CODE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND. In other words, you agree not to sue me if anything goes wrong.
+ */
+
-/*!
- * @brief Called by NSOutineView to draw a drop highight
@@ -586 +599 @@
-}
-
+/*!
+ * @brief Draw the line between two rows during a drag
+ */
+- (void)performDrawDropHighlightBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atOffset:(float)theOffset
+{       
+        NSRect  aHighlightRect;
+        float   aYPosition = 0;
+        int             indentationLevelRow;
+
+        if (theUpperRowIndex < 0) {
+                //If the lower row index is the first row, get the rect of the lowerRowIndex and draw above it
+                indentationLevelRow = theLowerRowIndex;
+                aHighlightRect = [self rectOfRow:theLowerRowIndex];
+                aYPosition = NSMinY(aHighlightRect);
+
+        } else {
+                //In all other cases draw below theUpperRowIndex. However, we'll be dropping at the indentation level of the one below.
+                indentationLevelRow = theUpperRowIndex + 1;
+                aHighlightRect = [self rectOfRow:theUpperRowIndex];
+                aYPosition = NSMinY(aHighlightRect) + NSHeight(aHighlightRect);
+        }
+
+        
+        id item = [self itemAtRow:indentationLevelRow];
+        AIListCell *cell = [self cellForTableColumn:nil item:item];
+        
+        [[self delegate] outlineView:self
+                                 willDisplayCell:cell 
+                                  forTableColumn:nil
+                                                        item:item];
+
+        switch ([cell textAlignment]) {
+                case NSRightTextAlignment:
+                        //Right alignment indents on the right
+                        aHighlightRect.size.width -= [cell indentation];
+                        break;
+                default:
+                        //All other alignments indent on the left
+                        aHighlightRect.origin.x += [cell indentation];
+                        aHighlightRect.size.width -= [cell indentation];
+                        break;
+        }
+
+        //Accent rect will be where we draw the little circle
+        float   anAccentRectSize = 6;
+        float   anAccentRectXOffset = 2;
+        NSRect  anAccentRect = NSMakeRect(NSMinX(aHighlightRect) + anAccentRectXOffset,
+                                                                          aYPosition - anAccentRectSize*.5,
+                                                                          anAccentRectSize,
+                                                                          anAccentRectSize);
+        
+        //Make points to define the line starting after the accent circle, extending the width of the row
+        NSPoint aStartPoint = NSMakePoint(NSMaxX(anAccentRect), aYPosition);
+        NSPoint anEndPoint = NSMakePoint(NSMaxX(aHighlightRect) - NSWidth(anAccentRect), aYPosition);
+        
+        //Lock focus for drawing
+        [self lockFocus];
+        
+        //Make a bezier path, add the circle and line
+        NSBezierPath *aHighlightPath = [NSBezierPath bezierPath];
+        [aHighlightPath appendBezierPathWithOvalInRect:anAccentRect];
+        [aHighlightPath moveToPoint:aStartPoint];
+        [aHighlightPath lineToPoint:anEndPoint];
+        
+        //Fill with white for the accent circle and stroke the path with black
+        [[NSColor whiteColor] set];
+        [aHighlightPath fill];
+        [aHighlightPath setLineWidth:2.0];
+        [[NSColor blackColor] set];
+        [aHighlightPath stroke];
+        
+        //Unlock focus
+        [self unlockFocus];
+}
+
+/*!
+ * @brief Private NSOutlineView method called in 10.5 to draw the line between rows during a drag&drop operation
+ */
+- (void)_drawDropHighlightBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex onRow:(int)theRow atOffset:(float)theOffset
+{
+        [self performDrawDropHighlightBetweenUpperRow:theUpperRowIndex
+                                                                          andLowerRow:theLowerRowIndex
+                                                                                 atOffset:theOffset];
+}
+
+/*!
+ * @brief Private NSOutlineView method called in 10.4 to draw the line between rows during a drag&drop operation
+ */
+- (void) _drawDropHighlightBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atOffset:(float)theOffset
+{
+        [self performDrawDropHighlightBetweenUpperRow:theUpperRowIndex
+                                                                          andLowerRow:theLowerRowIndex
+                                                                                 atOffset:theOffset];
+}
+
-#pragma mark Attach & Detach Groups
-
@@ -637 +745 @@
-        AIListGroup             *currentGroup = nil;    // Current group being dragged
-        
-
-
-
+
+
+
+
+
-                return;
-
-
-
-
+
-
-        id<AIInterfaceController>               interfaceController = [[AIObject sharedAdiumInstance] interfaceController];
@@ -681 +788 @@
-        dragContent = nil;
-        
+        [self setNeedsDisplay:YES];
-        [[self dataSource] outlineView:self draggedImage:anImage endedAt:aPoint operation:operation]; 
-}