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

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Browse Source 
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
This commit is contained in:
Tim Jenssen
2020-08-13 08:34:24 +02:00
parent 24ca17f714 dc870f538d
commit 4fe5b923cd
93 changed files with 3704 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+3 -5
View File
@@ -84,7 +84,8 @@ void Qt5PreviewNodeInstanceServer::collectItemChangesAndSendChangeCommands()
instance.deactivateState();
}
nodeInstanceClient()->statePreviewImagesChanged(StatePreviewImageChangedCommand(imageContainerVector));
nodeInstanceClient()->statePreviewImagesChanged(
StatePreviewImageChangedCommand(imageContainerVector));
slowDownRenderTimer();
handleExtraRender();
@@ -105,7 +106,7 @@ QImage Qt5PreviewNodeInstanceServer::renderPreviewImage()
QSize previewImageSize = boundingRect.size().toSize();
if (!m_previewSize.isNull())
if (m_previewSize.isValid() && !m_previewSize.isNull())
previewImageSize.scale(m_previewSize, Qt::KeepAspectRatio);
QImage previewImage = rootNodeInstance().renderPreviewImage(previewImageSize);
@@ -124,9 +125,6 @@ void Qt5PreviewNodeInstanceServer::changePreviewImageSize(
{
m_previewSize = command.size;
if (!command.size.isValid())
m_previewSize = {160, 160};
collectItemChangesAndSendChangeCommands();
}