mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 16:15:13 +00:00
Code Issues Releases Wiki Activity

Fix blurred thumbnails in Shared Links section.

Browse Source
This commit is contained in:
John Preston
2020-12-30 16:12:39 +04:00
parent 1d7fb6c4ce
commit a6eb241ec1
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@@ -1479,9 +1479,8 @@ Link::Link(
int32 tw = 0, th = 0; int32 tw = 0, th = 0;
if (_page && _page->photo) { if (_page && _page->photo) {
const auto photo = _page->photo; const auto photo = _page->photo;
if (photo->inlineThumbnailBytes().isEmpty() if (photo->hasExact(Data::PhotoSize::Small)
&& (photo->hasExact(Data::PhotoSize::Small) || photo->hasExact(Data::PhotoSize::Thumbnail)) {
|| photo->hasExact(Data::PhotoSize::Thumbnail))) {
photo->load(Data::PhotoSize::Small, parent->fullId()); photo->load(Data::PhotoSize::Small, parent->fullId());
} }
tw = style::ConvertScale(photo->width()); tw = style::ConvertScale(photo->width());
@@ -1623,7 +1622,7 @@ void Link::paint(Painter &p, const QRect &clip, TextSelection selection, const P
} }
void Link::validateThumbnail() { void Link::validateThumbnail() {
if (!_thumbnail.isNull()) { if (!_thumbnail.isNull() && !_thumbnailBlurred) {
return; return;
} }
if (_page && _page->photo) { if (_page && _page->photo) {
@@ -1631,12 +1630,16 @@ void Link::validateThumbnail() {
ensurePhotoMediaCreated(); ensurePhotoMediaCreated();
if (const auto thumbnail = _photoMedia->image(PhotoSize::Thumbnail)) { if (const auto thumbnail = _photoMedia->image(PhotoSize::Thumbnail)) {
_thumbnail = thumbnail->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small); _thumbnail = thumbnail->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small);
_thumbnailBlurred = false;
} else if (const auto large = _photoMedia->image(PhotoSize::Large)) { } else if (const auto large = _photoMedia->image(PhotoSize::Large)) {
_thumbnail = large->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small); _thumbnail = large->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small);
_thumbnailBlurred = false;
} else if (const auto small = _photoMedia->image(PhotoSize::Small)) { } else if (const auto small = _photoMedia->image(PhotoSize::Small)) {
_thumbnail = small->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small); _thumbnail = small->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small);
_thumbnailBlurred = false;
} else if (const auto blurred = _photoMedia->thumbnailInline()) { } else if (const auto blurred = _photoMedia->thumbnailInline()) {
_thumbnail = blurred->pixBlurredSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small); _thumbnail = blurred->pixBlurredSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small);
return;
} else { } else {
return; return;
} }
@@ -1644,14 +1647,20 @@ void Link::validateThumbnail() {
delegate()->unregisterHeavyItem(this); delegate()->unregisterHeavyItem(this);
} else if (_page && _page->document && _page->document->hasThumbnail()) { } else if (_page && _page->document && _page->document->hasThumbnail()) {
ensureDocumentMediaCreated(); ensureDocumentMediaCreated();
const auto roundRadius = _page->document->isVideoMessage()
? ImageRoundRadius::Ellipse
: ImageRoundRadius::Small;
if (const auto thumbnail = _documentMedia->thumbnail()) { if (const auto thumbnail = _documentMedia->thumbnail()) {
auto roundRadius = _page->document->isVideoMessage()
? ImageRoundRadius::Ellipse
: ImageRoundRadius::Small;
_thumbnail = thumbnail->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, roundRadius); _thumbnail = thumbnail->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, roundRadius);
_documentMedia = nullptr; _thumbnailBlurred = false;
delegate()->unregisterHeavyItem(this); } else if (const auto blurred = _documentMedia->thumbnailInline()) {
_thumbnail = blurred->pixBlurredSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, roundRadius);
return;
} else {
return;
} }
_documentMedia = nullptr;
delegate()->unregisterHeavyItem(this);
} else { } else {
const auto size = QSize(st::linksPhotoSize, st::linksPhotoSize); const auto size = QSize(st::linksPhotoSize, st::linksPhotoSize);
_thumbnail = QPixmap(size * cIntRetinaFactor()); _thumbnail = QPixmap(size * cIntRetinaFactor());
@@ -1683,6 +1692,7 @@ void Link::validateThumbnail() {
_letter, _letter,
style::al_center); style::al_center);
} }
_thumbnailBlurred = false;
} }
} }

1
Telegram/SourceFiles/overview/overview_layout.h
View File

@@ -368,6 +368,7 @@ private:
int _pixh = 0; int _pixh = 0;
Ui::Text::String _text = { st::msgMinWidth }; Ui::Text::String _text = { st::msgMinWidth };
QPixmap _thumbnail; QPixmap _thumbnail;
bool _thumbnailBlurred = true;
struct LinkEntry { struct LinkEntry {
LinkEntry() : width(0) { LinkEntry() : width(0) {