summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-11-03 11:39:46 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2009-11-03 12:20:48 (GMT)
commit6ec05db9b819a23ebac5a5908b8e3ca56b251e28 (patch)
tree0d14e7a3aa4aa97c4a05eecc09893118145bbc16 /src/gui
parent5fb5e5295f525fdc725283706544fb52c864ac39 (diff)
downloadQt-6ec05db9b819a23ebac5a5908b8e3ca56b251e28.zip
Qt-6ec05db9b819a23ebac5a5908b8e3ca56b251e28.tar.gz
Qt-6ec05db9b819a23ebac5a5908b8e3ca56b251e28.tar.bz2
Made QPainter::drawText() respect Qt::TextDontClip flag.
The flag was not respected in the vertical direction for any text lines completely outside the bounding rect. Task-number: QTBUG-1666 Reviewed-by: Trond
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qpainter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 8d6cad3..e0423f3 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -7604,7 +7604,7 @@ start_lengthVariant:
l.setPosition(QPointF(0., height));
height += l.height();
width = qMax(width, l.naturalTextWidth());
- if (!brect && height >= r.height())
+ if (!dontclip && !brect && height >= r.height())
break;
}
textLayout.endLayout();