diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-21 00:36:17 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-26 04:10:17 (GMT) |
| commit | df40f6846b509087282178bffe572117d8d3eb33 (patch) | |
| tree | 34a2d415adaac29cef6c74cbfc9b147b2a1f6701 /src | |
| parent | fb065bb1ca4c49194e8a936ec0babba04f8471a1 (diff) | |
| download | Qt-df40f6846b509087282178bffe572117d8d3eb33.zip Qt-df40f6846b509087282178bffe572117d8d3eb33.tar.gz Qt-df40f6846b509087282178bffe572117d8d3eb33.tar.bz2 | |
font.letterSpacing used percentage rather than absolute values.
... and percentage is useless.
Task-number: QTBUG-12282
Reviewed-by: Warwick Allison
(cherry picked from commit 78a01438e5a37fd1778924f73ca8bfa55960b0d0)
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 ea418cf..cf630c8 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -301,8 +301,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 f3eef23..8a411f2 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -212,8 +212,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 |