summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-28 14:12:46 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-28 12:17:17 +0000
commit16d5c95207f163202ad9a83336f362f3f2595a8a (patch)
treec561e60720afa600ddecee0858c4b4e352e76c0a
parent428832ca0759ece273046276c256828a0b3bf873 (diff)
Fix persistent drag source row indicator
Change-Id: Idf3706db17571241ec41f517d5bbfea914961063 Fixes: QT3DS-2306 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp
index 437d81dc..aba37959 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp
@@ -346,9 +346,11 @@ void RowMover::updateTargetRow(const QPointF &scenePos, EStudioObjectType rowTyp
// i.e. user is dragging a row within timeline (not from object/project panel)
// AND drop depth is larger than for the component (user is dropping items _in_
// the component, not at the same depth as the component itself)
- if (insertParent->isComponent() && depth > insertParent->depth() && m_active) {
+ if (insertParent->isComponent() && !insertParent->isComponentRoot()
+ && depth > insertParent->depth() && m_active) {
m_deleteAfterMove = true;
} else {
+ m_deleteAfterMove = false;
for (int i = rowInsert1->depth(); i >= depth; --i)
insertParent = insertParent->parentRow();
}