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

Merge branch 'dev-rework' into dev

Browse Source
This commit is contained in:
Conrad
2020-01-16 12:11:08 +01:00
parent 90acabd35d 49b36ab013
commit 3359975b1f
314 changed files with 5777 additions and 4797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Layer/PaintingArea.cpp
View File

@@ -32,15 +32,15 @@ PaintingArea::~PaintingArea(){
}
void PaintingArea::setRenderSettings(bool isFastRenderingOn){
bool ToolIsActive;
bool ToolIsActive;
if(Tool!=nullptr){
ToolIsActive = Tool->getIsDrawing();
}
else{
ToolIsActive = false;
}
if(isFastRenderingOn != renderSettings.isFastRenderering() && !ToolIsActive) {
if(Tool!=nullptr) {
ToolIsActive = Tool->getIsDrawing();
}
else{
ToolIsActive = false;
}
if(isFastRenderingOn != renderSettings.isFastRenderering() && !ToolIsActive) {
renderSettings.setFastRendering(isFastRenderingOn);
for(auto& layer : layerBundle) {
layer.image->updateRendererSetting(isFastRenderingOn);
@@ -118,7 +118,7 @@ void PaintingArea::setPolygon(int idx){
delete this->Tool;
this->Tool = new IntelliToolPolygon(this,&colorPicker,&Toolsettings, true);
isSettingPolygon = true;
this->DummyGui->setToolWidth(5);
this->DummyGui->setToolWidth(5);
}
}
}
@@ -172,7 +172,7 @@ void PaintingArea::moveActiveLayer(int idx){
}else if(idx==-1) {
this->selectLayerDown();
}
DummyGui->UpdateGui();
DummyGui->UpdateGui();
}
void PaintingArea::slotActivateLayer(int a){
@@ -239,11 +239,11 @@ int PaintingArea::getHeightOfActive(){
}
int PaintingArea::getMaxWidth(){
return this->maxWidth;
return this->maxWidth;
}
int PaintingArea::getMaxHeight(){
return this->maxHeight;
return this->maxHeight;
}
IntelliImage::ImageType PaintingArea::getTypeOfImageRealLayer(){