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

Fix name/fwd/reply/viabot info display for media.

This commit is contained in:
John Preston 2017-06-28 19:16:21 +03:00
parent 6f90dc2374
commit 545915e481
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/history/history_message.cpp
View File

@ -551,7 +551,8 @@ void HistoryMessage::updateMediaInBubbleState() {
auto getMediaHasSomethingAbove = [this] {
return displayFromName() || displayForwardedFrom() || Has<HistoryMessageReply>() || Has<HistoryMessageVia>();
};
if (auto entry = Get<HistoryMessageLogEntryOriginal>()) {
auto entry = Get<HistoryMessageLogEntryOriginal>();
if (entry) {
mediaHasSomethingBelow = true;
mediaHasSomethingAbove = getMediaHasSomethingAbove();
auto entryState = (mediaHasSomethingAbove || !emptyText() || (_media && _media->isDisplayed())) ? MediaInBubbleState::Bottom : MediaInBubbleState::None;
@ -566,6 +567,9 @@ void HistoryMessage::updateMediaInBubbleState() {
return;
}
if (!entry) {
mediaHasSomethingAbove = getMediaHasSomethingAbove();
}
if (!emptyText()) {
if (_media->isAboveMessage()) {
mediaHasSomethingBelow = true;