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

Use HistoryMedia as view, add Data::Media.

Browse Source
This commit is contained in:
John Preston
2018-01-14 19:02:25 +03:00
parent 97a9089ebf
commit 7425e80f05
66 changed files with 4463 additions and 3130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Telegram/SourceFiles/data/data_document.cpp
View File

@@ -285,15 +285,15 @@ void DocumentOpenClickHandler::doOpen(
if (App::main()) App::main()->mediaMarkRead(data);
} else if (data->size < App::kImageSizeLimit) {
if (!data->data().isEmpty() && playAnimation) {
if (action == ActionOnLoadPlayInline && context && context->getMedia()) {
context->getMedia()->playInline();
if (action == ActionOnLoadPlayInline && context) {
Auth().data().requestItemPlayInline(context);
} else {
Messenger::Instance().showDocument(data, context);
}
} else if (location.accessEnable()) {
if (data->isAnimation() || QImageReader(location.name()).canRead()) {
if (action == ActionOnLoadPlayInline && context && context->getMedia()) {
context->getMedia()->playInline();
if (action == ActionOnLoadPlayInline && context) {
Auth().data().requestItemPlayInline(context);
} else {
Messenger::Instance().showDocument(data, context);
}
@@ -548,7 +548,10 @@ void DocumentData::performActionOnLoad() {
auto showImage = !isVideoFile() && (size < App::kImageSizeLimit);
auto playVoice = isVoiceMessage() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen);
auto playMusic = isAudioFile() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen);
auto playAnimation = isAnimation() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen) && showImage && item && item->getMedia();
auto playAnimation = isAnimation()
&& (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen)
&& showImage
&& item;
if (auto applyTheme = isTheme()) {
if (!loc.isEmpty() && loc.accessEnable()) {
Messenger::Instance().showDocument(this, item);
@@ -588,8 +591,8 @@ void DocumentData::performActionOnLoad() {
}
} else if (playAnimation) {
if (loaded()) {
if (_actionOnLoad == ActionOnLoadPlayInline && item->getMedia()) {
item->getMedia()->playInline();
if (_actionOnLoad == ActionOnLoadPlayInline && item) {
Auth().data().requestItemPlayInline(item);
} else {
Messenger::Instance().showDocument(this, item);
}
@@ -607,8 +610,8 @@ void DocumentData::performActionOnLoad() {
if (App::main()) App::main()->mediaMarkRead(this);
} else if (loc.accessEnable()) {
if (showImage && QImageReader(loc.name()).canRead()) {
if (_actionOnLoad == ActionOnLoadPlayInline && item && item->getMedia()) {
item->getMedia()->playInline();
if (_actionOnLoad == ActionOnLoadPlayInline && item) {
Auth().data().requestItemPlayInline(item);
} else {
Messenger::Instance().showDocument(this, item);
}
@@ -764,7 +767,7 @@ void DocumentData::cancel() {
void DocumentData::notifyLayoutChanged() const {
auto &items = App::documentItems();
for (auto item : items.value(const_cast<DocumentData*>(this))) {
Auth().data().markItemLayoutChanged(item);
Auth().data().markItemLayoutChange(item);
}
if (auto items = InlineBots::Layout::documentItems()) {