Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Block drops on project tree viewport, and allow non-root items on root to be deleted (#2108)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-11-16 20:21:57 +01:00
parent bec082c0ae
commit c20f970405
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/projtree.py
+7 -3
View File
@@ -1000,7 +1000,9 @@ class GuiProjectTree(QTreeWidget):
self.propagateCount(tHandle, 0) self.propagateCount(tHandle, 0)
trItemP = trItemS.parent() # If a non-root item ends up on root due to a bug, allow it
# to still be deleted from invisible root (see #2108)
trItemP = trItemS.parent() or self.invisibleRootItem()
tIndex = trItemP.indexOfChild(trItemS) tIndex = trItemP.indexOfChild(trItemS)
trItemP.takeChild(tIndex) trItemP.takeChild(tIndex)
@@ -1315,9 +1317,11 @@ class GuiProjectTree(QTreeWidget):
action is allowed, and update relevant data. action is allowed, and update relevant data.
""" """
tItem = self.itemAt(event.pos()) tItem = self.itemAt(event.pos())
dropOn = self.dropIndicatorPosition() == QAbstractItemView.DropIndicatorPosition.OnItem onItem = self.dropIndicatorPosition() == QAbstractItemView.DropIndicatorPosition.OnItem
onView = self.dropIndicatorPosition() == QAbstractItemView.DropIndicatorPosition.OnViewport
# Make sure nothing can be dropped on invisible root (see #1569) # Make sure nothing can be dropped on invisible root (see #1569)
if not tItem or tItem.parent() is None and not dropOn: # Make sure nothing can be dropped on the viewport (see #2108)
if tItem is None or (tItem.parent() is None and not onItem) or onView:
logger.error("Invalid drop location") logger.error("Invalid drop location")
event.ignore() event.ignore()
return return