mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 00:46:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into video

Browse Source 
Conflicts:
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/ui/animation.cpp
	Telegram/Telegram.pro
This commit is contained in:
John Preston
2016-07-11 21:12:10 +03:00
parent 356b48bcca 5c474aee27
commit d806d079a2
65 changed files with 1990 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/structs.cpp
View File

@@ -186,11 +186,11 @@ StorageKey PeerData::userpicUniqueKey() const {
}
void PeerData::saveUserpic(const QString &path, int size) const {
currentUserpic()->pixRounded(size, size).save(path, "PNG");
currentUserpic()->pixRounded(ImageRoundRadius::Small, size, size).save(path, "PNG");
}
QPixmap PeerData::genUserpic(int size) const {
return currentUserpic()->pixRounded(size, size);
return currentUserpic()->pixRounded(ImageRoundRadius::Small, size, size);
}
const Text &BotCommand::descriptionText() const {
@@ -993,8 +993,6 @@ void DocumentOpenClickHandler::doOpen(DocumentData *data, ActionOnLoad action) {
auto filepath = location.name();
if (documentIsValidMediaFile(filepath)) {
psOpenFile(filepath);
} else {
psShowInFolder(filepath);
}
if (App::main()) App::main()->mediaMarkRead(data);
} else if (data->size < MediaViewImageSizeLimit) {
@@ -1290,8 +1288,6 @@ void DocumentData::performActionOnLoad() {
if (voice() || song() || isVideo()) {
if (documentIsValidMediaFile(already)) {
psOpenFile(already);
} else {
psShowInFolder(already);
}
if (App::main()) App::main()->mediaMarkRead(this);
} else if (loc.accessEnable()) {