diff --git a/ui/text/text.cpp b/ui/text/text.cpp index 60cc4ea..4773df7 100644 --- a/ui/text/text.cpp +++ b/ui/text/text.cpp @@ -147,14 +147,21 @@ bool IsBad(QChar ch) { } // namespace Text } // namespace Ui -const TextParseOptions _defaultOptions = { +const TextParseOptions kDefaultTextOptions = { TextParseLinks | TextParseMultiline, // flags 0, // maxw 0, // maxh Qt::LayoutDirectionAuto, // dir }; -const TextParseOptions _textPlainOptions = { +const TextParseOptions kMarkupTextOptions = { + TextParseLinks | TextParseMultiline | TextParseMarkdown, // flags + 0, // maxw + 0, // maxh + Qt::LayoutDirectionAuto, // dir +}; + +const TextParseOptions kPlainTextOptions = { TextParseMultiline, // flags 0, // maxw 0, // maxh diff --git a/ui/text/text.h b/ui/text/text.h index b27fd80..3927652 100644 --- a/ui/text/text.h +++ b/ui/text/text.h @@ -29,7 +29,9 @@ struct TextParseOptions { int32 maxh; Qt::LayoutDirection dir; }; -extern const TextParseOptions _defaultOptions, _textPlainOptions; +extern const TextParseOptions kDefaultTextOptions; +extern const TextParseOptions kMarkupTextOptions; +extern const TextParseOptions kPlainTextOptions; enum class TextSelectType { Letters = 0x01, @@ -102,7 +104,7 @@ public: String( const style::TextStyle &st, const QString &text, - const TextParseOptions &options = _defaultOptions, + const TextParseOptions &options = kDefaultTextOptions, int32 minResizeWidth = QFIXED_MAX); String(const String &other) = default; String(String &&other) = default; @@ -113,8 +115,8 @@ public: int countWidth(int width, bool breakEverywhere = false) const; int countHeight(int width, bool breakEverywhere = false) const; void countLineWidths(int width, QVector *lineWidths, bool breakEverywhere = false) const; - void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = _defaultOptions); - void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = _defaultOptions, const std::any &context = {}); + void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = kDefaultTextOptions); + void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = kMarkupTextOptions, const std::any &context = {}); void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk); bool hasLinks() const; diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp index acf7bf4..e875ec5 100644 --- a/ui/widgets/tooltip.cpp +++ b/ui/widgets/tooltip.cpp @@ -85,7 +85,7 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip * _point = m; _st = st; - _text = Text::String(_st->textStyle, text, _textPlainOptions, _st->widthMax); + _text = Text::String(_st->textStyle, text, kPlainTextOptions, _st->widthMax); _useTransparency = Platform::TranslucentWindowsSupported(_point); setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);