mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Move photo data to Data::PhotoMedia.

Browse Source
This commit is contained in:
John Preston
2020-05-25 18:16:04 +04:00
parent 24fed8105c
commit e27d2bc2d5
51 changed files with 1628 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Telegram/SourceFiles/window/window_media_preview.cpp
View File

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_media_preview.h"
#include "data/data_photo.h"
#include "data/data_photo_media.h"
#include "data/data_document.h"
#include "data/data_document_media.h"
#include "ui/image/image.h"
@@ -114,6 +115,7 @@ void MediaPreviewWidget::showPreview(
startShow();
_origin = origin;
_photo = nullptr;
_photoMedia = nullptr;
_document = document;
_documentMedia = _document->createMediaView();
_documentMedia->thumbnailWanted(_origin);
@@ -128,9 +130,10 @@ void MediaPreviewWidget::showPreview(
not_null<PhotoData*> photo) {
startShow();
_origin = origin;
_photo = photo;
_document = nullptr;
_documentMedia = nullptr;
_photo = photo;
_photoMedia = _photo->createMediaView();
fillEmojiString();
resetGifAndCache();
}
@@ -159,6 +162,7 @@ void MediaPreviewWidget::hidePreview() {
_hiding = true;
_a_shown.start([=] { update(); }, 1., 0., st::stickerPreviewDuration);
_photo = nullptr;
_photoMedia = nullptr;
_document = nullptr;
_documentMedia = nullptr;
resetGifAndCache();
@@ -296,30 +300,31 @@ QPixmap MediaPreviewWidget::currentImage() const {
}
} else if (_photo) {
if (_cacheStatus != CacheLoaded) {
if (_photo->loaded()) {
if (_photoMedia->loaded()) {
QSize s = currentDimensions();
_cache = _photo->large()->pix(_origin, s.width(), s.height());
_cache = _photoMedia->image(Data::PhotoSize::Large)->pix(_origin, s.width(), s.height());
_cacheStatus = CacheLoaded;
} else {
_photo->load(_origin);
if (_cacheStatus != CacheThumbLoaded) {
QSize s = currentDimensions();
if (_photo->thumbnail()->loaded()) {
_cache = _photo->thumbnail()->pixBlurred(_origin, s.width(), s.height());
if (const auto thumbnail = _photoMedia->image(
Data::PhotoSize::Thumbnail)) {
_cache = thumbnail->pixBlurred(_origin, s.width(), s.height());
_cacheStatus = CacheThumbLoaded;
} else if (_photo->thumbnailSmall()->loaded()) {
_cache = _photo->thumbnailSmall()->pixBlurred(_origin, s.width(), s.height());
} else if (const auto small = _photoMedia->image(
Data::PhotoSize::Small)) {
_cache = small->pixBlurred(_origin, s.width(), s.height());
_cacheStatus = CacheThumbLoaded;
} else if (const auto blurred = _photo->thumbnailInline()) {
} else if (const auto blurred = _photoMedia->thumbnailInline()) {
_cache = blurred->pixBlurred(_origin, s.width(), s.height());
_cacheStatus = CacheThumbLoaded;
} else {
_photo->thumbnailSmall()->load(_origin);
_photoMedia->wanted(Data::PhotoSize::Small, _origin);
}
}
}
}
}
return _cache;
}

6
Telegram/SourceFiles/window/window_media_preview.h
View File

@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/rp_widget.h"
namespace Data {
class PhotoMedia;
class DocumentMedia;
} // namespace Data
@@ -60,9 +61,10 @@ private:
Ui::Animations::Simple _a_shown;
bool _hiding = false;
Data::FileOrigin _origin;
DocumentData *_document = nullptr;
std::shared_ptr<Data::DocumentMedia> _documentMedia;
PhotoData *_photo = nullptr;
DocumentData *_document = nullptr;
std::shared_ptr<Data::PhotoMedia> _photoMedia;
std::shared_ptr<Data::DocumentMedia> _documentMedia;
Media::Clip::ReaderPointer _gif, _gifThumbnail;
crl::time _gifLastPosition = 0;
std::unique_ptr<Lottie::SinglePlayer> _lottie;