From dc146cb1fe8c2850a3c5ba5dfd663f5a67fea3ab Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 25 Dec 2019 13:12:00 +0300 Subject: [PATCH] Blur small thumbnails. --- .../history/view/media/history_view_gif.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp index 6469c30b3..783bf3baf 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp @@ -38,6 +38,7 @@ namespace HistoryView { namespace { constexpr auto kMaxGifForwardedBarLines = 4; +constexpr auto kUseNonBlurredThreshold = 160; int gifMaxStatusWidth(DocumentData *document) { auto result = st::normalFont->width(formatDownloadText(document->size, document->size)); @@ -392,7 +393,12 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms } const auto normal = _data->thumbnail(); if (normal && normal->loaded()) { - p.drawPixmap(rthumb.topLeft(), normal->pixSingle(_realParent->fullId(), _thumbw, _thumbh, usew, painth, roundRadius, roundCorners)); + if (normal->width() >= kUseNonBlurredThreshold + && normal->height() >= kUseNonBlurredThreshold) { + p.drawPixmap(rthumb.topLeft(), normal->pixSingle(_realParent->fullId(), _thumbw, _thumbh, usew, painth, roundRadius, roundCorners)); + } else { + p.drawPixmap(rthumb.topLeft(), normal->pixBlurredSingle(_realParent->fullId(), _thumbw, _thumbh, usew, painth, roundRadius, roundCorners)); + } } else if (const auto blurred = _data->thumbnailInline()) { p.drawPixmap(rthumb.topLeft(), blurred->pixBlurredSingle(_realParent->fullId(), _thumbw, _thumbh, usew, painth, roundRadius, roundCorners)); } else if (!isRound) { @@ -1091,6 +1097,10 @@ void Gif::validateGroupedCache( : useThumb ? thumb : _data->thumbnailInline(); + const auto blur = !useGood + && (!useThumb + || (thumb->width() < kUseNonBlurredThreshold) + || (thumb->height() < kUseNonBlurredThreshold)); if (good && !useGood) { good->load({}); } @@ -1100,7 +1110,7 @@ void Gif::validateGroupedCache( const auto height = geometry.height(); const auto options = Option::Smooth | Option::RoundedLarge - | (useGood ? Option(0) : Option::Blurred) + | (blur ? Option(0) : Option::Blurred) | ((corners & RectPart::TopLeft) ? Option::RoundedTopLeft : Option::None) | ((corners & RectPart::TopRight) ? Option::RoundedTopRight : Option::None) | ((corners & RectPart::BottomLeft) ? Option::RoundedBottomLeft : Option::None)