Changeset 24117

Timestamp:

06/30/2008 03:14:06 PM (5 months ago)

Author:

evands

Message:

Call super's implementation of draggingEntered:, draggingExited:, and draggedImage:endedAt:operation:. This breakage brought to you by draggable groups. Fixes drag highlights persisting after a drag ends, among other problems. Fixes #10195

Files:

• trunk/Frameworks/Adium Framework/Source/AIListOutlineView.m (modified) (7 diffs)

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

@@ -710 +710 @@
-
-        if ([[[sender draggingPasteboard] types] containsObject:@"AIListObjectUniqueIDs"]) {
+                [super draggingEntered:sender];
-                return NSDragOperationMove;
+
-        } else {
-                return [super draggingEntered:sender];
@@ -718 +720 @@
-- (void)draggingExited:(id <NSDraggingInfo>)sender
-{
+        [super draggingExited:sender];
+
-        if (NSPointInRect([sender draggingLocation], [[[self window] contentView] frame])) {
-                return;
@@ -728 +732 @@
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"AIListOutlineViewUnlockGroup"
-                                                                                                                object:[NSNumber numberWithBool:unlockingGroup]];
-        [super draggingExited:sender];
-}
-
@@ -738 +741 @@
-- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
-{
+        [super draggedImage:anImage endedAt:aPoint operation:operation];
+
-        NSArray                 *dragUniqueIDs = nil;   // Items being dragged
-        NSEnumerator    *idEnumerator = nil;    
@@ -748 +753 @@
-                //The drag was canceled
-                //If nothing is being dragged, stop now. (How would this happen? -evands)
-                [[self dataSource] outlineView:self draggedImage:anImage endedAt:aPoint operation:operation]; 
-                [self setNeedsDisplay:YES];
-                return;
-        }
@@ -786 +789 @@
-        }
-        
-
-
-
-
+
-}
-
@@ -804 +804 @@
-                NSArray *objects = [pboard propertyListForType:@"AIListObjectUniqueIDs"];
-                AIListObject *item = [[[AIObject sharedAdiumInstance] contactController] existingListObjectWithUniqueID:[objects objectAtIndex:0]];
-
+
+
-                        slideFlag = NO;
-
-
+
+
+
-        [super dragImage:anImage
-                                  at:viewLocation