diff --git a/Telegram/SourceFiles/boxes/max_invite_box.cpp b/Telegram/SourceFiles/boxes/max_invite_box.cpp index 1ecd59128b..88be91f046 100644 --- a/Telegram/SourceFiles/boxes/max_invite_box.cpp +++ b/Telegram/SourceFiles/boxes/max_invite_box.cpp @@ -28,8 +28,7 @@ namespace { TextParseOptions kInformBoxTextOptions = { (TextParseLinks | TextParseMultiline - | TextParseMarkdown - | TextParseRichText), // flags + | TextParseMarkdown), // flags 0, // maxw 0, // maxh Qt::LayoutDirectionAuto, // dir diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp index 0fdaf4c20d..2f0c52d6fc 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp @@ -108,7 +108,7 @@ private: }; TextParseOptions MenuTextOptions = { - TextParseLinks | TextParseRichText, // flags + TextParseLinks, // flags 0, // maxw 0, // maxh Qt::LayoutDirectionAuto, // dir diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp index a2955ec23e..fd569fbe46 100644 --- a/Telegram/SourceFiles/data/data_media_types.cpp +++ b/Telegram/SourceFiles/data/data_media_types.cpp @@ -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)); } diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index f8832c660e..f866f23a0f 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -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; } diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index c930b45cc4..c377f0b09f 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -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([] { Ui::Toast::Show(tr::lng_forwarded_hidden(tr::now)); }); diff --git a/Telegram/SourceFiles/history/view/media/history_view_game.cpp b/Telegram/SourceFiles/history/view/media/history_view_game.cpp index 0c66cf3a3f..4374fdfef0 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_game.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_game.cpp @@ -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( diff --git a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp index f962fe3f3f..495190d1e0 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp @@ -70,7 +70,7 @@ void Invoice::fillFromData(not_null 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, diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp index f96adbdff6..79afd5e819 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp @@ -46,7 +46,7 @@ Location::Location( st::webPageDescriptionStyle, TextUtilities::ParseEntities( description, - TextParseLinks | TextParseMultiline | TextParseRichText), + TextParseLinks | TextParseMultiline), Ui::WebpageTextDescriptionOptions()); } } diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index 3094ff5709..b87e0edaff 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -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)); } diff --git a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp index d5d51f96f7..b285e8e7bf 100644 --- a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp @@ -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 diff --git a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp index aae37a921a..a3f1a6b565 100644 --- a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp +++ b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp @@ -59,7 +59,7 @@ private: }; TextParseOptions MenuTextOptions = { - TextParseLinks | TextParseRichText, // flags + TextParseLinks, // flags 0, // maxw 0, // maxh Qt::LayoutDirectionAuto, // dir diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp index 855de3a00a..a7daa86267 100644 --- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp +++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp @@ -102,7 +102,7 @@ private: }; TextParseOptions MenuTextOptions = { - TextParseLinks | TextParseRichText, // flags + TextParseLinks, // flags 0, // maxw 0, // maxh Qt::LayoutDirectionAuto, // dir diff --git a/Telegram/SourceFiles/ui/text/text_options.cpp b/Telegram/SourceFiles/ui/text/text_options.cpp index 349f5f5814..36fd91b72a 100644 --- a/Telegram/SourceFiles/ui/text/text_options.cpp +++ b/Telegram/SourceFiles/ui/text/text_options.cpp @@ -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 diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index 4769eb0850..174f70ca6d 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -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(),