diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 23:35:26 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 23:35:26 +0000 |
| commit | ba311a76a5281ac15ab034725047f5e769162e90 (patch) | |
| tree | c3c6c03694d2ddc1d6b45b0350067485c7e66fed /chrome/browser/gtk | |
| parent | 76e908db3da9be77c373f5da5bfda50fe4552e9a (diff) | |
| download | chromium_src-ba311a76a5281ac15ab034725047f5e769162e90.zip chromium_src-ba311a76a5281ac15ab034725047f5e769162e90.tar.gz chromium_src-ba311a76a5281ac15ab034725047f5e769162e90.tar.bz2 | |
GTK: unbreak right click on bookmark bar folders.
BUG=34416
TEST=right, middle, and left click on bookmark bar folder all do what they should
Review URL: http://codereview.chromium.org/576008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index f5a0b8c..63f5e35 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -858,9 +858,6 @@ GtkToolItem* BookmarkBarGtk::CreateBookmarkToolItem(const BookmarkNode* node) { } void BookmarkBarGtk::ConnectFolderButtonEvents(GtkWidget* widget) { - // Accept middle mouse clicking (which opens all). - gtk_util::SetButtonClickableByMouseButtons(widget, true, true, false); - gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_ALL, NULL, 0, kDragAction); GtkDndUtil::SetDestTargetList(widget, kDestTargetList); g_signal_connect(widget, "drag-data-received", @@ -870,6 +867,11 @@ void BookmarkBarGtk::ConnectFolderButtonEvents(GtkWidget* widget) { G_CALLBACK(OnButtonPressed), this); g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(OnFolderClicked), this); + + // Accept middle mouse clicking (which opens all). This must be called after + // connecting to "button-press-event" because the handler it attaches stops + // the propagation of that signal. + gtk_util::SetButtonClickableByMouseButtons(widget, true, true, false); } const BookmarkNode* BookmarkBarGtk::GetNodeForToolButton(GtkWidget* widget) { |