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

Merge branch 'dev' into 'dev-rework'

Browse Source 
# Conflicts:
#   cppcheck_errors.txt
#   src/GUI/IntelliPhotoGui.h
This commit is contained in:
Conrad
2020-01-15 13:57:27 +00:00
parent dcbf163c7f 65b6de44e6
commit 14233f8484
8 changed files with 216 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Tool/IntelliToolPolygon.h
View File

@@ -29,6 +29,11 @@ bool isDrawing;
*/
bool isInside;
/*!
* \brief isSettingPolygon is the flag for calling the setPolygon method.
*/
bool isSettingPolygon;
/*!
* \brief PointIsNearStart true, when last click near startpoint, else false.
*/
@@ -43,8 +48,9 @@ public:
* \brief A constructor setting the general paintingArea and colorPicker.
* \param Area - The general paintingArea used by the project.
* \param colorPicker - The general colorPicker used by the project.
* \param isSettingPolygon - The flag for the set polygon method, standart is false
*/
IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings);
IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings, bool isSettingPolygon = false);
/*!
* \brief A Destructor.
*/
@@ -91,7 +97,6 @@ virtual void onWheelScrolled(int value) override;
*/
virtual void onMouseMoved(int x, int y) override;
};
#endif