Clean up screen size detection code

Also set a minimum, since it isn't working right in the Qt6 AppImage
jdpurcell · Jan 5, 2025 · d30b210 · d30b210
1 parent b803016
commit d30b210
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/qvimagecore.cpp b/src/qvimagecore.cpp
@@ -29,23 +29,11 @@ QVImageCore::QVImageCore(QObject *parent) : QObject(parent)
         loadPixmap(loadFutureWatcher.result());
     });
 
-    const auto screenList = QGuiApplication::screens();
-    for (auto const &screen : screenList)
+    for (auto const &screen : QGuiApplication::screens())
     {
-        int largerDimension;
-        if (screen->size().height() > screen->size().width())
-        {
-            largerDimension = screen->size().height();
-        }
-        else
-        {
-            largerDimension = screen->size().width();
-        }
-
+        const int largerDimension = qMax(screen->size().width(), screen->size().height());
         if (largerDimension > largestDimension)
-        {
             largestDimension = largerDimension;
-        }
     }
 
     // Connect to settings signal

diff --git a/src/qvimagecore.h b/src/qvimagecore.h
@@ -118,7 +118,7 @@ class QVImageCore : public QObject
     QSet<QString> preloadsInProgress;
     QString waitingOnPreloadPath;
 
-    int largestDimension {0};
+    int largestDimension {1920};
 
     bool waitingOnLoad {false};
 };