diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 00:45:35 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 00:45:35 +0000 |
| commit | 903e7a8a5f8948b96c46f16c4920648c29a5af12 (patch) | |
| tree | d34d420a39ce4e3e8048ec5503d9c255617ca357 /chrome/browser/gtk/bookmark_bar_gtk.h | |
| parent | f05798163ceb52a2694e59c1a7f40ace72fb2024 (diff) | |
| download | chromium_src-903e7a8a5f8948b96c46f16c4920648c29a5af12.zip chromium_src-903e7a8a5f8948b96c46f16c4920648c29a5af12.tar.gz chromium_src-903e7a8a5f8948b96c46f16c4920648c29a5af12.tar.bz2 | |
Gtk: DnD extravaganza
- Correctly update drag status for drags over renderer. This makes things look quite a bit better.
- Rework the dnd utils so that we specify the drag targets in the order we prefer them (for destinations)
- Refactor code in bookmark bar so folder and toolbar drags share more code
- Allow bookmark bar to accept URI lists and plain text drags (for plain text we require the text to be a valid url)
BUG=17431
Review URL: http://codereview.chromium.org/159419
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21767 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 | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h index faac53a..5220b95 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.h +++ b/chrome/browser/gtk/bookmark_bar_gtk.h @@ -142,7 +142,7 @@ class BookmarkBarGtk : public AnimationDelegate, void PopupMenuForNode(GtkWidget* sender, const BookmarkNode* node, GdkEventButton* event); - // GtkButton callbacks + // GtkButton callbacks. static gboolean OnButtonPressed(GtkWidget* sender, GdkEventButton* event, BookmarkBarGtk* bar); @@ -160,18 +160,12 @@ class BookmarkBarGtk : public AnimationDelegate, guint target_type, guint time, BookmarkBarGtk* bar); - // GtkButton callbacks for folder buttons + // GtkButton callbacks for folder buttons. static gboolean OnFolderButtonReleased(GtkWidget* sender, GdkEventButton* event, BookmarkBarGtk* bar); - static void OnFolderDragReceived(GtkWidget* widget, - GdkDragContext* context, - gint x, gint y, - GtkSelectionData* selection_data, - guint target_type, guint time, - BookmarkBarGtk* bar); - // GtkToolbar callbacks + // GtkToolbar callbacks. static gboolean OnToolbarExpose(GtkWidget* widget, GdkEventExpose* event, BookmarkBarGtk* window); static gboolean OnToolbarDragMotion(GtkToolbar* toolbar, @@ -184,12 +178,14 @@ class BookmarkBarGtk : public AnimationDelegate, GdkDragContext* context, guint time, BookmarkBarGtk* bar); - static void OnToolbarDragReceived(GtkWidget* widget, - GdkDragContext* context, - gint x, gint y, - GtkSelectionData* selection_data, - guint target_type, guint time, - BookmarkBarGtk* bar); + + // Used for both folder buttons and the toolbar. + static void OnDragReceived(GtkWidget* widget, + GdkDragContext* context, + gint x, gint y, + GtkSelectionData* selection_data, + guint target_type, guint time, + BookmarkBarGtk* bar); // GtkHBox callbacks. static gboolean OnHBoxExpose(GtkWidget* widget, GdkEventExpose* event, |