*better-rer* character scaling algorithm

1 files changed, 6 insertions, 6 deletions

diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp
index 89d832df..d764d1a5 100644
--- a/src/aocharmovie.cpp
+++ b/src/aocharmovie.cpp
@@ -234,19 +234,19 @@ QPixmap AOCharMovie::get_pixmap(QImage image)
     auto aspect_ratio = Qt::KeepAspectRatio;
     auto transform_mode = Qt::SmoothTransformation;
 
-    if (f_pixmap.size().width() > this->size().width() && f_pixmap.size().height() <= this->size().height())
+    if (f_pixmap.size().width() > this->size().width() || f_pixmap.size().height() > this->size().height())
     {
       f_pixmap = f_pixmap.scaledToHeight(this->height(), transform_mode);
     }
-    else if (f_pixmap.size().height() > this->size().height())
-    {
-      f_pixmap = f_pixmap.scaledToWidth(this->width(), transform_mode);
-    }
+//    else if (f_pixmap.size().height() > this->size().height())
+//    {
+//      f_pixmap = f_pixmap.scaledToWidth(this->width(), transform_mode);
+//    }
     else
     {
       f_pixmap = f_pixmap.scaled(this->width(), this->height(), aspect_ratio, transform_mode);
     }
-    this->move((f_w - f_pixmap.width())/2, (f_h - f_pixmap.height())/2);
+    this->move((f_w - f_pixmap.width())/2, (f_pixmap.height() - f_h)); //Always center horizontally, always put at the bottom vertically
     this->resize(f_pixmap.size());
 
     return f_pixmap;