path: root/src/gui/text/qcssparser_p.h
diff options
authorEskil Abrahamsen Blomfeldt <>2016-03-30 13:15:02 +0200
committerEskil Abrahamsen Blomfeldt <>2016-04-19 09:32:10 +0000
commit7094466f7d0c2176eb3080021a4ea5d220555df9 (patch)
treec1f633f1f3ce805a9af78c8e31e5f70ef6d29694 /src/gui/text/qcssparser_p.h
parentb3fcaea5f2b97d3f562add97aee48cbb469c875a (diff)
Interpret fixed CSS line-height as minimum rather than absolute
The QTextBlockFormat::FixedHeight overrides the line height regardless of its calculated height. If the line contains objects or text which is higher than the specified line height, using FixedHeight will cause them to overlap with the previous line. This is not what happens in normal web browsers. The expected behavior is that the line height given in CSS is the minimum height, but that we still reserve space needed to display everything without overlaps. To make it possible for people to retain the old behavior, we introduce the -qt-line-height-type property, which allows them to override the default. This also fixes output from toHtml() to use the new property rather than set the minimum height of the paragraph or the "line-spacing" property, which does not exist in either CSS nor in Qt. [ChangeLog][QtGui][Important Behavior Changes] When line height is specified in pixels, this is now interpreted as the minimum line height rather than an absolute line height to avoid overlaps. To get the old behavior, use the -qt-line-height-type property in CSS and set it to "fixed". Task-number: QTBUG-51962 Change-Id: Ic2dde649b69209672170dad4c2de1e1c432a1078 Reviewed-by: Lars Knoll <>
Diffstat (limited to 'src/gui/text/qcssparser_p.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index b7692d32aa..4da7b62dba 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -189,6 +189,7 @@ enum Property {
+ QtLineHeightType,