AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the vertical alignment of images in a text document

Browse Source 
Try to align with the HTML standard as much as possible.
AlignBottom is now really the bottom of the line (not the text).
AlignMiddle is between AlignTop and AlignBottom.

Change-Id: Ia067b96209c2ab0becbff99cf15bb8ab193ee2c6
Fixes: QTBUG-84981
Pick-to: 5.15
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Dominik Holland 2020-06-12 13:50:18 +02:00
parent c1e5044d22
commit e11939afee
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/text/qtextlayout.cpp
View File

@ -2097,6 +2097,10 @@ found:
current.ascent = line.ascent;
current.descent = height - line.ascent;
break;
case QTextCharFormat::AlignMiddle:
current.ascent = (line.ascent + line.descent) / 2 - line.descent + height / 2;
current.descent = height - line.ascent;
break;
case QTextCharFormat::AlignBottom:
current.descent = line.descent;
current.ascent = height - line.descent;
@ -2554,6 +2558,7 @@ void QTextLine::draw(QPainter *p, const QPointF &pos, const QTextLayout::FormatR
QFont f = eng->font(si);
QTextCharFormat format;
if (eng->hasFormats() || selection) {
format = eng->format(&si);
if (suppressColors) {
@ -2584,10 +2589,18 @@ void QTextLine::draw(QPainter *p, const QPointF &pos, const QTextLayout::FormatR
p->save();
if (si.analysis.flags == QScriptAnalysis::Object && QTextDocumentPrivate::get(eng->block)) {
QFixed itemY = y - si.ascent;
if (format.verticalAlignment() == QTextCharFormat::AlignTop) {
switch (format.verticalAlignment()) {
case QTextCharFormat::AlignTop:
itemY = y - lineBase;
} else if (format.verticalAlignment() == QTextCharFormat::AlignBottom) {
itemY = y + line.descent - si.ascent - si.descent;
break;
case QTextCharFormat::AlignMiddle:
itemY = y - lineBase + (line.height() - si.height()) / 2;
break;
case QTextCharFormat::AlignBottom:
itemY = y - lineBase + line.height() - si.height();
break;
default:
break;
}
QRectF itemRect(iterator.x.toReal(), itemY.toReal(), iterator.itemWidth.toReal(), si.height().toReal());