From 1db3231354ff2cdab38d5ead5e67ed9da3dccd89 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Thu, 6 Oct 2011 01:27:03 +0000 Subject: [Mac] Fix rapid tab closure after breaking it in r103764. BUG=99074 TEST=See bug. Review URL: http://codereview.chromium.org/8161003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104221 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chrome/browser/ui/cocoa') diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 237dd95..9eb87a4 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -837,13 +837,17 @@ private: // Need to leave room for the left-side controls even in rapid closure mode. availableSpace -= [self leftIndentForControls]; + // If there are any mini tabs, account for the extra spacing between the last + // mini tab and the first regular tab. + if ([self numberOfOpenMiniTabs]) + availableSpace -= kLastMiniTabSpacing; + // This may be negative, but that's okay (taken care of by |MAX()| when // calculating tab sizes). "mini" tabs in horizontal mode just get a special // section, they don't change size. CGFloat availableSpaceForNonMini = availableSpace; availableSpaceForNonMini -= [self numberOfOpenMiniTabs] * (kMiniTabWidth - kTabOverlap); - availableSpaceForNonMini -= kLastMiniTabSpacing; // Initialize |nonMiniTabWidth| in case there aren't any non-mini-tabs; this // value shouldn't actually be used. -- cgit v1.1