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

Fix round video link preview with reactions.

This commit is contained in:
John Preston 2023-11-06 13:39:05 +04:00
parent 61a9d9c01d
commit f7ad91e80c
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/history/view/history_view_message.cpp
View File

@ -683,6 +683,10 @@ QSize Message::performCountOptimalSize() {
std::min(st::msgMaxWidth, reactionsMaxWidth));
if (!mediaDisplayed || _viewButton) {
minHeight += st::mediaInBubbleSkip;
} else if (!media->additionalInfoString().isEmpty()) {
// In round videos in a web page status text is painted
// in the bottom left corner, reactions should be below.
minHeight += st::msgDateFont->height;
}
if (maxWidth >= reactionsMaxWidth) {
minHeight += _reactions->minHeight();

4
Telegram/SourceFiles/history/view/media/history_view_gif.cpp
View File

@ -624,7 +624,9 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
== PaintContext::SkipDrawingParts::Surrounding;
if (!unwrapped && !skipDrawingSurrounding) {
drawCornerStatus(p, context, QPoint());
if (!isRound || !inWebPage) {
drawCornerStatus(p, context, QPoint());
}
} else if (!skipDrawingSurrounding) {
if (isRound) {
const auto mediaUnread = item->hasUnreadMediaFlag();

7
Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
View File

@ -418,13 +418,6 @@ bool ThemeDocument::isReadyForOpen() const {
return !_data || _dataMedia->loaded();
}
QString ThemeDocument::additionalInfoString() const {
// This will force message info (time) to be displayed below
// this attachment in WebPage media.
static auto result = QString(" ");
return result;
}
bool ThemeDocument::hasHeavyPart() const {
return (_dataMedia != nullptr);
}

1
Telegram/SourceFiles/history/view/media/history_view_theme_document.h
View File

@ -46,7 +46,6 @@ public:
return true;
}
bool isReadyForOpen() const override;
QString additionalInfoString() const override;
bool hasHeavyPart() const override;
void unloadHeavyPart() override;

1
Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
View File

@ -710,7 +710,6 @@ TextState WebPage::textState(QPoint point, StateRequest request) const {
auto inner = outer.marginsRemoved(innerMargin());
auto tshift = inner.top();
auto paintw = inner.width();
auto attachAdditionalInfoText = _attach ? _attach->additionalInfoString() : QString();
auto lineHeight = UnitedLineHeight();
auto inThumb = false;

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 65310f32dcc980aeca0b13253b1278a6f3ce722e
Subproject commit 762a611f2009e623d6291ae5564bcd5fa4602e3d