diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-24 00:54:24 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-24 00:54:24 +0000 |
| commit | 6b06650c5308b953ad3a8c9876fa663b3425f877 (patch) | |
| tree | 5006bd31d3c942940a9e6f0b2716937ed03afc37 /chrome/browser/gtk/browser_actions_toolbar_gtk.cc | |
| parent | 967872d14a000b9eb925044825dd2d1185817124 (diff) | |
| download | chromium_src-6b06650c5308b953ad3a8c9876fa663b3425f877.zip chromium_src-6b06650c5308b953ad3a8c9876fa663b3425f877.tar.gz chromium_src-6b06650c5308b953ad3a8c9876fa663b3425f877.tar.bz2 | |
GTK: Browser actions container tweak.
don't change the show/hide state of the overflow chevron while animating the browser actions toolbar.
BUG=none
TEST=Don't regress:
1) correct display of browser actions toolbar on startup
- when some browser actions are showing
- when all browser actions are showing
2) dragging the slider correctly sets the overflow icon, still
Fixes:
1) adding an action while the container is fully expanded does not temporarily show the overflow chevron
Review URL: http://codereview.chromium.org/1751015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_actions_toolbar_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_actions_toolbar_gtk.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc index da9169be..3eb7e98 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc @@ -590,6 +590,7 @@ void BrowserActionsToolbarGtk::AnimationProgressed(const Animation* animation) { void BrowserActionsToolbarGtk::AnimationEnded(const Animation* animation) { gtk_widget_set_size_request(button_hbox_.get(), desired_width_, -1); + UpdateChevronVisibility(); } void BrowserActionsToolbarGtk::ExecuteCommandById(int command_id) { @@ -852,5 +853,6 @@ gboolean BrowserActionsToolbarGtk::OnOverflowMenuButtonPress( } void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) { - UpdateChevronVisibility(); + if (!resize_animation_.IsAnimating()) + UpdateChevronVisibility(); } |