creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-14 20:30:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Conrad
2019-12-06 08:51:49 +01:00
parent c9086c8e32 4b3ba65c1b
commit ad8682193c
12 changed files with 1689 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Painting/Layer/PaintingArea.cpp
View File

@@ -39,11 +39,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent)
#endif
}
void PaintingArea::setUp(int maxWidth, int maxHeight){
//set standart parameter
this->maxWidth = maxWidth;
this->maxHeight = maxHeight;
@@ -227,7 +223,6 @@ void PaintingArea::mousePressEvent(QMouseEvent *event)
// from the last position to the current
void PaintingArea::mouseMoveEvent(QMouseEvent *event)
{
if ((event->buttons() & Qt::LeftButton) && scribbling){
if(this->activeLayer==-1){
return;
@@ -338,4 +333,3 @@ void PaintingArea::assembleLayers(bool forSaving){
}
}
}