mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2026-04-12 15:49:53 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the continuous scroll mode in hdpi screen modes
Some checks failed
Build / Initialization (push) Has been cancelled
Details
Build / Code Format Validation (push) Has been cancelled
Details
Build / Linux (Qt6) (push) Has been cancelled
Details
Build / Linux (Qt6 + 7zip) (push) Has been cancelled
Details
Build / macOS (Qt6 Universal) (push) Has been cancelled
Details
Build / Windows x64 (Qt6) (push) Has been cancelled
Details
Build / Windows ARM64 (Qt6) (push) Has been cancelled
Details
Build / Docker amd64 Image (push) Has been cancelled
Details
Build / Docker arm64 Image (push) Has been cancelled
Details
Build / Publish Dev Builds (push) Has been cancelled
Details
Build / Publish Release (push) Has been cancelled
Details
Build / Publish YACReader10 Pre-release Builds (push) Has been cancelled
Details

Browse Source
This commit is contained in:
luisangelsm
2026-03-07 22:38:33 +01:00
parent fbbccfc608
commit 6317c3a4d0
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
YACReader/continuous_page_widget.cpp
View File

@ -118,7 +118,9 @@ void ContinuousPageWidget::paintEvent(QPaintEvent *event)
}
QPainter painter(this);
scaledPageCache.invalidateForWidth(width());
const qreal dpr = devicePixelRatioF();
const int effectivePixelWidth = std::max(1, qRound(width() * dpr));
scaledPageCache.invalidateForWidth(effectivePixelWidth);
QRect visibleRect = event->rect();
int firstPage = continuousViewModel->pageAtY(visibleRect.top());
@ -143,7 +145,7 @@ void ContinuousPageWidget::paintEvent(QPaintEvent *event)
const QImage *img = render->bufferedImage(i);
if (img && !img->isNull()) {
const QImage *drawable = scaledImageForPaint(i, img, scaled, width());
const QImage *drawable = scaledImageForPaint(i, img, scaled, effectivePixelWidth, dpr);
if (drawable) {
painter.drawImage(pageRect, *drawable);
}
@ -164,15 +166,15 @@ void ContinuousPageWidget::resizeEvent(QResizeEvent *event)
}
}
const QImage *ContinuousPageWidget::scaledImageForPaint(int pageIndex, const QImage *source, const QSize &targetSize, int effectiveWidth)
const QImage *ContinuousPageWidget::scaledImageForPaint(int pageIndex, const QImage *source, const QSize &targetSize, int effectiveWidth, qreal devicePixelRatio)
{
if (!source || source->isNull() || targetSize.isEmpty()) {
return nullptr;
}
if (source->size() == targetSize) {
return source;
}
const qreal dpr = std::max<qreal>(1.0, devicePixelRatio);
const QSize targetPixelSize(std::max(1, qRound(targetSize.width() * dpr)),
std::max(1, qRound(targetSize.height() * dpr)));
scaledPageCache.invalidateForWidth(effectiveWidth);
@ -181,7 +183,7 @@ const QImage *ContinuousPageWidget::scaledImageForPaint(int pageIndex, const QIm
if (it != scaledPageCache.pages.end()) {
const ScaledPageCacheEntry &entry = it.value();
const bool validEntry = entry.sourceCacheKey == sourceKey && entry.sourceSize == source->size() && entry.targetSize == targetSize && !entry.scaledImage.isNull();
const bool validEntry = entry.sourceCacheKey == sourceKey && entry.sourceSize == source->size() && entry.targetSize == targetSize && entry.targetPixelSize == targetPixelSize && qFuzzyCompare(entry.targetDevicePixelRatio, dpr) && !entry.scaledImage.isNull();
if (validEntry) {
return &it.value().scaledImage;
}
@ -191,8 +193,11 @@ const QImage *ContinuousPageWidget::scaledImageForPaint(int pageIndex, const QIm
entry.sourceCacheKey = sourceKey;
entry.sourceSize = source->size();
entry.targetSize = targetSize;
entry.scaledImage = scaleImage(*source, targetSize.width(), targetSize.height(),
entry.targetPixelSize = targetPixelSize;
entry.targetDevicePixelRatio = dpr;
entry.scaledImage = scaleImage(*source, targetPixelSize.width(), targetPixelSize.height(),
Configuration::getConfiguration().getScalingMethod());
entry.scaledImage.setDevicePixelRatio(dpr);
scaledPageCache.pages.insert(pageIndex, std::move(entry));
return &scaledPageCache.pages[pageIndex].scaledImage;