Removed TextParseRichText.

This commit is contained in:
23rd 2022-01-07 06:50:06 +03:00 committed by John Preston
parent e1aa08b985
commit e11904e05b
14 changed files with 21 additions and 37 deletions

View file

@ -28,8 +28,7 @@ namespace {
TextParseOptions kInformBoxTextOptions = {
(TextParseLinks
| TextParseMultiline
| TextParseMarkdown
| TextParseRichText), // flags
| TextParseMarkdown), // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir

View file

@ -108,7 +108,7 @@ private:
};
TextParseOptions MenuTextOptions = {
TextParseLinks | TextParseRichText, // flags
TextParseLinks, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir

View file

@ -1117,7 +1117,7 @@ TextForMimeData MediaLocation::clipboardText() const {
Ui::WebpageTextTitleOptions().flags);
auto descriptionResult = TextUtilities::ParseEntities(
_description,
TextParseLinks | TextParseMultiline | TextParseRichText);
TextParseLinks | TextParseMultiline);
if (!titleResult.empty()) {
result.append(std::move(titleResult));
}

View file

@ -3019,7 +3019,7 @@ void Session::webpageApplyFields(
qs(data.vdescription().value_or_empty())
};
const auto siteName = qs(data.vsite_name().value_or_empty());
auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
auto parseFlags = TextParseLinks | TextParseMultiline;
if (siteName == qstr("Twitter") || siteName == qstr("Instagram")) {
parseFlags |= TextParseHashtags | TextParseMentions;
}

View file

@ -174,13 +174,7 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
Ui::Text::WithEntities);
}
}
TextParseOptions opts = {
TextParseRichText,
0,
0,
Qt::LayoutDirectionAuto
};
text.setMarkedText(st::fwdTextStyle, phrase, opts);
text.setMarkedText(st::fwdTextStyle, phrase);
static const auto hidden = std::make_shared<LambdaClickHandler>([] {
Ui::Toast::Show(tr::lng_forwarded_hidden(tr::now));
});

View file

@ -72,7 +72,7 @@ QSize Game::countOptimalSize() {
auto text = _data->description;
if (!text.isEmpty()) {
auto marked = TextWithEntities { text };
auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
auto parseFlags = TextParseLinks | TextParseMultiline;
TextUtilities::ParseEntities(marked, parseFlags);
if (!_attach) {
_description.updateSkipBlock(

View file

@ -70,7 +70,7 @@ void Invoice::fillFromData(not_null<Data::Invoice*> invoice) {
// init strings
if (!invoice->description.isEmpty()) {
auto marked = TextWithEntities { invoice->description };
auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
auto parseFlags = TextParseLinks | TextParseMultiline;
TextUtilities::ParseEntities(marked, parseFlags);
_description.setMarkedText(
st::webPageDescriptionStyle,

View file

@ -46,7 +46,7 @@ Location::Location(
st::webPageDescriptionStyle,
TextUtilities::ParseEntities(
description,
TextParseLinks | TextParseMultiline | TextParseRichText),
TextParseLinks | TextParseMultiline),
Ui::WebpageTextDescriptionOptions());
}
}

View file

@ -54,7 +54,7 @@ namespace {
using TextState = HistoryView::TextState;
TextParseOptions _documentNameOptions = {
TextParseMultiline | TextParseRichText | TextParseLinks | TextParseMarkdown, // flags
TextParseMultiline | TextParseLinks | TextParseMarkdown, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir
@ -637,8 +637,7 @@ Voice::Voice(
dateText,
lt_duration,
{ .text = Ui::FormatDurationText(duration()) },
Ui::Text::WithEntities),
{ TextParseRichText, 0, 0, Qt::LayoutDirectionAuto });
Ui::Text::WithEntities));
_details.setLink(1, goToMessageClickHandler(parent));
}

View file

@ -19,8 +19,7 @@ namespace {
TextParseOptions kInformBoxTextOptions = {
(TextParseLinks
| TextParseMultiline
| TextParseMarkdown
| TextParseRichText), // flags
| TextParseMarkdown), // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir
@ -30,7 +29,6 @@ TextParseOptions kMarkedTextBoxOptions = {
(TextParseLinks
| TextParseMultiline
| TextParseMarkdown
| TextParseRichText
| TextParseMentions
| TextParseHashtags), // flags
0, // maxw

View file

@ -59,7 +59,7 @@ private:
};
TextParseOptions MenuTextOptions = {
TextParseLinks | TextParseRichText, // flags
TextParseLinks, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir

View file

@ -102,7 +102,7 @@ private:
};
TextParseOptions MenuTextOptions = {
TextParseLinks | TextParseRichText, // flags
TextParseLinks, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir

View file

@ -18,7 +18,6 @@ TextParseOptions HistoryTextOptions = {
| TextParseMentions
| TextParseHashtags
| TextParseMultiline
| TextParseRichText
| TextParseMarkdown, // flags
0, // maxw
0, // maxh
@ -31,7 +30,6 @@ TextParseOptions HistoryBotOptions = {
| TextParseHashtags
| TextParseBotCommands
| TextParseMultiline
| TextParseRichText
| TextParseMarkdown, // flags
0, // maxw
0, // maxh
@ -41,9 +39,8 @@ TextParseOptions HistoryBotOptions = {
TextParseOptions HistoryServiceOptions = {
TextParseLinks
| TextParseMentions
| TextParseHashtags
//| TextParseMultiline
| TextParseRichText, // flags
| TextParseHashtags, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // lang-dependent
@ -53,8 +50,7 @@ TextParseOptions HistoryTextNoMonoOptions = {
TextParseLinks
| TextParseMentions
| TextParseHashtags
| TextParseMultiline
| TextParseRichText, // flags
| TextParseMultiline, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir
@ -65,8 +61,7 @@ TextParseOptions HistoryBotNoMonoOptions = {
| TextParseMentions
| TextParseHashtags
| TextParseBotCommands
| TextParseMultiline
| TextParseRichText, // flags
| TextParseMultiline, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir
@ -87,7 +82,7 @@ TextParseOptions TextDialogOptions = {
};
TextParseOptions WebpageTitleOptions = {
TextParseMultiline | TextParseRichText, // flags
TextParseMultiline, // flags
0, // maxw
0, // maxh
Qt::LayoutDirectionAuto, // dir
@ -98,7 +93,6 @@ TextParseOptions WebpageDescriptionOptions = {
| TextParseMentions
| TextParseHashtags
| TextParseMultiline
| TextParseRichText
| TextParseMarkdown, // flags
0, // maxw
0, // maxh

View file

@ -820,14 +820,14 @@ void Notification::updateNotifyDisplay() {
lt_count,
_forwardedCount))
: QString()));
const auto Options = TextParseOptions{
TextParseRichText
| (_forwardedCount > 1 ? TextParseMultiline : 0),
const auto options = TextParseOptions{
TextParsePlainLinks
| (_forwardedCount > 1 ? TextParseMultiline : 0),
0,
0,
Qt::LayoutDirectionAuto,
};
itemTextCache.setMarkedText(st::dialogsTextStyle, text, Options);
itemTextCache.setMarkedText(st::dialogsTextStyle, text, options);
itemTextCache.drawElided(
p,
r.left(),