diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 17:35:32 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 17:35:32 +0000 |
| commit | dac443791cffe0c7681fffe2e1a405418474f5d9 (patch) | |
| tree | 78fb5d4e057db163cf272952d869a48f5bbac6f6 /chrome/browser/gtk/bookmark_manager_gtk.cc | |
| parent | b314705cdac15c3603352c55932f95c1bdb1faa2 (diff) | |
| download | chromium_src-dac443791cffe0c7681fffe2e1a405418474f5d9.zip chromium_src-dac443791cffe0c7681fffe2e1a405418474f5d9.tar.gz chromium_src-dac443791cffe0c7681fffe2e1a405418474f5d9.tar.bz2 | |
GTK DND:
- Rearrange DND constants, create convenience functions
- (partially) implement drag onto home button
Note that the homepage is still hard-wired to the dev build splash page, so that it seems like this isn't working, but via debugging I ascertained that dragging a random file from the desktop onto the home button should successfully set that file as the homepage.
TEST=drag a lot of stuff all over the place (tabs, bookmarks, what have you), make sure nothing crashes
BUG=none
Review URL: http://codereview.chromium.org/147256
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_manager_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_manager_gtk.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc index b1db3ad..bd781a1 100644 --- a/chrome/browser/gtk/bookmark_manager_gtk.cc +++ b/chrome/browser/gtk/bookmark_manager_gtk.cc @@ -17,6 +17,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/gtk/bookmark_tree_model.h" #include "chrome/browser/gtk/bookmark_utils_gtk.h" +#include "chrome/browser/gtk/dnd_registry.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/profile.h" #include "chrome/common/chrome_paths.h" @@ -379,9 +380,9 @@ GtkWidget* BookmarkManagerGtk::MakeLeftPane() { // The left side is only a drag destination (not a source). gtk_drag_dest_set(left_tree_view_, GTK_DEST_DEFAULT_DROP, - bookmark_utils::kTargetTable, - bookmark_utils::kTargetTableSize, - GDK_ACTION_MOVE); + NULL, 0, GDK_ACTION_MOVE); + dnd::SetDestTargetListFromCodeMask(left_tree_view_, + dnd::X_CHROME_BOOKMARK_ITEM); g_signal_connect(left_tree_view_, "drag-data-received", G_CALLBACK(&OnLeftTreeViewDragReceived), this); @@ -445,9 +446,9 @@ GtkWidget* BookmarkManagerGtk::MakeRightPane() { // any deleting following a succesful move, this should work. gtk_drag_source_set(right_tree_view_, GDK_BUTTON1_MASK, - bookmark_utils::kTargetTable, - bookmark_utils::kTargetTableSize, - GDK_ACTION_MOVE); + NULL, 0, GDK_ACTION_MOVE); + dnd::SetSourceTargetListFromCodeMask(right_tree_view_, + dnd::X_CHROME_BOOKMARK_ITEM); // We connect to drag dest signals, but we don't actually enable the widget // as a drag destination unless it corresponds to the contents of a folder. @@ -530,10 +531,10 @@ void BookmarkManagerGtk::BuildRightStore() { right_tree_model_.reset( BookmarkTableModel::CreateBookmarkTableModelForFolder(model_, node)); - gtk_drag_dest_set(right_tree_view_, GTK_DEST_DEFAULT_ALL, - bookmark_utils::kTargetTable, - bookmark_utils::kTargetTableSize, + gtk_drag_dest_set(right_tree_view_, GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_MOVE); + dnd::SetDestTargetListFromCodeMask(right_tree_view_, + dnd::X_CHROME_BOOKMARK_ITEM); } else { gtk_tree_view_column_set_visible(path_column_, TRUE); @@ -1018,8 +1019,8 @@ gboolean BookmarkManagerGtk::OnRightTreeViewMotion(GtkWidget* tree_view, if (gtk_drag_check_threshold(tree_view, bm->mousedown_event_.x, bm->mousedown_event_.y, event->x, event->y)) { bm->delaying_mousedown_ = false; - GtkTargetList* targets = gtk_target_list_new( - bookmark_utils::kTargetTable, bookmark_utils::kTargetTableSize); + GtkTargetList* targets = + dnd::GetTargetListFromCodeMask(dnd::X_CHROME_BOOKMARK_ITEM); gtk_drag_begin(tree_view, targets, GDK_ACTION_MOVE, 1, reinterpret_cast<GdkEvent*>(event)); // The drag adds a ref; let it own the list. |