Support more items for QTextCharFormat::VerticalAlignment enum for custom text objects.
authorDmitry Zelenkovsky <Dmitry.Zelenkovskiy@nokia.com>
Thu, 28 Apr 2011 09:49:13 +0000 (11:49 +0200)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 2 May 2011 07:53:25 +0000 (09:53 +0200)
commitf26c4ba80dd927a705f5af03b915dcf1af8f351a
tree5abda4379e88b57161af4471d4971a022f1cbd87
parent774527dd1e85da6ab91cba9b0e5897ba90f4c828
Support more items for QTextCharFormat::VerticalAlignment enum for custom text objects.

 * QTextCharFormat::AlignNormal - support text format descent, place text object bottom on (baseline - descent).
 * QTextCharFormat::AlignBottom - place text object bottom on baseline.
 * QTextCharFormat::AlignTop - Still not supported.
 * Any other vertical alignment is mapped QTextCharFormat::AlignBottom.

Add new enum AlignBaseline for custom inline objects to take into account font baseline.

Merge-request: 2578
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit ee9455ed2a83084692d969c398ecb91bcd4fc33a)
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextformat.h