From 0e4b0572204104360e79df91be1918799258fc97 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 6 Jun 2017 12:16:56 +0300 Subject: [PATCH] Fix transparent reply previews. The transparent reply previews (for stickers) were not filled by transparent background before resizing, now there is a flag for that. --- Telegram/SourceFiles/structs.cpp | 2 +- Telegram/SourceFiles/ui/images.cpp | 5 ++++- Telegram/SourceFiles/ui/images.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index ab002789e..7b0978ac0 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -1811,7 +1811,7 @@ ImagePtr DocumentData::makeReplyPreview() { if (h <= 0) h = 1; auto thumbSize = (w > h) ? QSize(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) : QSize(st::msgReplyBarSize.height(), h * st::msgReplyBarSize.height() / w); thumbSize *= cIntRetinaFactor(); - auto options = Images::Option::Smooth | (isRoundVideo() ? Images::Option::Circled : Images::Option::None); + auto options = Images::Option::Smooth | (isRoundVideo() ? Images::Option::Circled : Images::Option::None) | Images::Option::TransparentBackground; auto outerSize = st::msgReplyBarSize.height(); auto image = thumb->pixNoCache(thumbSize.width(), thumbSize.height(), options, outerSize, outerSize); replyPreview = ImagePtr(image, "PNG"); diff --git a/Telegram/SourceFiles/ui/images.cpp b/Telegram/SourceFiles/ui/images.cpp index c1a711bf8..8093a78d8 100644 --- a/Telegram/SourceFiles/ui/images.cpp +++ b/Telegram/SourceFiles/ui/images.cpp @@ -312,8 +312,11 @@ QImage prepare(QImage img, int w, int h, Images::Options options, int outerw, in outerh *= cIntRetinaFactor(); if (outerw != w || outerh != h) { img.setDevicePixelRatio(cRetinaFactor()); - QImage result(outerw, outerh, QImage::Format_ARGB32_Premultiplied); + auto result = QImage(outerw, outerh, QImage::Format_ARGB32_Premultiplied); result.setDevicePixelRatio(cRetinaFactor()); + if (options & Images::Option::TransparentBackground) { + result.fill(Qt::transparent); + } { QPainter p(&result); if (w < outerw || h < outerh) { diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h index 3435bd150..a8349e313 100644 --- a/Telegram/SourceFiles/ui/images.h +++ b/Telegram/SourceFiles/ui/images.h @@ -197,6 +197,7 @@ enum class Option { RoundedBottomLeft = 0x080, RoundedBottomRight = 0x100, Colored = 0x200, + TransparentBackground = 0x400, }; Q_DECLARE_FLAGS(Options, Option); Q_DECLARE_OPERATORS_FOR_FLAGS(Options);