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

QmlDesigner: Fix implicitHeight in resetVertical

Browse Source 
Task-number: QTCREATORBUG-11542
Change-Id: Ia69a95abe42ad0c10b8d65663d252f15cf38cf02
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-06-30 19:14:33 +02:00
committed by Tim Jenssen
parent 6ca4be0e3a
commit 9cee5d3b22
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
View File

@@ -503,7 +503,7 @@ void QuickItemNodeInstance::resetVertical()
if (m_height > 0.0) { if (m_height > 0.0) {
setPropertyVariant("height", m_height); setPropertyVariant("height", m_height);
} else { } else {
setPropertyVariant("height", quickItem()->implicitWidth()); setPropertyVariant("height", quickItem()->implicitHeight());
} }
} }

2
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp
View File

@@ -184,7 +184,7 @@ void QmlGraphicsItemNodeInstance::resetVertical()
if (m_height > 0.0) { if (m_height > 0.0) {
setPropertyVariant("height", m_height); setPropertyVariant("height", m_height);
} else { } else {
setPropertyVariant("height", qmlGraphicsItem()->implicitWidth()); setPropertyVariant("height", qmlGraphicsItem()->implicitHeight());
} }
} }