creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-12 19:40:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

right saving

Browse Source
This commit is contained in:
Sonaion
2019-12-05 14:44:00 +01:00
parent ec650171e9
commit 8e663d7edc
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IntelliPhoto/Painting/IntelliPhoto.pro.user
View File

@@ -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>

8
IntelliPhoto/Painting/Layer/PaintingArea.cpp
View File

@@ -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);
}