Mac: Correctly clip tab title...

chrome/browser/ui/cocoa/tab_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.
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #import "chrome/browser/themes/browser_theme_provider.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"
 #import "chrome/browser/ui/cocoa/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/tab_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 
 @implementation TabController
 
 @synthesize action = action_;
 @synthesize app = app_;
 @synthesize loadingState = loadingState_;
 @synthesize mini = mini_;
 @synthesize pinned = pinned_;
 @synthesize target = target_;
+@synthesize iconView = iconView_;
+@synthesize titleView = titleView_;
+@synthesize closeButton = closeButton_;
 
 namespace TabControllerInternal {
 
 // A C++ delegate that handles enabling/disabling menu items and handling when
 // a menu command is chosen. Also fixes up the menu item label for "pin/unpin
 // tab".
 class MenuDelegate : public menus::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(id<TabControllerTarget> target, TabController* owner)
       : target_(target),
@@ skipping 73 matching lines @@
 
 // Called when the tab's nib is done loading and all outlets are hooked up.
 - (void)awakeFromNib {
   // 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.
+  // titleView_ under those conditions. We don't have to explicilty save the
+  // offset between the title and the close button since we can just get that
+  // value for the close button's frame.
   NSRect titleFrame = [titleView_ frame];
   iconTitleXOffset_ = NSMinX(titleFrame) - NSMinX(originalIconFrame_);
-  titleCloseWidthOffset_ = NSMaxX([closeButton_ frame]) - NSMaxX(titleFrame);
 
   [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 45 matching lines @@
     [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 iconWidth = NSWidth(originalIconFrame_);
@@ skipping 23 matching lines @@
 - (BOOL)shouldShowCloseButton {
   if ([self mini])
     return NO;
   return ([self selected] || [self iconCapacity] >= 3);
 }
 
 - (void)updateVisibility {
   // iconView_ may have been replaced or it may be nil, so [iconView_ isHidden]
   // won't work.  Instead, the state of the icon is tracked separately in
   // isIconShowing_.
-  BOOL oldShowIcon = isIconShowing_ ? YES : NO;
-  BOOL newShowIcon = [self shouldShowIcon] ? YES : NO;
+  BOOL newShowIcon = [self shouldShowIcon];
 
-  [iconView_ setHidden:newShowIcon ? NO : YES];
+  [iconView_ setHidden:!newShowIcon];
   isIconShowing_ = newShowIcon;
 
   // If the tab is a mini-tab, hide the title.
   [titleView_ setHidden:[self mini]];
 
-  BOOL oldShowCloseButton = [closeButton_ isHidden] ? NO : YES;
-  BOOL newShowCloseButton = [self shouldShowCloseButton] ? YES : NO;
+  BOOL newShowCloseButton = [self shouldShowCloseButton];
 
-  [closeButton_ setHidden:newShowCloseButton ? NO : YES];
+  [closeButton_ setHidden:!newShowCloseButton];
 
   // Adjust the title view based on changes to the icon's and close button's
   // visibility.
-  NSRect titleFrame = [titleView_ frame];
+  NSRect oldTitleFrame = [titleView_ frame];
+  NSRect newTitleFrame;
+  newTitleFrame.size.height = oldTitleFrame.size.height;
+  newTitleFrame.origin.y = oldTitleFrame.origin.y;
 
-  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_;
-    } else {
-      titleFrame.origin.x -= iconTitleXOffset_;
-      titleFrame.size.width += iconTitleXOffset_;
-    }
+  if (newShowIcon) {
+    newTitleFrame.origin.x = originalIconFrame_.origin.x + iconTitleXOffset_;
+  } else {
+    newTitleFrame.origin.x = originalIconFrame_.origin.x;
   }
 
-  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_;
+  if (newShowCloseButton) {
+    newTitleFrame.size.width = NSMinX([closeButton_ frame]) -
+                               newTitleFrame.origin.x;
+  } else {
+    newTitleFrame.size.width = NSMaxX([closeButton_ frame]) -
+                               newTitleFrame.origin.x;
   }
 
-  [titleView_ setFrame:titleFrame];
+  [titleView_ setFrame:newTitleFrame];
 }
 
 - (void)updateTitleColor {
   NSColor* titleColor = nil;
   ThemeProvider* theme = [[[self view] window] themeProvider];
   if (theme && ![self selected]) {
     titleColor =
         theme->GetNSColor(BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT,
                           true);
   }
@@ skipping 20 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