Minor adjustments to bookmark folder menu button placement during button move...

chrome/browser/cocoa/bookmark_bar_folder_controller.mm

 // Copyright (c) 2010 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_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ skipping 1194 matching lines @@
   [folderController_ showWindow:self];
 }
 
 - (void)openAll:(const BookmarkNode*)node
     disposition:(WindowOpenDisposition)disposition {
   [barController_ openAll:node disposition:disposition];
 }
 
 - (void)addButtonForNode:(const BookmarkNode*)node
                  atIndex:(NSInteger)buttonIndex {
-  NSRect buttonFrame = NSMakeRect(bookmarks::kBookmarkHorizontalPadding,
-      bookmarks::kBookmarkVerticalPadding,
-      NSWidth([mainView_ frame]) - 2 * bookmarks::kBookmarkHorizontalPadding -
-              bookmarks::kScrollViewContentWidthMargin,
-              bookmarks::kBookmarkBarHeight - 2 *
-                  bookmarks::kBookmarkVerticalPadding);
+  // Propose the frame for the new button.
+  NSRect newButtonFrame = NSMakeRect(0, 0, 500, 500);  // Placeholder values.
   // When adding a button to an empty folder we must remove the 'empty'
   // placeholder button. This can be detected by checking for a parent
   // child count of 1.
   const BookmarkNode* parentNode = node->GetParent();
   if (parentNode->GetChildCount() == 1) {
     BookmarkButton* emptyButton = [buttons_ lastObject];
+    newButtonFrame = [emptyButton frame];
     [emptyButton removeFromSuperview];
     [buttons_ removeLastObject];
-  } else {
-    // Set us up to remember the last moved button's frame.
-    buttonFrame.origin.y += NSHeight([mainView_ frame]) +
-        bookmarks::kBookmarkBarHeight;
   }
 
   if (buttonIndex == -1)
     buttonIndex = [buttons_ count];
 
+  // Offset upward by one button height all buttons above insertion location.
   BookmarkButton* button = nil;  // Remember so it can be de-highlighted.
   for (NSInteger i = 0; i < buttonIndex; ++i) {
     button = [buttons_ objectAtIndex:i];
-    buttonFrame = [button frame];
-    buttonFrame.origin.y += bookmarks::kBookmarkBarHeight;
+    // Remember this location in case it's the last button being moved
+    // which is where the new button will be located.
+    newButtonFrame = [button frame];
+    NSRect buttonFrame = [button frame];
+    buttonFrame.origin.y += bookmarks::kBookmarkBarHeight +
+        bookmarks::kBookmarkVerticalPadding;
     [button setFrame:buttonFrame];
   }
   [[button cell] mouseExited:nil];  // De-highlight.
-  if (parentNode->GetChildCount() > 1)
-    buttonFrame.origin.y -= bookmarks::kBookmarkBarHeight;
   BookmarkButton* newButton = [self makeButtonForNode:node
-                                                frame:buttonFrame];
+                                                frame:newButtonFrame];
   [buttons_ insertObject:newButton atIndex:buttonIndex];
   [mainView_ addSubview:newButton];
 
   // Close any child folder(s) which may still be open.
   [self closeBookmarkFolder:self];
 
   // Prelim height of the window.  We'll trim later as needed.
   int height = [buttons_ count] * bookmarks::kBookmarkButtonHeight +
       bookmarks::kBookmarkVerticalPadding;
   [self adjustWindowForHeight:height];
@@ skipping 49 matching lines @@
     [buttons_ removeObjectAtIndex:fromIndex];
     NSRect movedFrame = [movedButton frame];
     NSPoint toOrigin = movedFrame.origin;
     [movedButton setHidden:YES];
     if (fromIndex < toIndex) {
       BookmarkButton* targetButton = [buttons_ objectAtIndex:toIndex - 1];
       toOrigin = [targetButton frame].origin;
       for (NSInteger i = fromIndex; i < toIndex; ++i) {
         BookmarkButton* button = [buttons_ objectAtIndex:i];
         NSRect frame = [button frame];
-        frame.origin.y += bookmarks::kBookmarkBarHeight;
+        frame.origin.y += bookmarks::kBookmarkBarHeight +
+            bookmarks::kBookmarkVerticalPadding;
         [button setFrameOrigin:frame.origin];
       }
     } else {
       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.y -= bookmarks::kBookmarkBarHeight;
+        buttonFrame.origin.y -= bookmarks::kBookmarkBarHeight +
+            bookmarks::kBookmarkVerticalPadding;
         [button setFrameOrigin:buttonFrame.origin];
       }
     }
     [buttons_ insertObject:movedButton atIndex:toIndex];
     [movedButton setFrameOrigin:toOrigin];
     [movedButton setHidden:NO];
   }
 }
 
 // TODO(jrg): Refactor BookmarkBarFolder common code. http://crbug.com/35966
@@ skipping 12 matching lines @@
   }
 
   [oldButton removeFromSuperview];
   if (animate && !ignoreAnimations_)
     NSShowAnimationEffect(NSAnimationEffectDisappearingItemDefault, poofPoint,
                           NSZeroSize, nil, nil, nil);
   [buttons_ removeObjectAtIndex:buttonIndex];
   for (NSInteger i = 0; i < buttonIndex; ++i) {
     BookmarkButton* button = [buttons_ objectAtIndex:i];
     NSRect buttonFrame = [button frame];
-    buttonFrame.origin.y -= bookmarks::kBookmarkBarHeight;
+    buttonFrame.origin.y -= bookmarks::kBookmarkBarHeight +
+      bookmarks::kBookmarkVerticalPadding;
     [button setFrame:buttonFrame];
   }
   // Search for and adjust submenus, if necessary.
   NSInteger buttonCount = [buttons_ count];
   if (buttonCount) {
     BookmarkButton* subButton = [folderController_ parentButton];
     for (NSInteger i = buttonIndex; i < buttonCount; ++i) {
       BookmarkButton* aButton = [buttons_ objectAtIndex:i];
       // If this button is showing its menu then we need to move the menu, too.
       if (aButton == subButton)
@@ skipping 36 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController