diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2010-01-13 16:05:45 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jbache@trolltech.com> | 2010-01-13 16:06:46 (GMT) |
| commit | 6824471ce5302c6352519a8908c6c3d3ecebaadb (patch) | |
| tree | 3daf8498bfcd317d6598fde26b47119451d94a0b /src | |
| parent | e029b5b7bf8cb8815e33a1e08b6a609dafa25f52 (diff) | |
| download | Qt-6824471ce5302c6352519a8908c6c3d3ecebaadb.zip Qt-6824471ce5302c6352519a8908c6c3d3ecebaadb.tar.gz Qt-6824471ce5302c6352519a8908c6c3d3ecebaadb.tar.bz2 | |
Fix regression in clipped icon text on Windows
This was really caused by a change done to the font engine in 4.6.
We now return a pixel less for the font height in multiple widgets.
Some of these should be addressed in a separate patch. This patch
simply ensures that the text rect is not clipped, but will not
alter the height of the widget.
Task-number: QTBUG-7662
Reviewed-by: prasanth
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 739a70b..74d3ec3 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -1608,7 +1608,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, if (toolbutton->toolButtonStyle == Qt::ToolButtonTextUnderIcon) { pr.setHeight(pmSize.height() + 6); - tr.adjust(0, pr.height() - 1, 0, -3); + tr.adjust(0, pr.height() - 1, 0, -2); pr.translate(shiftX, shiftY); if (!hasArrow) { proxy()->drawItemPixmap(p, pr, Qt::AlignCenter, pm); |