Changeset 24425

Timestamp:

07/18/2008 01:53:28 PM (6 months ago)

Author:

evands

Message:

A drop just below a metacontact will appear to be in the group (and should be). In 10.4, however, this incorrectly targets the bottommost index of the metacontact. Adjust to fit reality accordingly. Fixes #10255, finally.

Files:

• trunk/Source/AIListController.m (modified) (4 diffs)

trunk/Source/AIListController.m

@@ -592 +592 @@
-                                                 [[outlineView dataSource] outlineView:outlineView numberOfChildrenOfItem:itemAboveProposedIndex] :
-                                                 NSOutlineViewDropOnItemIndex);
-
-                                [outlineView setDropItem:itemAboveProposedIndex
-                                                  dropChildIndex:index];
@@ -610 +609 @@
-                                         * This should retarget to combine the dragged contact with the metacontact.
-                                         */
-
+
+
-                                }
-
@@ -635 +635 @@
-                                         */
-                                        [outlineView setDropItem:item dropChildIndex:indexForInserting];
+                                } else {
+                                        /* A drop just below a metacontact will appear to be in the group (and should be).
+                                         * Adjust to fit reality accordingly.
+                                         */
+                                        if (item && [item isKindOfClass:[AIMetaContact class]]) {
+                                                BOOL isExpanded = [outlineView isItemExpanded:item];
+                                                if ((isExpanded && (index == [[outlineView dataSource] outlineView:outlineView
+                                                                                                                                        numberOfChildrenOfItem:item])) ||
+                                                        (!isExpanded && (index != NSOutlineViewDropOnItemIndex))) {
+                                                        [outlineView setDropItem:[item containingObject]
+                                                                          dropChildIndex:([[item containingObject] indexOfObject:item] + 1)];
+                                                }
+                                        }
-                                }
-                        }
@@ -680 +693 @@
-        NSPasteboard *draggingPasteboard = [info draggingPasteboard];
-        NSString        *availableType;
-
+
-    if ((availableType = [draggingPasteboard availableTypeFromArray:[NSArray arrayWithObject:@"AIListObject"]])) {
-                //Kill the selection now, (in a more finder-esque way)