diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp index 78f7b6f48..c8d9a3d59 100644 --- a/Telegram/SourceFiles/intro/intro_step.cpp +++ b/Telegram/SourceFiles/intro/intro_step.cpp @@ -294,15 +294,8 @@ void Step::setTitleText(rpl::producer titleText) { _titleText = std::move(titleText); } -void Step::setDescriptionText( - rpl::producer descriptionText) { - setDescriptionText( - std::move(descriptionText) | Ui::Text::ToWithEntities()); -} - -void Step::setDescriptionText( - rpl::producer richDescriptionText) { - _descriptionText = std::move(richDescriptionText); +void Step::setDescriptionText(v::text::data &&descriptionText) { + _descriptionText = v::text::take_marked(std::move(descriptionText)); } void Step::showFinished() { diff --git a/Telegram/SourceFiles/intro/intro_step.h b/Telegram/SourceFiles/intro/intro_step.h index f265a4a98..32ba62926 100644 --- a/Telegram/SourceFiles/intro/intro_step.h +++ b/Telegram/SourceFiles/intro/intro_step.h @@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/object_ptr.h" #include "mtproto/sender.h" +#include "ui/text/text_variant.h" #include "ui/rp_widget.h" #include "ui/effects/animations.h" @@ -98,9 +99,7 @@ protected: void resizeEvent(QResizeEvent *e) override; void setTitleText(rpl::producer titleText); - void setDescriptionText(rpl::producer descriptionText); - void setDescriptionText( - rpl::producer richDescriptionText); + void setDescriptionText(v::text::data &&descriptionText); bool paintAnimated(QPainter &p, QRect clip); void fillSentCodeData(const MTPDauth_sentCode &type);