diff options
| -rw-r--r-- | src/declarative/fx/qfxtext.cpp | 5 | ||||
| -rw-r--r-- | src/declarative/fx/qfxtext_p.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index c60aaf2..939a933 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -466,12 +466,13 @@ void QFxTextPrivate::updateSize() { Q_Q(QFxText); if (q->isComponentComplete()) { + QFontMetrics fm(font); if (text.isEmpty()) { + q->setImplicitHeight(fm.height()); return; } - QFontMetrics fm(font); - int dy = q->height(); + int dy = q->height(); QString tmp; QSize size(0, 0); diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h index 95b566c..8b24c66 100644 --- a/src/declarative/fx/qfxtext_p.h +++ b/src/declarative/fx/qfxtext_p.h @@ -71,7 +71,7 @@ public: QFxTextPrivate() : color((QRgb)0), style(QFxText::Normal), imgDirty(true), hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone), - dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0), + dirty(true), wrap(false), richText(false), singleline(false), control(0), doc(0), format(QFxText::AutoText) { } |