diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-13 10:57:26 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-13 10:57:26 +0200 |
| commit | 6c29ef52a8d911173ea6bfb3f62caa9187612ab2 (patch) | |
| tree | 002c715ca58597ff06878d53d7ba37973da00aac | |
| parent | Fix the double fill of the bookmark bar at startup (diff) | |
| parent | Fix the BK panel's drag and drop (diff) | |
| download | rekonq-6c29ef52a8d911173ea6bfb3f62caa9187612ab2.tar.xz | |
Merge commit 'refs/merge-requests/168' of git://gitorious.org/rekonq/mainline into m168
| -rw-r--r-- | src/bookmarks/bookmarkstreemodel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp index 7063bf9b..299efaf0 100644 --- a/src/bookmarks/bookmarkstreemodel.cpp +++ b/src/bookmarks/bookmarkstreemodel.cpp @@ -406,15 +406,15 @@ bool BookmarksTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction acti if (parent.isValid()) root = bookmarkForIndex(parent).toGroup(); - if (!destIndex.isValid()) + if (destIndex.isValid() && row != -1) { - root.deleteBookmark(bookmark); - root.addBookmark(bookmark); - } + root.moveBookmark(bookmark, root.previous(dropDestBookmark)); - else if (row != 1) + } + else { - root.moveBookmark(bookmark, root.previous(dropDestBookmark)); + root.deleteBookmark(bookmark); + root.addBookmark(bookmark); } Application::bookmarkProvider()->bookmarkManager()->emitChanged(); |