diff -r d922431eacf7 -r 1f42c03fafca src/ui/canvas.h
--- a/src/ui/canvas.h	Sun Jul 25 16:29:08 2021 +0300
+++ b/src/ui/canvas.h	Sun Jul 25 20:29:14 2021 +0300
@@ -10,8 +10,6 @@
 {
 	Q_OBJECT
 public:
-	struct MouseClickInfo;
-	struct MouseMoveInfo;
 	using OverpaintCallback = std::function<void(Canvas*, QPainter*)>;
 	Canvas(
 		Model* model,
@@ -35,8 +33,8 @@
 signals:
 	void newStatusText(const QString& newStatusText);
 	void selectionChanged(const QSet<ldraw::id_t>& newSelection);
-	void mouseClick(const MouseClickInfo& info);
-	void mouseMove(const MouseMoveInfo& info);
+	void mouseClick(Canvas* canvas);
+	void mouseMove(Canvas* canvas);
 private:
 	void updateGridMatrix();
 	glm::vec3 cameraVector() const;
@@ -50,15 +48,3 @@
 	QSet<ldraw::id_t> selection;
 	OverpaintCallback overpaintCallback = nullptr;
 };
-
-struct Canvas::MouseClickInfo
-{
-	std::optional<glm::vec3> worldPosition;
-	Canvas* invoker;
-};
-
-struct Canvas::MouseMoveInfo
-{
-	std::optional<glm::vec3> worldPosition;
-	Canvas* invoker;
-};