feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Respect node locking in navigator and 3D view

Browse Source 
If 3D scene root is locked, disable create options from context menu
in 3D view.
Also, don't highlight locked nodes as drop targets in navigator.

Fixes: QDS-8731
Change-Id: If0c8b5497781c2623f2c57966d4689e345b85785
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-01-05 15:05:02 +02:00
parent ff59de94e9
commit ac93351c93
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -248,6 +248,16 @@ bool Edit3DWidget::isPasteAvailable() const
return QApplication::clipboard()->text().startsWith(Constants::HEADER_3DPASTE_CONTENT); return QApplication::clipboard()->text().startsWith(Constants::HEADER_3DPASTE_CONTENT);
} }
bool Edit3DWidget::isSceneLocked() const
{
if (m_view && m_view->hasModelNodeForInternalId(m_canvas->activeScene())) {
ModelNode node = m_view->modelNodeForInternalId(m_canvas->activeScene());
if (ModelNode::isThisOrAncestorLocked(node))
return true;
}
return false;
}
// Called by the view to update the "create" sub-menu when the Quick3D entries are ready. // Called by the view to update the "create" sub-menu when the Quick3D entries are ready.
void Edit3DWidget::updateCreateSubMenu(const QStringList &keys, void Edit3DWidget::updateCreateSubMenu(const QStringList &keys,
const QHash<QString, QList<ItemLibraryEntry>> &entriesMap) const QHash<QString, QList<ItemLibraryEntry>> &entriesMap)
@@ -286,7 +296,7 @@ void Edit3DWidget::updateCreateSubMenu(const QStringList &keys,
void Edit3DWidget::onCreateAction() void Edit3DWidget::onCreateAction()
{ {
QAction *action = qobject_cast<QAction *>(sender()); QAction *action = qobject_cast<QAction *>(sender());
if (!action || !m_view || !m_view->model()) if (!action || !m_view || !m_view->model() || isSceneLocked())
return; return;
m_view->executeInTransaction(__FUNCTION__, [&] { m_view->executeInTransaction(__FUNCTION__, [&] {
@@ -374,6 +384,9 @@ void Edit3DWidget::showContextMenu(const QPoint &pos, const ModelNode &modelNode
const bool anyNodeSelected = view()->hasSelectedModelNodes(); const bool anyNodeSelected = view()->hasSelectedModelNodes();
const bool selectionExcludingRoot = anyNodeSelected && !view()->rootModelNode().isSelected(); const bool selectionExcludingRoot = anyNodeSelected && !view()->rootModelNode().isSelected();
if (m_createSubMenu)
m_createSubMenu->setEnabled(!isSceneLocked());
m_editComponentAction->setEnabled(isSingleComponent); m_editComponentAction->setEnabled(isSingleComponent);
m_editMaterialAction->setEnabled(isModel); m_editMaterialAction->setEnabled(isModel);
m_duplicateAction->setEnabled(selectionExcludingRoot); m_duplicateAction->setEnabled(selectionExcludingRoot);

1
src/plugins/qmldesigner/components/edit3d/edit3dwidget.h
View File

@@ -52,6 +52,7 @@ private:
void createContextMenu(); void createContextMenu();
bool isPasteAvailable() const; bool isPasteAvailable() const;
bool isSceneLocked() const;
QPointer<Edit3DView> m_edit3DView; QPointer<Edit3DView> m_edit3DView;
QPointer<Edit3DView> m_view; QPointer<Edit3DView> m_view;

28
src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
View File

@@ -211,21 +211,23 @@ void NameItemDelegate::paint(QPainter *painter,
} }
ModelNode node = getModelNode(modelIndex); ModelNode node = getModelNode(modelIndex);
NavigatorWidget *widget = qobject_cast<NavigatorWidget *>(styleOption.widget->parent()); if (!ModelNode::isThisOrAncestorLocked(node)) {
if (widget && !widget->dragType().isEmpty()) { NavigatorWidget *widget = qobject_cast<NavigatorWidget *>(styleOption.widget->parent());
QByteArray dragType = widget->dragType(); if (widget && !widget->dragType().isEmpty()) {
const NodeMetaInfo metaInfo = node.metaInfo(); QByteArray dragType = widget->dragType();
const NodeMetaInfo dragInfo = node.model()->metaInfo(dragType); const NodeMetaInfo metaInfo = node.metaInfo();
ChooseFromPropertyListFilter *filter = new ChooseFromPropertyListFilter(dragInfo, metaInfo, true); const NodeMetaInfo dragInfo = node.model()->metaInfo(dragType);
ChooseFromPropertyListFilter *filter = new ChooseFromPropertyListFilter(dragInfo, metaInfo, true);
if (!filter->propertyList.isEmpty()) { if (!filter->propertyList.isEmpty()) {
painter->setOpacity(0.5); painter->setOpacity(0.5);
painter->fillRect(styleOption.rect.adjusted(0, delegateMargin, 0, -delegateMargin), painter->fillRect(styleOption.rect.adjusted(0, delegateMargin, 0, -delegateMargin),
Theme::getColor(Theme::Color::DSnavigatorDropIndicatorBackground)); Theme::getColor(Theme::Color::DSnavigatorDropIndicatorBackground));
painter->setOpacity(1.0); painter->setOpacity(1.0);
painter->setPen(Theme::getColor(Theme::Color::DSnavigatorTextSelected)); painter->setPen(Theme::getColor(Theme::Color::DSnavigatorTextSelected));
}
delete filter;
} }
delete filter;
} }
iconOffset = drawIcon(painter, styleOption, modelIndex); iconOffset = drawIcon(painter, styleOption, modelIndex);