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

Closed beta 10019010: unified attach button, new intro, new stickers.

Browse Source 
Now all files sending is confirmed before preparing for sending.
You can paste from clipboard and drag many files at once.
This commit is contained in:
John Preston
2016-11-28 18:45:07 +03:00
parent 26c08236cd
commit 3cff50009c
92 changed files with 1702 additions and 1588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/app.cpp
View File

@@ -2533,20 +2533,15 @@ namespace {
exif_data_free(exifData);
}
#endif // OS_MAC_OLD
} else if (opaque && result.hasAlphaChannel()) {
QImage solid(result.width(), result.height(), QImage::Format_ARGB32_Premultiplied);
solid.fill(st::imageBgTransparent->c);
{
QPainter(&solid).drawImage(0, 0, result);
}
result = solid;
} else if (opaque) {
result = Images::prepareOpaque(std_::move(result));
}
return result;
}
QImage readImage(const QString &file, QByteArray *format, bool opaque, bool *animated, QByteArray *content) {
QFile f(file);
if (f.size() > MediaViewImageSizeLimit || !f.open(QIODevice::ReadOnly)) {
if (f.size() > kImageSizeLimit || !f.open(QIODevice::ReadOnly)) {
if (animated) *animated = false;
return QImage();
}
@@ -2557,7 +2552,7 @@ namespace {
}
QPixmap pixmapFromImageInPlace(QImage &&image) {
return QPixmap::fromImage(std_::forward<QImage>(image), Qt::ColorOnly);
return QPixmap::fromImage(std_::move(image), Qt::ColorOnly);
}
void regPhotoItem(PhotoData *data, HistoryItem *item) {