Merge branch 'master' into folder_options

2021-08-01 13:48:25 +12:00
parent 5eaf7ee539 e238719740
commit 1a9c013c29
1 changed files with 4 additions and 1 deletions
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -152,7 +152,10 @@ void MainWindow::setOverlay(Overlay* o)

 QPixmap MainWindow::getBlurredBackground(const QPixmap& originalSize, const QPixmap& scaled)
 {
-    if (scaled.width() < width()) {
+    if (fitAspectAxisToWindow) {
+      // our scaled version will just fill the whole screen, us it directly
+      return scaled.copy();
+    } else if (scaled.width() < width()) {
      QPixmap background = blur(originalSize.scaledToWidth(width(), Qt::SmoothTransformation));
      QRect rect(0, (background.height() - height())/2, width(), height());
      return background.copy(rect);