From b6fbdd25a017f6c331cc541ac7c49fc6e57b56a6 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 24 Apr 2023 21:12:52 +0400 Subject: [PATCH] Show video radial above the spoiler. --- .../history/view/media/history_view_gif.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp index a4e8a372d..a395f8f09 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp @@ -536,6 +536,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const { if (radial || (!streamingMode && ((!loaded && !_data->loading()) || !autoplay))) { + const auto radialRevealed = 1.; const auto opacity = (item->isSending() || _data->uploading()) ? 1. : streamedForWaiting @@ -543,7 +544,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const { : (radial && loaded) ? _animation->radial.opacity() : 1.; - const auto radialOpacity = opacity * revealed; + const auto radialOpacity = opacity * radialRevealed; const auto innerSize = st::msgFileLayout.thumbSize; auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize); p.setPen(Qt::NoPen); @@ -581,7 +582,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const { if (icon) { icon->paintInCenter(p, inner); } - p.setOpacity(revealed); + p.setOpacity(radialRevealed); if (radial) { QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); if (streamedForWaiting && !_data->uploading()) { @@ -1295,6 +1296,7 @@ void Gif::drawGrouped( if (radial || (!streamingMode && ((!loaded && !_data->loading()) || !autoplay))) { + const auto radialRevealed = 1.; const auto opacity = (item->isSending() || _data->uploading()) ? 1. : streamedForWaiting @@ -1302,7 +1304,7 @@ void Gif::drawGrouped( : (radial && loaded) ? _animation->radial.opacity() : 1.; - const auto radialOpacity = opacity * revealed; + const auto radialOpacity = opacity * radialRevealed; const auto radialSize = st::historyGroupRadialSize; const auto inner = QRect( geometry.x() + (geometry.width() - radialSize) / 2, @@ -1353,7 +1355,7 @@ void Gif::drawGrouped( icon->paintInCenter(p, inner); } } - p.setOpacity(revealed); + p.setOpacity(radialRevealed); if (radial) { const auto line = st::historyGroupRadialLine; const auto rinner = inner.marginsRemoved({ line, line, line, line });