Not meant to be reviewed or checked in: bookmark bar dragging 06/14/2010

chrome/browser/cocoa/bookmark_bar_controller.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 414 matching lines @@
   if (node->is_folder())
     return folderImage_;
 
   const SkBitmap& favIcon = bookmarkModel_->GetFavIcon(node);
   if (!favIcon.isNull())
     return gfx::SkBitmapToNSImage(favIcon);
 
   return defaultImage_;
 }
 
+- (void)performPeriodicDraggingUpdates:(id<NSDraggingInfo>)info {
+  NSLog(@"performPeriodicDraggingUpdates Ran!");
+  // Get the button being dragged from the pasteboard
+  NSData* data = [[info draggingPasteboard] 
+                  dataForType:kBookmarkButtonDragType];
+
+  if (data && [info draggingSource]) {
+    BookmarkButton* sourceButton = nil;
+    [data getBytes:&sourceButton length:sizeof(sourceButton)];
+
+    NSRect dragButtonFrame = [sourceButton frame];
+
+    // Get the offset amount that other buttons will be moved
+    CGFloat xOffset = 
+      NSWidth(dragButtonFrame) + bookmarks::kBookmarkHorizontalPadding;
+
+    // Get the current point the mouse located at during the drag
+    NSPoint point = [info draggingLocation];
+
+    NSArray* array = buttons_.get();
+    NSUInteger startIndex = [array indexOfObject:sourceButton];
+
+    for (BookmarkButton* button in array) {
+      NSRect buttonFrame = [button frame];
+      NSUInteger endIndex = [array indexOfObject:button];
+      if (NSMinX(buttonFrame) < point.x && NSMaxX(buttonFrame) > point.x) {
+        if (endIndex < startIndex && NSMidX(buttonFrame) > point.x) {
+          buttonFrame.origin.x += xOffset;
+          [button setFrame:buttonFrame];
+        } else if (startIndex < endIndex && NSMidX(buttonFrame) < point.x) {
+          buttonFrame.origin.x -= xOffset;
+          [button setFrame:buttonFrame];
+        }
+      }
+    }
+  }
+}
+
 - (void)closeFolderAndStopTrackingMenus {
   showFolderMenus_ = NO;
   [self closeAllBookmarkFolders];
 }
 
 #pragma mark Actions
 
 - (IBAction)openBookmark:(id)sender {
   [self closeFolderAndStopTrackingMenus];
   DCHECK([sender respondsToSelector:@selector(bookmarkNode)]);
@@ skipping 1763 matching lines @@
   if (fromIndex != toIndex) {
     NSInteger buttonCount = (NSInteger)[buttons_ count];
     if (toIndex == -1)
       toIndex = buttonCount;
     // See if we have a simple move within the bar, which will be the case if
     // both button indexes are in the visible space.
     if (fromIndex < buttonCount && toIndex < buttonCount) {
       BookmarkButton* movedButton = [buttons_ objectAtIndex:fromIndex];
       NSRect movedFrame = [movedButton frame];
       NSPoint toOrigin = movedFrame.origin;
-      CGFloat xOffset =
-          NSWidth(movedFrame) + bookmarks::kBookmarkHorizontalPadding;
       // Hide the button to reduce flickering while drawing the window.
       [movedButton setHidden:YES];
       [buttons_ removeObjectAtIndex:fromIndex];
       if (fromIndex < toIndex) {
         // Move the button from left to right within the bar.
         BookmarkButton* targetButton = [buttons_ objectAtIndex:toIndex - 1];
         NSRect toFrame = [targetButton frame];
-        toOrigin.x = toFrame.origin.x - NSWidth(movedFrame) + NSWidth(toFrame);
-        for (NSInteger i = fromIndex; i < toIndex; ++i) {
-          BookmarkButton* button = [buttons_ objectAtIndex:i];
-          NSRect frame = [button frame];
-          frame.origin.x -= xOffset;
-          [button setFrameOrigin:frame.origin];
-        }
+        toOrigin.x = toFrame.origin.x + NSWidth(toFrame);
       } else {
         // Move the button from right to left within the bar.
         BookmarkButton* targetButton = [buttons_ objectAtIndex:toIndex];
-        toOrigin = [targetButton frame].origin;
-        for (NSInteger i = fromIndex - 1; i >= toIndex; --i) {
-          BookmarkButton* button = [buttons_ objectAtIndex:i];
-          NSRect buttonFrame = [button frame];
-          buttonFrame.origin.x += xOffset;
-          [button setFrameOrigin:buttonFrame.origin];
-        }
+        NSRect toFrame = [targetButton frame];
+        toOrigin.x = toFrame.origin.x - NSWidth(movedFrame);
       }
       [buttons_ insertObject:movedButton atIndex:toIndex];
       [movedButton setFrameOrigin:toOrigin];
       [movedButton setHidden:NO];
     } else if (fromIndex < buttonCount) {
       // A button is being removed from the bar and added to off-the-side.
       // By now the node has already been inserted into the model so the
       // button to be added is represented by |toIndex|. Things get
       // complicated because the off-the-side is showing and must be redrawn
       // while possibly re-laying out the bookmark bar.
@@ skipping 84 matching lines @@
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end