diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 01:27:03 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 01:27:03 +0000 |
| commit | 1db3231354ff2cdab38d5ead5e67ed9da3dccd89 (patch) | |
| tree | a7aa0ba1690b39411ea3006764a6285d5527d284 /chrome/browser/ui/cocoa | |
| parent | 2e86d3a4d76c51d3fcd37cfcd2281db711f9af95 (diff) | |
| download | chromium_src-1db3231354ff2cdab38d5ead5e67ed9da3dccd89.zip chromium_src-1db3231354ff2cdab38d5ead5e67ed9da3dccd89.tar.gz chromium_src-1db3231354ff2cdab38d5ead5e67ed9da3dccd89.tar.bz2 | |
[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
Diffstat (limited to 'chrome/browser/ui/cocoa')
| -rw-r--r-- | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm | 6 |
1 files changed, 5 insertions, 1 deletions
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. |