Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant QTextOption::WrapMode::ManualWrap enum

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-01-10 07:14:24 +02:00
parent b82e17d1b9
commit 553a0770d8
7 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/itemviews/qitemdelegate.cpp
View file

@ -652,7 +652,7 @@ void QItemDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &o
const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, option.widget) + 1;
QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
const bool wrapText = option.features & QStyleOptionViewItemV2::WrapText;
d->textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::ManualWrap);
d->textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::NoWrap);
d->textOption.setTextDirection(option.direction);
d->textOption.setAlignment(QStyle::visualAlignment(option.direction, option.displayAlignment));
d->textLayout.setTextOption(d->textOption);

2
src/gui/styles/qcommonstyle.cpp
View file

@ -898,7 +898,7 @@ void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewIt
QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
const bool wrapText = option->features & QStyleOptionViewItemV2::WrapText;
QTextOption textOption;
textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::ManualWrap);
textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::NoWrap);
textOption.setTextDirection(option->direction);
textOption.setAlignment(QStyle::visualAlignment(option->direction, option->displayAlignment));
QTextLayout textLayout;

2
src/gui/text/qtextdocumentlayout.cpp
View file

@ -2553,7 +2553,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi
option.setAlignment(QStyle::visualAlignment(dir, align)); // for paragraph that are RTL, alignment is auto-reversed;
if (blockFormat.nonBreakableLines() || document->pageSize().width() < 0) {
option.setWrapMode(QTextOption::ManualWrap);
option.setWrapMode(QTextOption::NoWrap);
}
tl->setTextOption(option);

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

@ -1661,7 +1661,7 @@ void QTextLine::layout_helper(int maxGlyphs)
QTextOption::WrapMode wrapMode = eng->option.wrapMode();
bool breakany = (wrapMode == QTextOption::WrapAnywhere);
lbh.manualWrap = (wrapMode == QTextOption::ManualWrap || wrapMode == QTextOption::NoWrap);
lbh.manualWrap = (wrapMode == QTextOption::NoWrap);
int item = -1;
int newItem = eng->findItem(line.from);

1
src/gui/text/qtextoption.cpp
View file

@ -122,7 +122,6 @@ QTextOption &QTextOption::operator=(const QTextOption &o)
\value NoWrap Text is not wrapped at all.
\value WordWrap Text is wrapped at word boundaries.
\value ManualWrap Same as QTextOption::NoWrap
\value WrapAnywhere Text can be wrapped at any point on a line, even if
it occurs in the middle of a word.
\value WrapAtWordBoundaryOrAnywhere If possible, wrapping occurs at a word

1
src/gui/text/qtextoption.h
View file

@ -53,7 +53,6 @@ public:
enum WrapMode {
NoWrap,
WordWrap,
ManualWrap,
WrapAnywhere,
WrapAtWordBoundaryOrAnywhere
};

2
src/gui/widgets/qlabel.cpp
View file

@ -1420,7 +1420,7 @@ void QLabelPrivate::ensureTextLayouted() const
if (this->align & Qt::TextWordWrap)
opt.setWrapMode(QTextOption::WordWrap);
else
opt.setWrapMode(QTextOption::ManualWrap);
opt.setWrapMode(QTextOption::NoWrap);
doc->setDefaultTextOption(opt);