diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 00:00:56 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 00:00:56 +0000 |
| commit | c5c0e096269948fa0d323ce2016d6dfdbf04543d (patch) | |
| tree | 5844d879a46b2fadb1a1e1dbfa40c3aafd9f46be /chrome/browser/gtk/bookmark_bar_gtk.h | |
| parent | 3269829189afca38b26b968f693bcc7e611f37c6 (diff) | |
| download | chromium_src-c5c0e096269948fa0d323ce2016d6dfdbf04543d.zip chromium_src-c5c0e096269948fa0d323ce2016d6dfdbf04543d.tar.gz chromium_src-c5c0e096269948fa0d323ce2016d6dfdbf04543d.tar.bz2 | |
GTK: button clicking cleanup.
I found a much better way to implement middle-click-to-navigate: use gtk_get_current_event() to get the button release event that triggered the "clicked" signal. This simplifies greatly a lot of places that I had previously added complication.
Also this adds middle click to navigate on the go button.
Also this makes middle click on a bookmark bar button depress the button.
Review URL: http://codereview.chromium.org/165261
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk.h')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h index 6600046..3136527 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.h +++ b/chrome/browser/gtk/bookmark_bar_gtk.h @@ -142,9 +142,8 @@ class BookmarkBarGtk : public AnimationDelegate, static gboolean OnButtonPressed(GtkWidget* sender, GdkEventButton* event, BookmarkBarGtk* bar); - static gboolean OnButtonReleased(GtkWidget* sender, - GdkEventButton* event, - BookmarkBarGtk* bar); + static void OnClicked(GtkWidget* sender, + BookmarkBarGtk* bar); static void OnButtonDragBegin(GtkWidget* widget, GdkDragContext* drag_context, BookmarkBarGtk* bar); @@ -157,9 +156,8 @@ class BookmarkBarGtk : public AnimationDelegate, BookmarkBarGtk* bar); // GtkButton callbacks for folder buttons. - static gboolean OnFolderButtonReleased(GtkWidget* sender, - GdkEventButton* event, - BookmarkBarGtk* bar); + static void OnFolderClicked(GtkWidget* sender, + BookmarkBarGtk* bar); // GtkToolbar callbacks. static gboolean OnToolbarExpose(GtkWidget* widget, GdkEventExpose* event, @@ -216,10 +214,6 @@ class BookmarkBarGtk : public AnimationDelegate, // The other bookmarks button. GtkWidget* other_bookmarks_button_; - // Whether we should ignore the next button release event (because we were - // dragging). - bool ignore_button_release_; - // The BookmarkNode from the model being dragged. NULL when we aren't // dragging. const BookmarkNode* dragged_node_; |