Automated Merge Preparation

This commit is contained in:
2020-01-16 11:35:58 +01:00
parent 7109948969
commit a099b2e916
9 changed files with 90 additions and 88 deletions

View File

@@ -32,7 +32,7 @@ PaintingArea::~PaintingArea(){
}
void PaintingArea::setRenderSettings(bool isFastRenderingOn){
if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) {
if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) {
renderSettings.setFastRendering(isFastRenderingOn);
for(auto& layer : layerBundle) {
layer.image->updateRendererSetting(isFastRenderingOn);
@@ -110,7 +110,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);
}
}
}
@@ -164,7 +164,7 @@ void PaintingArea::moveActiveLayer(int idx){
}else if(idx==-1) {
this->selectLayerDown();
}
DummyGui->UpdateGui();
DummyGui->UpdateGui();
}
void PaintingArea::slotActivateLayer(int a){
@@ -231,11 +231,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(){