AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Updated the addtional information about elide marks

Browse Source 
Added the same information for QFontMetricsF::elidedText.

Task-number: QTBUG-30865
Change-Id: I57791de21f5721d7a505c3d13f450e5ec6cd2730
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Venu 2013-05-02 15:58:56 +02:00 committed by The Qt Project
parent 5e1bdf1ee8
commit 0f38fe972e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/text/qfontmetrics.cpp
View File

@ -858,11 +858,11 @@ QRect QFontMetrics::tightBoundingRect(const QString &text) const
The \a flags argument is optional and currently only supports The \a flags argument is optional and currently only supports
Qt::TextShowMnemonic as value. Qt::TextShowMnemonic as value.
The elide mark will follow the \l{Qt::LayoutDirection}{layout The elide mark follows the \l{Qt::LayoutDirection}{layoutdirection}.
direction}; it will be on the right side of the text for For example, it will be on the right side of the text for right-to-left
right-to-left layouts, and on the left side for right-to-left layouts if the \a mode is \c{Qt::ElideLeft}, and on the left side of the
layouts. Note that this behavior is independent of the text text if the \a mode is \c{Qt::ElideRight}.
language.
*/ */
QString QFontMetrics::elidedText(const QString &text, Qt::TextElideMode mode, int width, int flags) const QString QFontMetrics::elidedText(const QString &text, Qt::TextElideMode mode, int width, int flags) const
{ {
@ -1643,13 +1643,18 @@ QRectF QFontMetricsF::tightBoundingRect(const QString &text) const
Otherwise, returns the original string. Otherwise, returns the original string.
The \a mode parameter specifies whether the text is elided on the The \a mode parameter specifies whether the text is elided on the
left (e.g., "...tech"), in the middle (e.g., "Tr...ch"), or on left (for example, "...tech"), in the middle (for example, "Tr...ch"), or
the right (e.g., "Trol..."). on the right (for example, "Trol...").
The \a width is specified in pixels, not characters. The \a width is specified in pixels, not characters.
The \a flags argument is optional and currently only supports The \a flags argument is optional and currently only supports
Qt::TextShowMnemonic as value. Qt::TextShowMnemonic as value.
The elide mark follows the \l{Qt::LayoutDirection}{layoutdirection}.
For example, it will be on the right side of the text for right-to-left
layouts if the \a mode is \c{Qt::ElideLeft}, and on the left side of the
text if the \a mode is \c{Qt::ElideRight}.
*/ */
QString QFontMetricsF::elidedText(const QString &text, Qt::TextElideMode mode, qreal width, int flags) const QString QFontMetricsF::elidedText(const QString &text, Qt::TextElideMode mode, qreal width, int flags) const
{ {