diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-21 00:36:17 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-21 00:36:17 (GMT) |
| commit | 78a01438e5a37fd1778924f73ca8bfa55960b0d0 (patch) | |
| tree | 5c19f64dc405ef24be8618f6d3a709d27e46793e /src | |
| parent | 164b2b54922d87a44a60efe6dbbe2fa3b7716820 (diff) | |
| download | Qt-78a01438e5a37fd1778924f73ca8bfa55960b0d0.zip Qt-78a01438e5a37fd1778924f73ca8bfa55960b0d0.tar.gz Qt-78a01438e5a37fd1778924f73ca8bfa55960b0d0.tar.bz2 | |
font.letterSpacing used percentage rather than absolute values.
... and percentage is useless.
Task-number: QTBUG-12282
Reviewed-by: Warwick Allison
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 5 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 872f6cb..6a2537b 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -1,9 +1,12 @@ ============================================================================= -The changes below are pre Qt 4.7.0 tech preview +The changes below are pre Qt 4.7.0 RC1 TextInput - copy(), cut() and paste() functions added +Font.letterSpacing + - was percentage based. Now specified in pixels. +============================================================================= The changes below are pre Qt 4.7.0 beta 2 QDeclarativeView diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index ec8bfb5..a1703c1 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -303,8 +303,7 @@ QDeclarativeTextPrivate::~QDeclarativeTextPrivate() Sets the letter spacing for the font. Letter spacing changes the default spacing between individual letters in the font. - A value of 100 will keep the spacing unchanged; a value of 200 will enlarge the spacing after a character by - the width of the character itself. + A positive value increases the letter spacing by the corresponding pixels; a negative value decreases the spacing. */ /*! diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index d13e139..0cbada4 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -213,8 +213,7 @@ QString QDeclarativeTextEdit::text() const Sets the letter spacing for the font. Letter spacing changes the default spacing between individual letters in the font. - A value of 100 will keep the spacing unchanged; a value of 200 will enlarge the spacing after a character by - the width of the character itself. + A positive value increases the letter spacing by the corresponding pixels; a negative value decreases the spacing. */ /*! diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 2a5d73d..321b121 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -176,8 +176,7 @@ void QDeclarativeTextInput::setText(const QString &s) Sets the letter spacing for the font. Letter spacing changes the default spacing between individual letters in the font. - A value of 100 will keep the spacing unchanged; a value of 200 will enlarge the spacing after a character by - the width of the character itself. + A positive value increases the letter spacing by the corresponding pixels; a negative value decreases the spacing. */ /*! diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index c17ec95..61e550a 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -973,7 +973,7 @@ qreal QDeclarativeFontValueType::letterSpacing() const void QDeclarativeFontValueType::setLetterSpacing(qreal size) { - font.setLetterSpacing(QFont::PercentageSpacing, size); + font.setLetterSpacing(QFont::AbsoluteSpacing, size); } qreal QDeclarativeFontValueType::wordSpacing() const |