procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
John Preston 2017-06-06 12:16:56 +03:00
parent 6869cc7d04
commit 0e4b057220
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/structs.cpp
View File

@ -1811,7 +1811,7 @@ ImagePtr DocumentData::makeReplyPreview() {
if (h <= 0) h = 1; 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); auto thumbSize = (w > h) ? QSize(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) : QSize(st::msgReplyBarSize.height(), h * st::msgReplyBarSize.height() / w);
thumbSize *= cIntRetinaFactor(); 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 outerSize = st::msgReplyBarSize.height();
auto image = thumb->pixNoCache(thumbSize.width(), thumbSize.height(), options, outerSize, outerSize); auto image = thumb->pixNoCache(thumbSize.width(), thumbSize.height(), options, outerSize, outerSize);
replyPreview = ImagePtr(image, "PNG"); replyPreview = ImagePtr(image, "PNG");

5
Telegram/SourceFiles/ui/images.cpp
View File

@ -312,8 +312,11 @@ QImage prepare(QImage img, int w, int h, Images::Options options, int outerw, in
outerh *= cIntRetinaFactor(); outerh *= cIntRetinaFactor();
if (outerw != w || outerh != h) { if (outerw != w || outerh != h) {
img.setDevicePixelRatio(cRetinaFactor()); img.setDevicePixelRatio(cRetinaFactor());
QImage result(outerw, outerh, QImage::Format_ARGB32_Premultiplied); auto result = QImage(outerw, outerh, QImage::Format_ARGB32_Premultiplied);
result.setDevicePixelRatio(cRetinaFactor()); result.setDevicePixelRatio(cRetinaFactor());
if (options & Images::Option::TransparentBackground) {
result.fill(Qt::transparent);
}
{ {
QPainter p(&result); QPainter p(&result);
if (w < outerw || h < outerh) { if (w < outerw || h < outerh) {

1
Telegram/SourceFiles/ui/images.h
View File

@ -197,6 +197,7 @@ enum class Option {
RoundedBottomLeft = 0x080, RoundedBottomLeft = 0x080,
RoundedBottomRight = 0x100, RoundedBottomRight = 0x100,
Colored = 0x200, Colored = 0x200,
TransparentBackground = 0x400,
}; };
Q_DECLARE_FLAGS(Options, Option); Q_DECLARE_FLAGS(Options, Option);
Q_DECLARE_OPERATORS_FOR_FLAGS(Options); Q_DECLARE_OPERATORS_FOR_FLAGS(Options);