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

upload radial progress and upload cancel done, photo / file / audio autodownload settings respected

Browse Source
This commit is contained in:
John Preston
2015-12-24 22:26:28 +03:00
parent 7c7d517b34
commit 4ed2d75c74
32 changed files with 2011 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/app.cpp
View File

@@ -1176,7 +1176,7 @@ namespace App {
case 'm': newThumbLevel = 2; newMediumLevel = 0; newFullLevel = 3; break; // box 320x320
case 'x': newThumbLevel = 5; newMediumLevel = 3; newFullLevel = 1; break; // box 800x800
case 'y': newThumbLevel = 6; newMediumLevel = 6; newFullLevel = 0; break; // box 1280x1280
case 'w': newThumbLevel = 8; newMediumLevel = 8; newFullLevel = 2; break; // box 2560x2560
case 'w': newThumbLevel = 8; newMediumLevel = 8; newFullLevel = 2; break; // box 2560x2560 // if loading this fix HistoryPhoto::updateFrom
case 'a': newThumbLevel = 1; newMediumLevel = 4; newFullLevel = 8; break; // crop 160x160
case 'b': newThumbLevel = 3; newMediumLevel = 1; newFullLevel = 7; break; // crop 320x320
case 'c': newThumbLevel = 4; newMediumLevel = 2; newFullLevel = 6; break; // crop 640x640
@@ -1431,6 +1431,8 @@ namespace App {
photosData.erase(i);
}
convert->id = photo;
delete convert->uploadingData;
convert->uploadingData = 0;
}
convert->access = access;
if (!convert->date && date) {
@@ -1624,7 +1626,7 @@ namespace App {
}
}
}
if (convert->sticker() && !convert->sticker()->loc.dc && thumbLocation.dc) {
if (convert->sticker() && convert->sticker()->loc.isNull() && !thumbLocation.isNull()) {
convert->sticker()->loc = thumbLocation;
}
@@ -1671,7 +1673,7 @@ namespace App {
}
}
}
if (result->sticker() && !result->sticker()->loc.dc && thumbLocation.dc) {
if (result->sticker() && result->sticker()->loc.isNull() && !thumbLocation.isNull()) {
result->sticker()->loc = thumbLocation;
}
}