Merge branch 'dev-colorpalette' into dev

This commit is contained in:
2020-01-16 11:19:23 +01:00
12 changed files with 251 additions and 135 deletions

View File

@@ -10,6 +10,9 @@ IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* c
isDrawing = false;
isInside = false;
this->isSettingPolygon = isSettingPolygon;
if(isSettingPolygon){
Toolsettings->setLineWidth(5);
}
this->ActiveType = Tooltype::POLYGON;
}
@@ -121,14 +124,18 @@ void IntelliToolPolygon::onMouseRightReleased(int x, int y){
}
void IntelliToolPolygon::onWheelScrolled(int value){
IntelliTool::onWheelScrolled(value);
if(!isDrawing) {
Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
}
if(!isSettingPolygon){
IntelliTool::onWheelScrolled(value);
if(!isDrawing) {
Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
}
}
}
void IntelliToolPolygon::onMouseMoved(int x, int y){
IntelliTool::onMouseMoved(x,y);
if(!isSettingPolygon){
IntelliTool::onMouseMoved(x,y);
}
}
bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){