RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crash in caption spoiler opening.

This commit is contained in:
John Preston 2022-09-23 11:59:46 +04:00
parent 8fc35e45e4
commit d4a2c4a151
2 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.cpp
View File

@ -15,52 +15,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/weak_ptr.h"
namespace HistoryView {
namespace {
class AnimatedSpoilerClickHandler final : public ClickHandler {
public:
AnimatedSpoilerClickHandler(
not_null<Element*> view,
Ui::Text::String &text);
void onClick(ClickContext context) const override;
private:
base::weak_ptr<Element> _weak;
Ui::Text::String &_text;
};
AnimatedSpoilerClickHandler::AnimatedSpoilerClickHandler(
not_null<Element*> view,
Ui::Text::String &text)
: _weak(view)
, _text(text) {
}
void AnimatedSpoilerClickHandler::onClick(ClickContext context) const {
const auto button = context.button;
const auto view = _weak.get();
if (button != Qt::LeftButton || !view) {
return;
}
const auto my = context.other.value<ClickHandlerContext>();
if (const auto d = my.elementDelegate ? my.elementDelegate() : nullptr) {
_text.setSpoilerRevealed(true, anim::type::normal);
if (const auto controller = my.sessionWindow.get()) {
controller->session().data().registerShownSpoiler(view);
}
}
}
} // namespace
void FillTextWithAnimatedSpoilers(
not_null<Element*> view,
Ui::Text::String &text) {
if (text.hasSpoilers()) {
text.setSpoilerLink(
std::make_shared<AnimatedSpoilerClickHandler>(view, text));
text.setSpoilerLinkFilter([weak = base::make_weak(view.get())](
const ClickContext &context) {
const auto my = context.other.value<ClickHandlerContext>();
const auto button = context.button;
const auto view = weak.get();
if (button != Qt::LeftButton || !view || !my.elementDelegate) {
return false;
} else if (const auto d = my.elementDelegate()) {
if (const auto controller = my.sessionWindow.get()) {
controller->session().data().registerShownSpoiler(view);
}
return true;
}
return false;
});
}
}

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit d57bf79ce0862fda1093d9b9acfeff94c80a96f8
Subproject commit 0f7714390552c4071ccdf3b1c34f8cd33f759b4d