From ab9100fa904898606cc41f6df706b85a583bc2dc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 3 Feb 2015 13:12:58 +0100
Subject: [PATCH] Prevent dropping item on itself in ContentModel (Fixes #2334)

Also improves the drop indicator, it is now shown in between items instead of on an item.
---
 components/contentselector/model/contentmodel.cpp   | 7 +++----
 components/contentselector/model/contentmodel.hpp   | 1 -
 components/contentselector/view/contentselector.cpp | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index b81b1cbf6..198bbffbb 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -15,8 +15,7 @@ ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningI
     mMimeType ("application/omwcontent"),
     mMimeTypes (QStringList() << mMimeType),
     mColumnCount (1),
-    mDragDropFlags (Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled),
-    mDropActions (Qt::CopyAction | Qt::MoveAction)
+    mDropActions (Qt::MoveAction)
 {
     setEncoding ("win1252");
     uncheckAll();
@@ -104,7 +103,7 @@ QModelIndex ContentSelectorModel::ContentModel::indexFromItem(const EsmFile *ite
 Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index) const
 {
     if (!index.isValid())
-        return Qt::NoItemFlags;
+        return Qt::ItemIsDropEnabled;
 
     const EsmFile *file = item(index.row());
 
@@ -152,7 +151,7 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
     if (gamefileChecked)
     {
         if (allDependenciesFound)
-            returnFlags = returnFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | mDragDropFlags;
+            returnFlags = returnFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
         else
             returnFlags = Qt::ItemIsSelectable;
     }
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 2ced40f04..6af5425c7 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -89,7 +89,6 @@ namespace ContentSelectorModel
         QString mMimeType;
         QStringList mMimeTypes;
         int mColumnCount;
-        Qt::ItemFlags mDragDropFlags;
         Qt::DropActions mDropActions;
     };
 }
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 2d560e054..ad023e5b2 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -15,7 +15,8 @@
 ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent) :
     QObject(parent)
 {
-    ui.setupUi (parent);
+    ui.setupUi(parent);
+    ui.addonView->setDragDropMode(QAbstractItemView::InternalMove);
 
     buildContentModel();
     buildGameFileView();