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

QmlDesigner.FormEditor: Do not overwrite auxiliaryData width/height

Browse Source 
We using F2/goto into component the auxiliaryData is typically
already set.

Change-Id: Ib201198f5fcd7a716fb416b54537488cc5b68afc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2016-07-28 10:14:31 +02:00
committed by Alessandro Portale
parent b8a22a5ec1
commit dd2d17ed36
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
View File

@@ -424,7 +424,9 @@ void FormEditorView::instanceInformationsChange(const QMultiHash<ModelNode, Info
if (qmlItemNode.instanceBoundingRect().isEmpty() && if (qmlItemNode.instanceBoundingRect().isEmpty() &&
!(qmlItemNode.propertyAffectedByCurrentState("width") !(qmlItemNode.propertyAffectedByCurrentState("width")
&& qmlItemNode.propertyAffectedByCurrentState("height"))) { && qmlItemNode.propertyAffectedByCurrentState("height"))) {
if (!(rootModelNode().hasAuxiliaryData("width")))
rootModelNode().setAuxiliaryData("width", 640); rootModelNode().setAuxiliaryData("width", 640);
if (!(rootModelNode().hasAuxiliaryData("height")))
rootModelNode().setAuxiliaryData("height", 480); rootModelNode().setAuxiliaryData("height", 480);
rootModelNode().setAuxiliaryData("autoSize", true); rootModelNode().setAuxiliaryData("autoSize", true);
formEditorWidget()->updateActions(); formEditorWidget()->updateActions();