P4b.

chrome/browser/cocoa/tab_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.
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #import "chrome/browser/cocoa/menu_controller.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_controller_target.h"
 #import "chrome/browser/cocoa/tab_view.h"
@@ skipping 106 matching lines @@
   // Remember the icon's frame, so that if the icon is ever removed, a new
   // one can later replace it in the proper location.
   originalIconFrame_ = [iconView_ frame];
 
   // When the icon is removed, the title expands to the left to fill the space
   // left by the icon.  When the close button is removed, the title expands to
   // the right to fill its space.  These are the amounts to expand and contract
   // titleView_ under those conditions.
   NSRect titleFrame = [titleView_ frame];
   iconTitleXOffset_ = NSMinX(titleFrame) - NSMinX(originalIconFrame_);
-  titleCloseWidthOffset_ = NSMaxX([closeButton_ frame]) - NSMaxX(titleFrame);
+  titleCloseWidthOffset_ = NSMinX(originalIconFrame_) - NSMinX([closeButton_ frame]);
 
   [self internalSetSelected:selected_];
 }
 
 // Called when Cocoa wants to display the context menu. Lazily instantiate
 // the menu based off of the cross-platform model. Re-create the menu and
 // model every time to get the correct labels and enabling.
 - (NSMenu*)menu {
   contextMenuDelegate_.reset(
       new TabControllerInternal::MenuDelegate(target_, self));
@@ skipping 26 matching lines @@
     [self internalSetSelected:selected];
 }
 
 - (BOOL)selected {
   return selected_;
 }
 
 - (void)setIconView:(NSView*)iconView {
   [iconView_ removeFromSuperview];
   iconView_ = iconView;
+
+
+NSLog(@"original frame: %@", NSStringFromRect(originalIconFrame_));
   [iconView_ setFrame:originalIconFrame_];
 
   // Ensure that the icon is suppressed if no icon is set or if the tab is too
   // narrow to display one.
   [self updateVisibility];
 
   if (iconView_)
     [[self view] addSubview:iconView_];
 }
 
 - (NSView*)iconView {
   return iconView_;
 }
 
 - (NSString*)toolTip {
   return [[self view] toolTip];
 }
 
 // Return a rough approximation of the number of icons we could fit in the
 // tab. We never actually do this, but it's a helpful guide for determining
 // how much space we have available.
 - (int)iconCapacity {
-  CGFloat width = NSMaxX([closeButton_ frame]) - NSMinX(originalIconFrame_);
+  CGFloat width = NSMaxX([titleView_ frame]) - NSMinX([closeButton_ frame]);
   CGFloat iconWidth = NSWidth(originalIconFrame_);
 
   return width / iconWidth;
 }
 
 // Returns YES if we should show the icon. When tabs get too small, we clip
 // the favicon before the close button for selected tabs, and prefer the
 // favicon for unselected tabs.  The icon can also be suppressed more directly
 // by clearing iconView_.
 - (BOOL)shouldShowIcon {
@@ skipping 28 matching lines @@
   isIconShowing_ = newShowIcon;
 
   // If the tab is pinned, hide the title.
   [titleView_ setHidden:[self pinned]];
 
   BOOL oldShowCloseButton = [closeButton_ isHidden] ? NO : YES;
   BOOL newShowCloseButton = [self shouldShowCloseButton] ? YES : NO;
 
   [closeButton_ setHidden:newShowCloseButton ? NO : YES];
 
-  // Adjust the title view based on changes to the icon's and close button's
-  // visibility.
-  NSRect titleFrame = [titleView_ frame];
+  CGFloat overlap = NSMinX([closeButton_ frame]);
+  CGFloat availWidth = NSWidth([[self view] frame]) - 2*overlap;
+
+  if (oldShowCloseButton != newShowCloseButton) {
+    // Adjust the left edge of the title view according to the presence or
+    // absence of the close button.
+    if (newShowCloseButton) {
+      //availWidth -= titleCloseWidthOffset_;
+      
+//      titleFrame.origin.x += titleCloseWidthOffset_;
+//      titleFrame.size.width -= titleCloseWidthOffset_;
+    } else {
+//      titleFrame.origin.x -= titleCloseWidthOffset_;
+//      titleFrame.size.width += titleCloseWidthOffset_;
+    }
+
+//    if (newShowCloseButton) {
+//      originalIconFrame_.origin.x += titleCloseWidthOffset_;
+//    } else {
+//      originalIconFrame_.origin.x -= titleCloseWidthOffset_;
+//    }
+//    [iconView_ setFrame:originalIconFrame_];
+  }
 
   if (oldShowIcon != newShowIcon) {
     // Adjust the left edge of the title view according to the presence or
     // absence of the icon view.
 
     if (newShowIcon) {
-      titleFrame.origin.x += iconTitleXOffset_;
-      titleFrame.size.width -= iconTitleXOffset_;
+      //availWidth -= iconTitleXOffset_;
+//      titleFrame.origin.x += iconTitleXOffset_;
+//      titleFrame.size.width -= iconTitleXOffset_;
     } else {
-      titleFrame.origin.x -= iconTitleXOffset_;
-      titleFrame.size.width += iconTitleXOffset_;
+//      titleFrame.origin.x -= iconTitleXOffset_;
+//      titleFrame.size.width += iconTitleXOffset_;
     }
   }
 
-  if (oldShowCloseButton != newShowCloseButton) {
-    // Adjust the right edge of the title view according to the presence or
-    // absence of the close button.
-    if (newShowCloseButton)
-      titleFrame.size.width -= titleCloseWidthOffset_;
-    else
-      titleFrame.size.width += titleCloseWidthOffset_;
+
+  // Adjust the title view based on changes to the icon's and close button's
+  // visibility.
+  [titleView_ sizeToFit];
+  NSRect titleFrame = [titleView_ frame];
+
+NSLog(@"r: %@", NSStringFromRect(titleFrame));
+
+  
+  if (NSWidth(titleFrame) + titleCloseWidthOffset_ + iconTitleXOffset_ < availWidth) {  // assume close and icon are always visible for now
+    // center favicon and title
+    CGFloat delta = ((availWidth) - (iconTitleXOffset_ + NSWidth(titleFrame)))/2;
+    originalIconFrame_.origin.x = (overlap) + delta;
+    titleFrame.origin.x = originalIconFrame_.origin.x + iconTitleXOffset_;
+  } else {
+    // left-align favicon and title
+    originalIconFrame_.origin.x = (newShowCloseButton ? NSMinX([closeButton_ frame]) : overlap) + titleCloseWidthOffset_;
+    titleFrame.origin.x = originalIconFrame_.origin.x + iconTitleXOffset_;
+    titleFrame.size.width = availWidth - titleCloseWidthOffset_ - iconTitleXOffset_;
   }
 
+
+
+NSLog(@"r: %@", NSStringFromRect(titleFrame));
+
+  [iconView_ setFrame:originalIconFrame_];
   [titleView_ setFrame:titleFrame];
 }
 
 - (void)updateTitleColor {
   NSColor* titleColor = nil;
   GTMTheme* theme = [[self view] gtm_theme];
   if (![self selected]) {
     titleColor = [theme textColorForStyle:GTMThemeStyleTabBarDeselected
                                     state:GTMThemeStateActiveWindow];
   }
@@ skipping 24 matching lines @@
 // Called by the tabs to determine whether we are in rapid (tab) closure mode.
 - (BOOL)inRapidClosureMode {
   if ([[self target] respondsToSelector:@selector(inRapidClosureMode)]) {
     return [[self target] performSelector:@selector(inRapidClosureMode)] ?
         YES : NO;
   }
   return NO;
 }
 
 @end