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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp

Change-Id: Icda34067bb89d066a3e7eb47f8cca1d62dc3ae0d
This commit is contained in:
Eike Ziller
2022-02-11 10:54:46 +01:00
parent c9cd00f2ce 5a278d78f2
commit fcb8d3b2a4
397 changed files with 12877 additions and 4994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -110,6 +110,10 @@ void Edit3DView::renderImage3DChanged(const QImage &img)
// Notify puppet to resize if received image wasn't correct size
if (img.size() != canvasSize())
edit3DViewResized(canvasSize());
if (edit3DWidget()->canvas()->busyIndicator()->isVisible()) {
edit3DWidget()->canvas()->setOpacity(1.0);
edit3DWidget()->canvas()->busyIndicator()->hide();
}
}
void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState)
@@ -195,13 +199,19 @@ void Edit3DView::modelAttached(Model *model)
AbstractView::modelAttached(model);
checkImports();
auto cachedImage = m_canvasCache.take(model);
if (cachedImage) {
edit3DWidget()->canvas()->updateRenderImage(*cachedImage);
edit3DWidget()->canvas()->setOpacity(0.5);
}
edit3DWidget()->canvas()->busyIndicator()->show();
}
void Edit3DView::modelAboutToBeDetached(Model *model)
{
Q_UNUSED(model)
// Hide the canvas when model is detached (i.e. changing documents)
m_canvasCache.insert(model, edit3DWidget()->canvas()->renderImage());
edit3DWidget()->showCanvas(false);
AbstractView::modelAboutToBeDetached(model);