From f7ad91e80c4e76f543d5e900ca87ac888ab22720 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Nov 2023 13:39:05 +0400
Subject: [PATCH] Fix round video link preview with reactions.

---
 Telegram/SourceFiles/history/view/history_view_message.cpp | 4 ++++
 .../SourceFiles/history/view/media/history_view_gif.cpp    | 4 +++-
 .../history/view/media/history_view_theme_document.cpp     | 7 -------
 .../history/view/media/history_view_theme_document.h       | 1 -
 .../history/view/media/history_view_web_page.cpp           | 1 -
 Telegram/lib_ui                                            | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index d34e417227..dd061d8194 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -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();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 4f11171a82..128797f8f2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -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();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index ad5dfcac1b..0fbc095f8f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -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);
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
index 94549e9514..7ed9bcf91f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
@@ -46,7 +46,6 @@ public:
 		return true;
 	}
 	bool isReadyForOpen() const override;
-	QString additionalInfoString() const override;
 
 	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index a6bb075284..56299bf451 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -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;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 65310f32dc..762a611f20 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 65310f32dcc980aeca0b13253b1278a6f3ce722e
+Subproject commit 762a611f2009e623d6291ae5564bcd5fa4602e3d