diff -r 94719518e310 -r cd4df75924b7 src/tools/basetool.h --- a/src/tools/basetool.h Sun May 16 22:41:00 2021 +0300 +++ b/src/tools/basetool.h Mon Jul 19 19:28:16 2021 +0300 @@ -1,26 +1,19 @@ #pragma once #include #include "../main.h" +#include "../ui/canvas.h" class BaseTool : public QObject { Q_OBJECT public: - struct MouseEventData - { - QMouseEvent* ev; - Qt::KeyboardModifiers keymods; - bool mouseMoved; - Qt::MouseButtons releasedButtons; - }; - BaseTool(QObject* parent = nullptr); virtual QString name() const = 0; virtual QString toolTip() const = 0; virtual bool mousePressed(QMouseEvent*) { return false; } - virtual bool mouseReleased(MouseEventData const&) { return false; } + virtual bool mouseClick(const Canvas::MouseClickInfo&) { return false; } virtual bool mouseDoubleClicked(QMouseEvent*) { return false; } virtual bool mouseMoved(QMouseEvent*) { return false; } virtual bool keyReleased(QKeyEvent*) { return false; }