Fix dragging for all views

Author: ferdnyc

src/windows/views/effects_listview.py

@@ -62,7 +62,8 @@ def startDrag(self, event):
             log.warning("No draggable items found in model!")
             return False
 
-        icon = current.data(Qt.DecorationRole)
+        # Get icon from column 0 on same row as current item
+        icon = current.sibling(current.row(), 0).data(Qt.DecorationRole)
 
         # Start drag operation
         drag = QDrag(self)

src/windows/views/effects_treeview.py

@@ -62,7 +62,8 @@ def startDrag(self, event):
             log.warning("No draggable items found in model!")
             return False
 
-        icon = current.data(Qt.DecorationRole)
+        # Get icon from column 0 on same row as current item
+        icon = current.sibling(current.row(), 0).data(Qt.DecorationRole)
 
         # Start drag operation
         drag = QDrag(self)

src/windows/views/files_listview.py

@@ -93,16 +93,25 @@ def dragEnterEvent(self, event):
     def startDrag(self, supportedActions):
         """ Override startDrag method to display custom icon """
 
-        # The relevant model for index values
-        model = self.model()
+        # Get first column indexes for all selected rows
+        selected = self.selectionModel().selectedRows(0)
+
+        # Get image of current item
+        current = self.selectionModel().currentIndex()
+        if not current.isValid() and selected:
+            current = selected[0]
+
+        if not current.isValid():
+            # We can't find anything to drag
+            log.warning("No draggable items found in model!")
+            return False
 
-        # Get image of selected item
-        selected_rows = self.selectionModel().selectedRows(0)
-        icon = selected_rows[0].data(Qt.DecorationRole)
+        # Get icon from column 0 on same row as current item
+        icon = current.sibling(current.row(), 0).data(Qt.DecorationRole)
 
         # Start drag operation
         drag = QDrag(self)
-        drag.setMimeData(model.mimeData(self.selectionModel().selectedIndexes()))
+        drag.setMimeData(self.model().mimeData(selected))
         drag.setPixmap(icon.pixmap(QSize(self.drag_item_size, self.drag_item_size)))
         drag.setHotSpot(QPoint(self.drag_item_size / 2, self.drag_item_size / 2))
         drag.exec_()

src/windows/views/files_treeview.py

@@ -93,16 +93,26 @@ def dragEnterEvent(self, event):
 
     def startDrag(self, supportedActions):
         """ Override startDrag method to display custom icon """
-        # The relevant model for index values
-        model = self.model()
 
-        # Get indexes from column 0 of selected row
-        selected_rows = self.selectionModel().selectedRows(0)
-        icon = selected_rows[0].data(Qt.DecorationRole)
+        # Get first column indexes for all selected rows
+        selected = self.selectionModel().selectedRows(0)
+
+        # Get image of current item
+        current = self.selectionModel().currentIndex()
+        if not current.isValid() and selected:
+            current = selected[0]
+
+        if not current.isValid():
+            # We can't find anything to drag
+            log.warning("No draggable items found in model!")
+            return False
+
+        # Get icon from column 0 on same row as current item
+        icon = current.sibling(current.row(), 0).data(Qt.DecorationRole)
 
         # Start drag operation
         drag = QDrag(self)
-        drag.setMimeData(model.mimeData(self.selectionModel().selectedRows()))
+        drag.setMimeData(self.model().mimeData(selected))
         drag.setPixmap(icon.pixmap(QSize(self.drag_item_size, self.drag_item_size)))
         drag.setHotSpot(QPoint(self.drag_item_size / 2, self.drag_item_size / 2))
         drag.exec_()

src/windows/views/transitions_listview.py

@@ -65,7 +65,8 @@ def startDrag(self, event):
             log.warning("No draggable items found in model!")
             return False
 
-        icon = current.data(Qt.DecorationRole)
+        # Get icon from column 0 on same row as current item
+        icon = current.sibling(current.row(), 0).data(Qt.DecorationRole)
 
         # Start drag operation
         drag = QDrag(self)

src/windows/views/transitions_treeview.py

@@ -62,7 +62,9 @@ def startDrag(self, event):
             log.warning("No draggable items found in model!")
             return False
 
-        icon = current.data(Qt.DecorationRole)
+        # Get icon from column 0 on same row as current item
+        icon = current.sibling(current.row(), 0).data(Qt.DecorationRole)
+
         # Start drag operation
         drag = QDrag(self)
         drag.setMimeData(self.model().mimeData(selected))