procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fixed fast share button's display in section of pinned messages.

Browse source
This commit is contained in:
23rd 2020-10-30 15:13:48 +03:00 committed by John Preston
parent de459fa1fe
commit 9a2fcdde29
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Telegram/SourceFiles/history/view/history_view_message.cpp
View file

@ -2075,7 +2075,7 @@ HistoryMessageReply *Message::displayedReply() const {
} }
bool Message::displayPinIcon() const { bool Message::displayPinIcon() const {
return data()->isPinned() && context() != Context::Pinned; return data()->isPinned() && !isPinnedContext();
} }
bool Message::hasFromName() const { bool Message::hasFromName() const {
@ -2250,7 +2250,7 @@ bool Message::displayFastShare() const {
} }
bool Message::displayGoToOriginal() const { bool Message::displayGoToOriginal() const {
if (context() == Context::Pinned) { if (isPinnedContext()) {
return !hasOutLayout(); return !hasOutLayout();
} }
const auto item = message(); const auto item = message();
@ -2305,16 +2305,17 @@ void Message::drawRightAction(
views->repliesSmall.text, views->repliesSmall.text,
views->repliesSmall.textWidth); views->repliesSmall.textWidth);
} }
} else if (displayFastShare()) {
st::historyFastShareIcon.paintInCenter(p, { left, top, size->width(), size->height() });
} else { } else {
st::historyGoToOriginalIcon.paintInCenter(p, { left, top, size->width(), size->height() }); const auto &icon = (displayFastShare() && !isPinnedContext())
? st::historyFastShareIcon
: st::historyGoToOriginalIcon;
icon.paintInCenter(p, { left, top, size->width(), size->height() });
} }
} }
ClickHandlerPtr Message::rightActionLink() const { ClickHandlerPtr Message::rightActionLink() const {
if (!_rightActionLink) { if (!_rightActionLink) {
if (context() == Context::Pinned) { if (isPinnedContext()) {
_rightActionLink = goToMessageClickHandler(data()); _rightActionLink = goToMessageClickHandler(data());
return _rightActionLink; return _rightActionLink;
} else if (displayRightActionComments()) { } else if (displayRightActionComments()) {
@ -2390,6 +2391,10 @@ ClickHandlerPtr Message::fastReplyLink() const {
return _fastReplyLink; return _fastReplyLink;
} }
bool Message::isPinnedContext() const {
return context() == Context::Pinned;
}
void Message::updateMediaInBubbleState() { void Message::updateMediaInBubbleState() {
const auto item = message(); const auto item = message();
const auto media = this->media(); const auto media = this->media();

2
Telegram/SourceFiles/history/view/history_view_message.h
View file

@ -176,6 +176,8 @@ private:
QSize performCountCurrentSize(int newWidth) override; QSize performCountCurrentSize(int newWidth) override;
bool hasVisibleText() const override; bool hasVisibleText() const override;
[[nodiscard]] bool isPinnedContext() const;
[[nodiscard]] bool displayFastShare() const; [[nodiscard]] bool displayFastShare() const;
[[nodiscard]] bool displayGoToOriginal() const; [[nodiscard]] bool displayGoToOriginal() const;
[[nodiscard]] ClickHandlerPtr fastReplyLink() const; [[nodiscard]] ClickHandlerPtr fastReplyLink() const;