Merge pull request opentx#3844 from elecpower/FixesInputDnD

Fixes Inputs Drag n Drop
horstimac · Sep 24, 2016 · e95a43c · e95a43c
2 parents acbe64c + 18ac22b
commit e95a43c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
@@ -282,10 +282,17 @@ void InputsPanel::exposCopy()
     QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
 }
 
-void InputsPanel::mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction /*action*/)
+void InputsPanel::mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction action)
 {
     int idx = ExposlistWidget->item(index > 0 ? index-1 : 0)->data(Qt::UserRole).toByteArray().at(0);
+  if (action==Qt::CopyAction) {
     pasteExpoMimeData(data, idx);
+  }
+  else if (action==Qt::MoveAction) {
+    QList<int> list = createExpoListFromSelected();
+    exposDeleteList(list);
+    pasteExpoMimeData(data, idx);
+  }
 }
 
 #include <iostream>