diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 23:57:48 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 23:57:48 +0000 |
| commit | ee7b32e2b048a7b1aa7d54564b00f50d8102a7f9 (patch) | |
| tree | ffd86ffaf7f1c4fa21b8435994d0bb0c2349df14 /chrome/browser/gtk | |
| parent | 8c11e836d762ad2149f3956df6f999392b0eb9a4 (diff) | |
| download | chromium_src-ee7b32e2b048a7b1aa7d54564b00f50d8102a7f9.zip chromium_src-ee7b32e2b048a7b1aa7d54564b00f50d8102a7f9.tar.gz chromium_src-ee7b32e2b048a7b1aa7d54564b00f50d8102a7f9.tar.bz2 | |
GTK: fix bookmark bar regression:
show bookmark folder dropdowns even if there is no overflow
BUG=21430
Review URL: http://codereview.chromium.org/203010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 3caac71..8a7c50f 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -977,9 +977,16 @@ void BookmarkBarGtk::PopupForButton(GtkWidget* button) { DCHECK(page_navigator_); int first_hidden = GetFirstHiddenBookmark(0, NULL); - if (button != overflow_button_ && button != other_bookmarks_button_ && - node->GetParent()->IndexOfChild(node) >= first_hidden) { - return; + if (first_hidden == -1) { + // No overflow exists: don't show anything for the overflow button. + if (button == overflow_button_) + return; + } else { + // Overflow exists: don't show anything for an overflowed folder button. + if (button != overflow_button_ && button != other_bookmarks_button_ && + node->GetParent()->IndexOfChild(node) >= first_hidden) { + return; + } } current_menu_.reset( |