From e85cb022e22ab9714764cd45b4e288cdabdfc9c7 Mon Sep 17 00:00:00 2001 From: evgeny Date: Wed, 28 Oct 2026 15:02:28 +0100 Subject: [PATCH] Render cached image and video previews without filesystem access or scaled pixmap allocation --- tools/chatgui/src/messagedelegate.cpp | 27 +++++++++++---------------- tools/chatgui/src/messagedelegate.h | 4 ++-- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/chatgui/src/messagedelegate.cpp b/tools/chatgui/src/messagedelegate.cpp index 88653d99f..96eee4dbd 100644 --- a/tools/chatgui/src/messagedelegate.cpp +++ b/tools/chatgui/src/messagedelegate.cpp @@ -1212,25 +1212,21 @@ void MessageDelegate::paintBody(QPainter* painter, const QStyleOptionViewItem& o drawBubble(painter, L, option); if (!L.narrow) drawAvatar(painter, L, index); - QString filePath = index.data(MsgVoiceFileRole).toString(); int dlState = index.data(MsgFileDownloadStateRole).toInt(); - QString thumbPath = filePath + ".jpg"; painter->save(); painter->setRenderHint(QPainter::Antialiasing); + painter->setRenderHint(QPainter::SmoothPixmapTransform); QPainterPath clip; clip.addRoundedRect(L.videoThumbRect, kRadius, kRadius); painter->setClipPath(clip); - QPixmap thumb; - if (!thumbPath.isEmpty() && QFile::exists(thumbPath)) - thumb.load(thumbPath); + const QImage thumb = index.data(MsgImagePreviewRole).value(); if (!thumb.isNull()) { - QPixmap scaled = thumb.scaled(L.videoThumbRect.size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); - int dx = (scaled.width() - L.videoThumbRect.width()) / 2; - int dy = (scaled.height() - L.videoThumbRect.height()) / 2; - painter->drawPixmap(L.videoThumbRect.topLeft(), scaled, QRect(dx, dy, L.videoThumbRect.width(), L.videoThumbRect.height())); + QSize source = L.videoThumbRect.size().scaled(thumb.size(), Qt::KeepAspectRatio); + QRect crop(QPoint((thumb.width() - source.width()) / 2, (thumb.height() - source.height()) / 2), source); + painter->drawImage(L.videoThumbRect, thumb, crop); } else { painter->fillRect(L.videoThumbRect, QColor(30, 30, 35)); QFont iconFont = option.font; @@ -1335,14 +1331,13 @@ void MessageDelegate::paintBody(QPainter* painter, const QStyleOptionViewItem& o painter->setClipPath(clip); const QImage image = index.data(MsgImagePreviewRole).value(); - const QPixmap img = QPixmap::fromImage(image); - - if (!img.isNull()) { + if (!image.isNull()) { painter->fillRect(L.imageThumbRect, QColor(20, 20, 24)); - QPixmap scaled = img.scaled(L.imageThumbRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); - int dx = (L.imageThumbRect.width() - scaled.width()) / 2; - int dy = (L.imageThumbRect.height() - scaled.height()) / 2; - painter->drawPixmap(L.imageThumbRect.left() + dx, L.imageThumbRect.top() + dy, scaled); + painter->setRenderHint(QPainter::SmoothPixmapTransform); + QSize fitted = image.size().scaled(L.imageThumbRect.size(), Qt::KeepAspectRatio); + QPoint origin(L.imageThumbRect.left() + (L.imageThumbRect.width() - fitted.width()) / 2, + L.imageThumbRect.top() + (L.imageThumbRect.height() - fitted.height()) / 2); + painter->drawImage(QRect(origin, fitted), image); } else { painter->fillRect(L.imageThumbRect, QColor(30, 30, 35)); QFont iconFont = option.font; diff --git a/tools/chatgui/src/messagedelegate.h b/tools/chatgui/src/messagedelegate.h index 2e19631fc..53717a553 100644 --- a/tools/chatgui/src/messagedelegate.h +++ b/tools/chatgui/src/messagedelegate.h @@ -55,8 +55,8 @@ enum MessageDataRole { MsgHighlightRole = Qt::UserRole + 41, MsgEncryptedRole = Qt::UserRole + 42, MsgVersionRole = Qt::UserRole + 43, - MsgImagePreviewRole = Qt::UserRole + 44, /* QImage ограниченного размера, подготовленный worker. */ - MsgImageErrorRole = Qt::UserRole + 45, /* Локальный файл не декодируется; показать читаемую ошибку. */ + MsgImagePreviewRole = Qt::UserRole + 44, /* QImage картинки либо первого видеокадра из общего кеша, подготовленный worker. */ + MsgImageErrorRole = Qt::UserRole + 45, /* Ошибка подготовки локального медиа; не повторять до изменения исходника/загрузки. */ }; class MessageDelegate : public QStyledItemDelegate {