Fix drop in first item of separators.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index bc28490f..1077a833 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -18,6 +18,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "modlistsortproxy.h"

+#include "modlistbypriorityproxy.h"

 #include "modlistdropinfo.h"

 #include "modinfo.h"

 #include "profile.h"

@@ -279,7 +280,6 @@ bool ModListSortProxy::filterMatchesModOr(ModInfo::Ptr info, bool enabled) const
 

 bool ModListSortProxy::optionsMatchMod(ModInfo::Ptr info, bool) const

 {

-

   return true;

 }

 

@@ -598,6 +598,11 @@ bool ModListSortProxy::filterAcceptsRow(int source_row, const QModelIndex &paren
   }

 }

 

+bool ModListSortProxy::sourceIsByPriorityProxy() const

+{

+  return dynamic_cast<ModListByPriorityProxy*>(sourceModel()) != nullptr;

+}

+

 bool ModListSortProxy::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const

 {

   ModListDropInfo dropInfo(data, *m_Organizer);

@@ -620,7 +625,7 @@ bool ModListSortProxy::canDropMimeData(const QMimeData* data, Qt::DropAction act
   // in the regular model, when dropping between rows, the row-value passed to

   // the sourceModel is inconsistent between ascending and descending ordering.

   // This should fix that

-  if (sortOrder() == Qt::DescendingOrder && row != -1) {

+  if (sortOrder() == Qt::DescendingOrder && row != -1 && !sourceIsByPriorityProxy()) {

     --row;

   }

 

@@ -645,7 +650,7 @@ bool ModListSortProxy::dropMimeData(const QMimeData *data, Qt::DropAction action
   // in the regular model, when dropping between rows, the row-value passed to

   // the sourceModel is inconsistent between ascending and descending ordering.

   // This should fix that

-  if (sortOrder() == Qt::DescendingOrder && row != -1) {

+  if (sortOrder() == Qt::DescendingOrder && row != -1 && !sourceIsByPriorityProxy()) {

     --row;

   }