diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-09-05 14:09:33 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-09-06 12:21:08 +0000 |
| commit | 6b84d6f2aa1378cf5d23c6dd80eb0ab4ff0c01d3 (patch) | |
| tree | e11da64c58121bbb98fbb55fc63529ad1543a41e /src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp | |
| parent | 462df7ade37f2600aabbb84e7c440b0dcdb741d9 (diff) | |
Add a 'Detach material' check box to the ChooseImagePropertyDlg
When setting a sub-presentation to a ref material, a new check box
option appears in the ChooseImagePropertyDlg, if checked the ref
material will be changed to a Standard material so that the
sub-presentation setting only affects this material instance.
Task-number: QT3DS-2233
Change-Id: Iafff41f6994715289b13c30acf1226a4dfe86d08
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp index 73a23354..3908c255 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp @@ -74,7 +74,7 @@ void RowMover::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, RowTree *RowMover::insertionTarget() const { - return m_insertionTarget; + return m_insertionTarget.data(); } RowTree *RowMover::insertionParent() const @@ -112,7 +112,7 @@ void RowMover::resetInsertionParent(RowTree *newParent) } } -bool RowMover::isActive() +bool RowMover::isActive() const { return m_active; } @@ -153,7 +153,7 @@ void RowMover::end(bool force) m_sourceRows.clear(); - if (m_insertionTarget) + if (!m_insertionTarget.isNull()) m_insertionTarget->setDnDState(RowTree::DnDState::None); setVisible(false); @@ -207,7 +207,7 @@ void RowMover::updateTargetRow(const QPointF &scenePos, EStudioObjectType rowTyp { // DnD a presentation / Qml stream from the project panel (to set it as a subpresentation) if (rowType == OBJTYPE_PRESENTATION || rowType == OBJTYPE_QML_STREAM) { - if (m_insertionTarget) + if (!m_insertionTarget.isNull()) m_insertionTarget->setDnDState(RowTree::DnDState::None, RowTree::DnDState::SP_TARGET); RowTree *rowAtMouse = m_scene->rowManager()->getRowAtPos(scenePos); |