diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 21:49:47 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 21:49:47 +0000 |
| commit | 2ce0d6276ac1af6f62dd08d2ddd1e689e2daefd6 (patch) | |
| tree | 6d8e4a0a67144f37e15831db8e7d286400437e00 /chrome/browser/gtk/tabs | |
| parent | 868fa750bc04355bbcefd774f301b910d5d1ae4d (diff) | |
| download | chromium_src-2ce0d6276ac1af6f62dd08d2ddd1e689e2daefd6.zip chromium_src-2ce0d6276ac1af6f62dd08d2ddd1e689e2daefd6.tar.gz chromium_src-2ce0d6276ac1af6f62dd08d2ddd1e689e2daefd6.tar.bz2 | |
Fixes bug in calculating size of tabs on linux tab strip. Specifically
I wasn't calculating the available width correctly when there are
pinned tabs.
BUG=18134
TEST=see bug
Review URL: http://codereview.chromium.org/159812
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/tabs')
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_strip_gtk.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 20d5c38..d8bb632 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -1305,15 +1305,15 @@ void TabStripGtk::GetDesiredTabWidths(int tab_count, } if (pinned_tab_count > 0) { - available_width -= (pinned_tab_count * TabGtk::GetPinnedWidth() - - std::max(0, pinned_tab_count - 1) * kTabHOffset); + available_width -= pinned_tab_count * (TabGtk::GetPinnedWidth() + + kTabHOffset); tab_count -= pinned_tab_count; if (tab_count == 0) { *selected_width = *unselected_width = TabGtk::GetStandardSize().width(); return; } - // For spacing between last pinned tab and normal tab. - available_width -= kTabHOffset; + // Account for gap between the last pinned tab and first non-pinned tab. + available_width -= pinned_to_non_pinned_gap_; } // Calculate the desired tab widths by dividing the available space into equal |