From 8e663d7edc6db79b1a2ee29dab787bc05d48de86 Mon Sep 17 00:00:00 2001
From: Sonaion <jonas.mucke@web.de>
Date: Thu, 5 Dec 2019 14:44:00 +0100
Subject: [PATCH] right saving

---
 IntelliPhoto/Painting/IntelliPhoto.pro.user  | 2 +-
 IntelliPhoto/Painting/Layer/PaintingArea.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/IntelliPhoto/Painting/IntelliPhoto.pro.user b/IntelliPhoto/Painting/IntelliPhoto.pro.user
index be04963..1486bb9 100644
--- a/IntelliPhoto/Painting/IntelliPhoto.pro.user
+++ b/IntelliPhoto/Painting/IntelliPhoto.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.2, 2019-12-05T13:07:25. -->
+<!-- Written by QtCreator 4.10.2, 2019-12-05T14:43:33. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/IntelliPhoto/Painting/Layer/PaintingArea.cpp b/IntelliPhoto/Painting/Layer/PaintingArea.cpp
index f08c4f1..f1a228d 100644
--- a/IntelliPhoto/Painting/Layer/PaintingArea.cpp
+++ b/IntelliPhoto/Painting/Layer/PaintingArea.cpp
@@ -287,7 +287,11 @@ void PaintingArea::resizeImage(QImage *image_res, const QSize &newSize){
 }
 
 void PaintingArea::assembleLayers(bool forSaving){
-    Canvas->fill(Qt::GlobalColor::black);
+    if(forSaving){
+        Canvas->fill(Qt::GlobalColor::transparent);
+    }else{
+        Canvas->fill(Qt::GlobalColor::black);
+    }
     //TODO interpolation of alpha for saving
     for(size_t i=0; i<layerStructure.size(); i++){
         LayerObject layer = layerStructure[i];
@@ -302,9 +306,11 @@ void PaintingArea::assembleLayers(bool forSaving){
                 int r =(float)clr_1.red()*(t)+(float)clr_0.red()*(1.-t);
                 int g =(float)clr_1.green()*(t)+(float)clr_0.green()*(1.-t);
                 int b =(float)clr_1.blue()*(t)+(float)clr_0.blue()*(1.-t);
+                int a =std::min(clr_0.alpha()+clr_1.alpha(), 255);
                 clr_0.setRed(r);
                 clr_0.setGreen(g);
                 clr_0.setBlue(b);
+                clr_0.setAlpha(a);
 
                 Canvas->setPixelColor(layer.widthOffset+x, layer.heightOffset+y, clr_0);
             }