nathan/slide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

- Split ImageAspect into 2 types, ImageAspect for images and ImageAspectScreenFilter for screens

Browse Source 
- Change ImageDetails into a class and add some accessors for the filtering logic for screen aspect and image aspect
This commit is contained in:
Alfred Reynolds
2021-09-08 11:56:47 +12:00
parent 7fef2e5a68
commit 8bb97ed926
8 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mainwindow.cpp
View File

@@ -139,7 +139,7 @@ void MainWindow::checkWindowSize()
if (imageAspectMatchesMonitor)
{
bool isLandscape = screenSize.width() > screenSize.height();
ImageAspect newAspect = isLandscape ? ImageAspect_Landscape : ImageAspect_Portrait;
ImageAspectScreenFilter newAspect = isLandscape ? ImageAspectScreenFilter_Landscape : ImageAspectScreenFilter_Portrait;
if (newAspect != baseImageOptions.onlyAspect)
{
Log("Changing image orientation to ", newAspect);
@@ -218,14 +218,6 @@ void MainWindow::updateImage(bool immediately)
currentImage.width = p.width();
currentImage.height = p.height();
currentImage.rotation = 0;
if (currentImage.width > currentImage.height) {
currentImage.aspect = ImageAspect_Landscape;
} else if (currentImage.height > currentImage.width) {
currentImage.aspect = ImageAspect_Portrait;
} else {
currentImage.aspect = ImageAspect_Any;
}
}
else
{
@@ -331,13 +323,13 @@ QPixmap MainWindow::getScaledPixmap(const QPixmap& p)
{
if (currentImage.options.fitAspectAxisToWindow)
{
if (currentImage.aspect == ImageAspect_Portrait)
if (currentImage.aspect() == ImageAspect_Portrait)
{
// potrait mode, make height of image fit screen and crop top/bottom
QPixmap pTemp = p.scaledToHeight(height(), Qt::SmoothTransformation);
return pTemp.copy(0,0,width(),height());
}
else if (currentImage.aspect == ImageAspect_Landscape)
else if (currentImage.aspect() == ImageAspect_Landscape)
{
// landscape mode, make width of image fit screen and crop top/bottom
QPixmap pTemp = p.scaledToWidth(width(), Qt::SmoothTransformation);
@@ -410,10 +402,10 @@ void MainWindow::warn(std::string text)
void MainWindow::setBaseOptions(const ImageDisplayOptions &baseOptionsIn)
{
baseImageOptions = baseOptionsIn;
if(baseImageOptions.onlyAspect == ImageAspect_Monitor)
if(baseImageOptions.onlyAspect == ImageAspectScreenFilter_Monitor)
{
imageAspectMatchesMonitor = true;
baseImageOptions.onlyAspect = width() >= height() ? ImageAspect_Landscape : ImageAspect_Portrait;
baseImageOptions.onlyAspect = width() >= height() ? ImageAspectScreenFilter_Landscape : ImageAspectScreenFilter_Portrait;
}
}