Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h
#	src/courtroom.cpp

1 files changed, 10 insertions, 5 deletions

diff --git a/src/aoimage.cpp b/src/aoimage.cpp
index 2663ba05..3977c979 100644
--- a/src/aoimage.cpp
+++ b/src/aoimage.cpp
@@ -2,6 +2,8 @@
 
 #include "aoimage.h"
 
+#include <QBitmap>
+
 AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
 {
   m_parent = parent;
@@ -29,9 +31,10 @@ bool AOImage::set_image(QString p_image)
   }
 
   QPixmap f_pixmap(final_image_path);
-
-  this->setPixmap(
-      f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio));
+  f_pixmap =
+      f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio);
+  this->setPixmap(f_pixmap);
+  this->setMask(f_pixmap.mask());
   return true;
 }
 
@@ -45,7 +48,9 @@ bool AOImage::set_chatbox(QString p_path)
 
   QPixmap f_pixmap(p_path);
 
-  this->setPixmap(
-      f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio));
+  f_pixmap =
+      f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio);
+  this->setPixmap(f_pixmap);
+  this->setMask(f_pixmap.mask());
   return true;
 }