summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 22:21:44 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 22:21:44 +0000
commit33e1fe807e303f9bd31abce0c6e7033a084a269c (patch)
treea34216ead5473fc1dbed264feb3f623d8daca805 /chrome/browser/gtk
parentebacb45701985a30d77647c580a8c6d36e080a0e (diff)
downloadchromium_src-33e1fe807e303f9bd31abce0c6e7033a084a269c.zip
chromium_src-33e1fe807e303f9bd31abce0c6e7033a084a269c.tar.gz
chromium_src-33e1fe807e303f9bd31abce0c6e7033a084a269c.tar.bz2
GTK: Make sure mid-drag bookmark bar items are not shown by BookmarkBarGtk::Show() calls
BUG=30521 TEST=click a boomkark bar icon, then quickly drag it. It should not re-appear on the shelf until the drag is over. Review URL: http://codereview.chromium.org/504017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 5fb37e4..a02136f 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -936,6 +936,8 @@ void BookmarkBarGtk::OnButtonDragBegin(GtkWidget* button,
// Hide our node.
gtk_widget_hide(button);
+ // Make sure it stays hidden for the duration of the drag.
+ gtk_widget_set_no_show_all(button, TRUE);
}
// static
@@ -943,6 +945,7 @@ void BookmarkBarGtk::OnButtonDragEnd(GtkWidget* button,
GdkDragContext* drag_context,
BookmarkBarGtk* bar) {
gtk_widget_show(button);
+ gtk_widget_set_no_show_all(button, FALSE);
if (bar->toolbar_drop_item_) {
g_object_unref(bar->toolbar_drop_item_);