blumia/pineapple-pictures
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: simplified long image mode code

Browse Source
This commit is contained in:
Gary Wang
2025-08-05 00:06:05 +08:00
parent 591b01a83a
commit f4f7d93e38
2 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/graphicsview.cpp
View File

@ -280,33 +280,7 @@ bool GraphicsView::isLongImage() const
return aspectRatio > 2.5 || aspectRatio < 0.4; return aspectRatio > 2.5 || aspectRatio < 0.4;
} }
bool GraphicsView::shouldEnterLongImageMode() const void GraphicsView::fitLongImage()
{
// Check if long image mode is enabled in settings
if (!Settings::instance()->autoLongImageMode()) return false;
// Check if image is a long image
if (!isLongImage()) return false;
// Check if transformed image size is larger than the size of the view
QSizeF imageSize = transform().mapRect(sceneRect()).size();
QSizeF viewSize = viewport()->size();
return imageSize.width() > viewSize.width() || imageSize.height() > viewSize.height();
}
void GraphicsView::applyLongImageMode()
{
if (!shouldEnterLongImageMode()) {
m_longImageMode = false;
return;
}
m_longImageMode = true;
applyLongImageModeDirect();
}
void GraphicsView::applyLongImageModeDirect()
{ {
// Determine image orientation based on current transform // Determine image orientation based on current transform
QRectF transformedRect = transform().mapRect(sceneRect()); QRectF transformedRect = transform().mapRect(sceneRect());
@ -324,11 +298,6 @@ void GraphicsView::applyLongImageModeDirect()
} }
} }
bool GraphicsView::isInLongImageMode() const
{
return m_longImageMode;
}
void GraphicsView::displayScene() void GraphicsView::displayScene()
{ {
if (shouldAvoidTransform()) { if (shouldAvoidTransform()) {
@ -337,16 +306,15 @@ void GraphicsView::displayScene()
} }
// Check if should apply long image mode // Check if should apply long image mode
if (shouldEnterLongImageMode()) { if (Settings::instance()->autoLongImageMode() && isLongImage()) {
applyLongImageMode(); m_longImageMode = true;
m_firstUserMediaLoaded = true; m_firstUserMediaLoaded = true;
if (isSceneBiggerThanView()) fitLongImage();
return; return;
} }
// Not in long image mode
m_longImageMode = false;
if (isSceneBiggerThanView()) { if (isSceneBiggerThanView()) {
// Do fit-in-view
fitInView(sceneRect(), Qt::KeepAspectRatio); fitInView(sceneRect(), Qt::KeepAspectRatio);
// After fitInView, the image should fit the window, so hide navigator // After fitInView, the image should fit the window, so hide navigator
emit navigatorViewRequired(false, transform()); emit navigatorViewRequired(false, transform());
@ -355,6 +323,7 @@ void GraphicsView::displayScene()
emit navigatorViewRequired(false, transform()); emit navigatorViewRequired(false, transform());
} }
m_longImageMode = false;
m_enableFitInView = true; m_enableFitInView = true;
m_firstUserMediaLoaded = true; m_firstUserMediaLoaded = true;
} }
@ -455,7 +424,7 @@ void GraphicsView::resizeEvent(QResizeEvent *event)
// In long image mode, reapply long image logic on resize // In long image mode, reapply long image logic on resize
// We directly apply the long image mode logic without rechecking // We directly apply the long image mode logic without rechecking
// if we should enter long image mode, as the mode is already active // if we should enter long image mode, as the mode is already active
applyLongImageModeDirect(); fitLongImage();
} else if (m_enableFitInView) { } else if (m_enableFitInView) {
bool originalSizeSmallerThanWindow = isThingSmallerThanWindowWith(resetScale(transform())); bool originalSizeSmallerThanWindow = isThingSmallerThanWindowWith(resetScale(transform()));
if (originalSizeSmallerThanWindow && scaleFactor() >= 1) { if (originalSizeSmallerThanWindow && scaleFactor() >= 1) {

5
app/graphicsview.h
View File

@ -48,10 +48,7 @@ public:
// Long image mode support // Long image mode support
bool isLongImage() const; bool isLongImage() const;
bool shouldEnterLongImageMode() const; void fitLongImage();
void applyLongImageMode();
void applyLongImageModeDirect();
bool isInLongImageMode() const;
signals: signals:
void navigatorViewRequired(bool required, QTransform transform); void navigatorViewRequired(bool required, QTransform transform);