From 4712d88c0ef69e9724334f37319dc8e8ad0f2ab0 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 24 Aug 2012 10:39:37 +0200 Subject: Make letter spacing APIs in QTextFormat more consistent Change d060b6f04f956ab3a6358f826dc6928b3353f5f7 introduced some new properties to QTextFormat which were unfinished and did not match the documentation in the same change. I've updated the API and docs to use the regular QFont enum for letter spacing type instead of introducing bools (which inhibits expansions later) or mutually exclusive properties in the text format. Change-Id: Ife44993b6746c413e421fdaf92ebaaab6ba95977 Reviewed-by: Lars Knoll --- tests/auto/gui/text/qtextformat/tst_qtextformat.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp index 84539b86cc..4e005e7f1e 100644 --- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp +++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp @@ -285,22 +285,26 @@ void tst_QTextFormat::testLetterSpacing() QTextCharFormat format; QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), false); - QCOMPARE(format.hasProperty(QTextFormat::FontAbsoluteLetterSpacing), false); + QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacingType), false); - format.setFontAbsoluteLetterSpacing(10.0); + format.setFontLetterSpacingType(QFont::AbsoluteSpacing); + format.setFontLetterSpacing(10.0); - QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), false); - QCOMPARE(format.property(QTextFormat::FontAbsoluteLetterSpacing).toDouble(), 10.0); + QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), true); + QCOMPARE(format.property(QTextFormat::FontLetterSpacing).toDouble(), 10.0); + QCOMPARE(format.property(QTextFormat::FontLetterSpacingType).toInt(), int(QFont::AbsoluteSpacing)); + format.setFontLetterSpacingType(QFont::PercentageSpacing); format.setFontLetterSpacing(110.0); QCOMPARE(format.property(QTextFormat::FontLetterSpacing).toDouble(), 110.0); - QCOMPARE(format.hasProperty(QTextFormat::FontAbsoluteLetterSpacing), false); + QCOMPARE(format.property(QTextFormat::FontLetterSpacingType).toInt(), int(QFont::PercentageSpacing)); - format.setFontAbsoluteLetterSpacing(10.0); + format.setFontLetterSpacingType(QFont::AbsoluteSpacing); + format.setFontLetterSpacing(10.0); - QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), false); - QCOMPARE(format.property(QTextFormat::FontAbsoluteLetterSpacing).toDouble(), 10.0); + QCOMPARE(format.property(QTextFormat::FontLetterSpacingType).toInt(), int(QFont::AbsoluteSpacing)); + QCOMPARE(format.property(QTextFormat::FontLetterSpacing).toDouble(), 10.0); } void tst_QTextFormat::testFontStretch() -- cgit v1.2.3