Make dropped tabs animate from where they were dropped. Make room for the ful...

chrome/browser/cocoa/tab_strip_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/tab_strip_controller.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 78 matching lines @@
 }
 @end
 
 @interface TabStripController(Private)
 - (void)installTrackingArea;
 - (void)addSubviewToPermanentList:(NSView*)aView;
 - (void)regenerateSubviewList;
 - (NSInteger)indexForContentsView:(NSView*)view;
 - (void)updateFavIconForContents:(TabContents*)contents
                          atIndex:(NSInteger)index;
+- (void)layoutTabsWithAnimation:(BOOL)animate
+             regenerateSubviews:(BOOL)doUpdate;
 @end
 
 @implementation TabStripController
 
 - (id)initWithView:(TabStripView*)view
         switchView:(NSView*)switchView
            browser:(Browser*)browser {
   DCHECK(view && switchView && browser);
   if ((self = [super init])) {
     tabView_.reset([view retain]);
@@ skipping 220 matching lines @@
   int index = [self indexForTabView:[controller view]];
   return tabModel_->IsContextMenuCommandEnabled(index, command) ? YES : NO;
 }
 
 - (void)insertPlaceholderForTab:(TabView*)tab
                           frame:(NSRect)frame
                   yStretchiness:(CGFloat)yStretchiness {
   placeholderTab_ = tab;
   placeholderFrame_ = frame;
   placeholderStretchiness_ = yStretchiness;
-  [self layoutTabs];
+  [self layoutTabsWithAnimation:YES regenerateSubviews:NO];
 }
 
 - (BOOL)isTabFullyVisible:(TabView*)tab {
   NSRect frame = [tab frame];
   return NSMinX(frame) >= kIndentLeavingSpaceForControls &&
       NSMaxX(frame) <= NSMaxX([tabView_ frame]);
 }
 
 - (void)showNewTabButton:(BOOL)show {
   forceNewTabButtonHidden_ = show ? NO : YES;
@@ skipping 51 matching lines @@
   const float baseTabWidth =
       MAX(MIN(availableWidth / [tabContentsArray_ count],
               kMaxTabWidth),
           kMinTabWidth);
 
   CGFloat minX = NSMinX(placeholderFrame_);
   BOOL visible = [[tabView_ window] isVisible];
 
   float offset = kIndentLeavingSpaceForControls;
   NSUInteger i = 0;
-  NSInteger gap = -1;
+  bool hasPlaceholderGap = false;
   for (TabController* tab in tabArray_.get()) {
     BOOL isPlaceholder = [[tab view] isEqual:placeholderTab_];
     NSRect tabFrame = [[tab view] frame];
     tabFrame.size.height = [[self class] defaultTabHeight] + 1;
     tabFrame.origin.y = 0;
     tabFrame.origin.x = offset;
 
     // If the tab is hidden, we consider it a new tab. We make it visible
     // and animate it in.
     BOOL newTab = [[tab view] isHidden];
@@ skipping 14 matching lines @@
       [NSAnimationContext endGrouping];
 
       // Store the frame by identifier to aviod redundant calls to animator.
       NSValue* identifier = [NSValue valueWithPointer:[tab view]];
       [targetFrames_ setObject:[NSValue valueWithRect:tabFrame]
                         forKey:identifier];
       continue;
     } else {
       // If our left edge is to the left of the placeholder's left, but our mid
       // is to the right of it we should slide over to make space for it.
-      if (placeholderTab_ && gap < 0 && NSMidX(tabFrame) > minX) {
-        gap = i;
-        offset += NSWidth(tabFrame);
+      if (placeholderTab_ && !hasPlaceholderGap && NSMidX(tabFrame) > minX) {
+        hasPlaceholderGap = true;
+        offset += NSWidth(placeholderFrame_);
         offset -= kTabOverlap;
         tabFrame.origin.x = offset;
       }
 
       // Set the width. Selected tabs are slightly wider when things get
       // really small and thus we enforce a different minimum width.
       tabFrame.size.width =
           [tab selected] ? MAX(baseTabWidth, kMinSelectedTabWidth) :
                            baseTabWidth;
 
-      // Animate a new tab in by putting it below the horizon.
+      // Animate a new tab in by putting it below the horizon unless
+      // told to put it in a specific location (ie, from a drop).
       if (newTab && visible && animate) {
-        [[tab view] setFrame:NSOffsetRect(tabFrame, 0, -NSHeight(tabFrame))];
+        if (NSEqualRects(droppedTabFrame_, NSZeroRect)) {
+          [[tab view] setFrame:NSOffsetRect(tabFrame, 0, -NSHeight(tabFrame))];
+        } else {
+          [[tab view] setFrame:droppedTabFrame_];
+          droppedTabFrame_ = NSZeroRect;
+        }
       }
 
       // Check the frame by identifier to avoid redundant calls to animator.
       id frameTarget = visible && animate ? [[tab view] animator] : [tab view];
       NSValue* identifier = [NSValue valueWithPointer:[tab view]];
       NSValue* oldTargetValue = [targetFrames_ objectForKey:identifier];
       if (!oldTargetValue ||
           !NSEqualRects([oldTargetValue rectValue], tabFrame)) {
         [frameTarget setFrame:tabFrame];
         [targetFrames_ setObject:[NSValue valueWithRect:tabFrame]
@@ skipping 379 matching lines @@
 // Move the given tab at index |from| in this window to the location of the
 // current placeholder.
 - (void)moveTabFromIndex:(NSInteger)from {
   int toIndex = [self indexOfPlaceholder];
   tabModel_->MoveTabContentsAt(from, toIndex, true);
 }
 
 // Drop a given TabContents at the location of the current placeholder. If there
 // is no placeholder, it will go at the end. Used when dragging from another
 // window when we don't have access to the TabContents as part of our strip.
-- (void)dropTabContents:(TabContents*)contents {
+// |frame| is in the coordinate system of the tab strip view and represents
+// where the user dropped the new tab so it can be animated into its correct
+// location when the tab is added to the model.
+- (void)dropTabContents:(TabContents*)contents withFrame:(NSRect)frame {
   int index = [self indexOfPlaceholder];
 
+  // Mark that the new tab being created should start at |frame|. It will be
+  // reset as soon as the tab has been positioned.
+  droppedTabFrame_ = frame;
+
   // Insert it into this tab strip. We want it in the foreground and to not
   // inherit the current tab's group.
   tabModel_->InsertTabContentsAt(index, contents, true, false);
 }
 
 // Called when the tab strip view changes size. As we only registered for
 // changes on our view, we know it's only for our view. Layout w/out
 // animations since they are blocked by the resize nested runloop. We need
 // the views to adjust immediately. Neither the tabs nor their z-order are
 // changed, so we don't need to update the subviews.
@@ skipping 134 matching lines @@
   BrowserWindowController* controller =
       (BrowserWindowController*)[[switchView_ window] windowController];
   DCHECK(index >= 0);
   if (index >= 0) {
     [controller setTab:[self viewAtIndex:index] isDraggable:YES];
   }
 }
 
 
 @end