Add check for illegal drag and drops (#1570)
This commit is contained in:
@@ -507,8 +507,11 @@ class GuiProjectTree(QTreeWidget):
|
||||
# Allow Move by Drag & Drop
|
||||
self.setDragEnabled(True)
|
||||
self.setDragDropMode(QAbstractItemView.InternalMove)
|
||||
self.setDropIndicatorShown(True)
|
||||
|
||||
# But don't allow drop on root level
|
||||
# Due to a bug, this stops working somewhere between Qt 5.15.3
|
||||
# and 5.15.8, so this is also blocked in dropEvent
|
||||
trRoot = self.invisibleRootItem()
|
||||
trRoot.setFlags(trRoot.flags() ^ Qt.ItemIsDropEnabled)
|
||||
|
||||
@@ -1380,8 +1383,16 @@ class GuiProjectTree(QTreeWidget):
|
||||
"""
|
||||
sHandle = self.getSelectedHandle()
|
||||
sItem = self._getTreeItem(sHandle) if sHandle else None
|
||||
if sHandle is None or sItem is None:
|
||||
if sHandle is None or sItem is None or sItem.parent() is None:
|
||||
logger.error("Invalid drag and drop event")
|
||||
event.ignore()
|
||||
return
|
||||
|
||||
if not self.indexAt(event.pos()).isValid():
|
||||
# Needed due to a bug somewhere around Qt 5.15.8 that
|
||||
# ignores the invisible root item flags
|
||||
logger.error("Invalid drop location")
|
||||
event.ignore()
|
||||
return
|
||||
|
||||
logger.debug("Drag'n'drop of item '%s' accepted", sHandle)
|
||||
|
||||
Reference in New Issue
Block a user