diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-26 10:47:01 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-26 10:47:01 (GMT) |
| commit | e7eb7bdf63791ed03257f2f23b1f515e4d89e054 (patch) | |
| tree | 1d580cea9ffbf342a029c73bd2cecc106811ff22 /src/gui/itemviews/qitemdelegate.cpp | |
| parent | 47472906fd00e0eff820870330d481c4229ee285 (diff) | |
| parent | 41e9adb44137c8839d0d7e131802de198b0e7168 (diff) | |
| download | Qt-e7eb7bdf63791ed03257f2f23b1f515e4d89e054.zip Qt-e7eb7bdf63791ed03257f2f23b1f515e4d89e054.tar.gz Qt-e7eb7bdf63791ed03257f2f23b1f515e4d89e054.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/itemviews/qitemdelegate.cpp')
| -rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index cba213b..d5f6fd2 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -69,6 +69,7 @@ #include <qdebug.h> #include <qlocale.h> #include <qdialog.h> +#include <qmath.h> #include <limits.h> @@ -1148,7 +1149,8 @@ QRect QItemDelegate::textRectangle(QPainter * /*painter*/, const QRect &rect, d->textLayout.setTextOption(d->textOption); d->textLayout.setFont(font); d->textLayout.setText(QItemDelegatePrivate::replaceNewLine(text)); - const QSize size = d->doTextLayout(rect.width()).toSize(); + QSizeF fpSize = d->doTextLayout(rect.width()); + const QSize size = QSize(qCeil(fpSize.width()), qCeil(fpSize.height())); // ###: textRectangle should take style option as argument const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1; return QRect(0, 0, size.width() + 2 * textMargin, size.height()); |