From 122744454c9befc06b582a8f0feb03bfbb85aa71 Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Wed, 31 Oct 2018 20:00:20 -0500
Subject: Improve changing mod and plugin priorities

---
 src/modlist.cpp | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

(limited to 'src/modlist.cpp')

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 6caafeb2..7b57eeda 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -654,26 +654,48 @@ void ModList::changeModPriority(std::vector<int> sourceIndices, int newPriority)
 
   emit layoutAboutToBeChanged();
   Profile *profile = m_Profile;
-  // sort rows to insert by their old priority (ascending) and insert them move them in that order
+
+  // sort the moving mods by ascending priorities
   std::sort(sourceIndices.begin(), sourceIndices.end(),
-            [profile](const int &LHS, const int &RHS) {
-              return profile->getModPriority(LHS) < profile->getModPriority(RHS);
-            });
+    [profile](const int &LHS, const int &RHS) {
+    return profile->getModPriority(LHS) > profile->getModPriority(RHS);
+  });
 
-  // odd stuff: if any of the dragged sources has priority lower than the destination then the
-  // target idx is that of the row BELOW the dropped location, otherwise it's the one above. why?
+  // move mods that are decreasing in priority
   for (std::vector<int>::const_iterator iter = sourceIndices.begin();
        iter != sourceIndices.end(); ++iter) {
-    if (profile->getModPriority(*iter) < newPriority) {
+    int oldPriority = profile->getModPriority(*iter);
+    if (oldPriority > newPriority) {
+      profile->setModPriority(*iter, newPriority);
+      m_ModMoved(ModInfo::getByIndex(*iter)->name(), oldPriority, newPriority);
+    }
+  }
+
+  // sort the moving mods by descending priorities
+  std::sort(sourceIndices.begin(), sourceIndices.end(),
+    [profile](const int &LHS, const int &RHS) {
+    return profile->getModPriority(LHS) < profile->getModPriority(RHS);
+  });
+
+  // if at least one mod is increasing in priority, the target index is
+  // that of the row BELOW the dropped location, otherwise it's the one above
+  for (std::vector<int>::const_iterator iter = sourceIndices.begin();
+    iter != sourceIndices.end(); ++iter) {
+    int oldPriority = profile->getModPriority(*iter);
+    if (oldPriority < newPriority) {
       --newPriority;
       break;
     }
   }
+
+  // move mods that are increasing in priority
   for (std::vector<int>::const_iterator iter = sourceIndices.begin();
-       iter != sourceIndices.end(); ++iter) {
-    int oldPriority = m_Profile->getModPriority(*iter);
-    m_Profile->setModPriority(*iter, newPriority);
-    m_ModMoved(ModInfo::getByIndex(*iter)->name(), oldPriority, newPriority);
+    iter != sourceIndices.end(); ++iter) {
+    int oldPriority = profile->getModPriority(*iter);
+    if (oldPriority < newPriority) {
+      profile->setModPriority(*iter, newPriority);
+      m_ModMoved(ModInfo::getByIndex(*iter)->name(), oldPriority, newPriority);
+    }
   }
 
   emit layoutChanged();
-- 
cgit v1.3.1