mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Alpha 1.1.3: Fix some render in macOS.

Browse Source
This commit is contained in:
John Preston
2017-05-24 17:36:58 +03:00
parent 413be7d76d
commit e0978f86d1
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,11 @@ const QPixmap &circleMask(int width, int height) {
} // namespace
QImage prepareBlur(QImage img) {
QImage::Format fmt = img.format();
auto ratio = img.devicePixelRatio();
auto fmt = img.format();
if (fmt != QImage::Format_RGB32 && fmt != QImage::Format_ARGB32_Premultiplied) {
img = img.convertToFormat(QImage::Format_ARGB32_Premultiplied);
img.setDevicePixelRatio(ratio);
t_assert(!img.isNull());
}
@@ -85,8 +87,9 @@ QImage prepareBlur(QImage img) {
p.fillRect(0, 0, w, h, Qt::transparent);
p.drawImage(QRect(radius, radius, w - 2 * radius, h - 2 * radius), img, QRect(0, 0, w, h));
}
QImage was = img;
img = imgsmall;
imgsmall.setDevicePixelRatio(ratio);
auto was = img;
img = std::move(imgsmall);
imgsmall = QImage();
t_assert(!img.isNull());
@@ -293,7 +296,7 @@ QImage prepareOpaque(QImage image) {
QImage prepare(QImage img, int w, int h, Images::Options options, int outerw, int outerh) {
t_assert(!img.isNull());
if (options.testFlag(Images::Option::Blurred)) {
img = prepareBlur(img);
img = prepareBlur(std::move(img));
t_assert(!img.isNull());
}
if (w <= 0 || (w == img.width() && (h <= 0 || h == img.height()))) {
@@ -752,7 +755,7 @@ QPixmap Image::pixBlurredColoredNoCache(style::color add, int32 w, int32 h) cons
restore();
if (_data.isNull()) return blank()->pix();
QImage img = Images::prepareBlur(_data.toImage());
auto img = Images::prepareBlur(_data.toImage());
if (h <= 0) {
img = img.scaledToWidth(w, Qt::SmoothTransformation);
} else {