1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618451439

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-15 04:58:02 +00:00
commit 33e098704e
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/text/qchar.cpp
View File

@ -595,6 +595,7 @@ QT_BEGIN_NAMESPACE
\value ByteOrderSwapped
\value ParagraphSeparator
\value LineSeparator
\value VisualTabCharacter Used to represent a tabulation as a horizontal arrow. Since 6.2.
\value LastValidCodePoint
*/

1
src/corelib/text/qchar.h
View File

@ -98,6 +98,7 @@ public:
ByteOrderSwapped = 0xfffe,
ParagraphSeparator = 0x2029,
LineSeparator = 0x2028,
VisualTabCharacter = 0x2192,
LastValidCodePoint = 0x10ffff
};

2
src/gui/text/qtextlayout.cpp
View File

@ -2617,7 +2617,7 @@ void QTextLine::draw_internal(QPainter *p, const QPointF &pos,
gf.width = iterator.itemWidth;
QPainterPrivate::get(p)->drawTextItem(QPointF(iterator.x.toReal(), y.toReal()), gf, eng);
if (eng->option.flags() & QTextOption::ShowTabsAndSpaces) {
const QChar visualTab = u'\x2192';
const QChar visualTab = QChar(QChar::VisualTabCharacter);
int w = QFontMetrics(f).horizontalAdvance(visualTab);
qreal x = iterator.itemWidth.toReal() - w; // Right-aligned
if (x < 0)

8
src/widgets/widgets/qplaintextedit.cpp
View File

@ -2497,7 +2497,13 @@ void QPlainTextEdit::setOverwriteMode(bool overwrite)
\brief the tab stop distance in pixels
\since 5.10
By default, this property contains a value of 80.
By default, this property contains a value of 80 pixels.
Do not set a value less than the \l {QFontMetrics::}{horizontalAdvance()}
of the QChar::VisualTabCharacter character, otherwise the tab-character
will be drawn incompletely.
\sa QTextOption::ShowTabsAndSpaces, QTextDocument::defaultTextOption
*/
qreal QPlainTextEdit::tabStopDistance() const

6
src/widgets/widgets/qtextedit.cpp
View File

@ -2066,6 +2066,12 @@ void QTextEdit::setOverwriteMode(bool overwrite)
\since 5.10
By default, this property contains a value of 80 pixels.
Do not set a value less than the \l {QFontMetrics::}{horizontalAdvance()}
of the QChar::VisualTabCharacter character, otherwise the tab-character
will be drawn incompletely.
\sa QTextOption::ShowTabsAndSpaces, QTextDocument::defaultTextOption
*/
qreal QTextEdit::tabStopDistance() const