diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-05-29 13:11:44 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-05-30 04:25:41 +0000 |
| commit | 51a2505a0f323a1bf689c3fe048a6b0570f2d026 (patch) | |
| tree | d69371c194cbf1a2502e460c8ea24b28b0f78fb9 | |
| parent | be7b024ca0933d1ccac960cd0f38731438227524 (diff) | |
Block dragging objects under locked objects
Task-number: QT3DS-1798
Change-Id: Iceacd7b6290397ac41fdc3dc5adff97bd6bba53f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp index 80aad3e5..c51fe27d 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp @@ -239,7 +239,8 @@ void RowMover::updateTargetRow(const QPointF &scenePos, EStudioObjectType rowTyp if (depth < depthMin || depth > depthMax || (theRowType != OBJTYPE_UNKNOWN && !CStudioObjectTypes::AcceptableParent(theRowType, - m_insertionParent->rowType()))) { + m_insertionParent->rowType())) + || m_insertionParent->locked()) { valid = false; } |