Pass tool constraints to Tool::end

That is, if Shift or Alt are held. Needed in the next commit.
drawpile · Jul 14, 2024 · 7e881ed · 7e881ed
1 parent 8d9a269
commit 7e881ed
Show file tree

Hide file tree

Showing 34 changed files with 89 additions and 70 deletions.
diff --git a/src/desktop/scene/canvasview.cpp b/src/desktop/scene/canvasview.cpp
@@ -1028,13 +1028,6 @@ void CanvasView::onPenMove(
 	}
 }
 
-void CanvasView::onPenUp()
-{
-	if(!m_locked && m_penmode == PenMode::Normal) {
-		emit penUp();
-	}
-}
-
 void CanvasView::penPressEvent(
 	QEvent *event, long long timeMsec, const QPointF &pos, qreal pressure,
 	qreal xtilt, qreal ytilt, qreal rotation, Qt::MouseButton button,
@@ -1285,7 +1278,13 @@ void CanvasView::penReleaseEvent(
 		m_pendown == TABLETDOWN ||
 		((button == Qt::LeftButton || button == Qt::RightButton) &&
 		 m_pendown == MOUSEDOWN)) {
-		onPenUp();
+		if(!m_locked && m_penmode == PenMode::Normal) {
+			CanvasShortcuts::ConstraintMatch constraintMatch =
+				m_canvasShortcuts.matchConstraints(modifiers, m_keysDown);
+			emit penUp(
+				constraintMatch.toolConstraint1(),
+				constraintMatch.toolConstraint2());
+		}
 		m_pendown = NOTDOWN;
 
 		m_hoveringOverHud = m_scene->checkHover(mapToScene(pos.toPoint())) !=

diff --git a/src/desktop/scene/canvasview.h b/src/desktop/scene/canvasview.h
@@ -144,7 +144,7 @@ class CanvasView final : public QGraphicsView {
 		const QPointF &viewPos);
 	void penHover(
 		const QPointF &point, qreal angle, qreal zoom, bool mirror, bool flip);
-	void penUp();
+	void penUp(bool constrain, bool center);
 	void quickAdjust(qreal value);
 	void coordinatesChanged(const QPointF &coordinates);
 
@@ -326,7 +326,6 @@ private slots:
 	void onPenMove(
 		const canvas::Point &p, bool right, bool constrain1, bool constrain2,
 		const QPointF &viewPos);
-	void onPenUp();
 
 	void flushTouchDrawBuffer();
 

diff --git a/src/desktop/view/canvascontroller.cpp b/src/desktop/view/canvascontroller.cpp
@@ -1627,7 +1627,11 @@ void CanvasController::penReleaseEvent(
 		 m_penState == PenState::MouseDown)) {
 
 		if(!m_locked && m_penMode == PenMode::Normal) {
-			emit penUp();
+			CanvasShortcuts::ConstraintMatch constraintMatch =
+				m_canvasShortcuts.matchConstraints(modifiers, m_keysDown);
+			emit penUp(
+				constraintMatch.toolConstraint1(),
+				constraintMatch.toolConstraint2());
 		}
 		m_penState = PenState::Up;
 

diff --git a/src/desktop/view/canvascontroller.h b/src/desktop/view/canvascontroller.h
@@ -184,7 +184,7 @@ class CanvasController : public QObject {
 		const QPointF &viewPos);
 	void penHover(
 		const QPointF &point, qreal angle, qreal zoom, bool mirror, bool flip);
-	void penUp();
+	void penUp(bool constrain, bool center);
 	void coordinatesChanged(const QPointF &coordinates);
 	void quickAdjust(qreal value);
 	void cursorChanged(const QCursor &cursor);

diff --git a/src/libclient/document.cpp b/src/libclient/document.cpp
@@ -181,7 +181,7 @@ void Document::onSessionResetted()
 	// Cancel any possibly active local drawing process.
 	// This prevents jumping lines across the canvas if it shifts.
 	m_toolctrl->cancelMultipartDrawing();
-	m_toolctrl->endDrawing();
+	m_toolctrl->endDrawing(false, false);
 
 	emit sessionResetState(m_canvas->paintEngine()->viewCanvasState());
 

diff --git a/src/libclient/tools/annotation.cpp b/src/libclient/tools/annotation.cpp
@@ -209,7 +209,7 @@ void Annotation::motion(const MotionParams &params)
  * If we have a selected annotation, adjust its shape.
  * Otherwise, create a new annotation.
  */
-void Annotation::end()
+void Annotation::end(const EndParams &)
 {
 	if(m_selectedId == 0)
 		return;

diff --git a/src/libclient/tools/annotation.h b/src/libclient/tools/annotation.h
@@ -15,7 +15,7 @@ class Annotation final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 
 private:
 	/// Where the annotation was grabbed

diff --git a/src/libclient/tools/beziertool.cpp b/src/libclient/tools/beziertool.cpp
@@ -81,7 +81,7 @@ void BezierTool::hover(const HoverParams &params)
 	}
 }
 
-void BezierTool::end()
+void BezierTool::end(const EndParams &)
 {
 	const int s = m_points.size();
 

diff --git a/src/libclient/tools/beziertool.h b/src/libclient/tools/beziertool.h
@@ -18,7 +18,7 @@ class BezierTool final : public Tool {
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
 	void hover(const HoverParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 	void finishMultipart() override;
 	void cancelMultipart() override;
 	void undoMultipart() override;

diff --git a/src/libclient/tools/colorpicker.cpp b/src/libclient/tools/colorpicker.cpp
@@ -28,7 +28,7 @@ void ColorPicker::motion(const MotionParams &params)
 	}
 }
 
-void ColorPicker::end()
+void ColorPicker::end(const EndParams &)
 {
 	m_picking = false;
 }

diff --git a/src/libclient/tools/colorpicker.h b/src/libclient/tools/colorpicker.h
@@ -16,7 +16,7 @@ class ColorPicker final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 
 	//! Pick from the current active layer only?
 	void setPickFromCurrentLayer(bool p) { m_pickFromCurrentLayer = p; }

diff --git a/src/libclient/tools/floodfill.cpp b/src/libclient/tools/floodfill.cpp
@@ -136,7 +136,7 @@ void FloodFill::motion(const MotionParams &params)
 	Q_UNUSED(params);
 }
 
-void FloodFill::end() {}
+void FloodFill::end(const EndParams &) {}
 
 bool FloodFill::isMultipart() const
 {

diff --git a/src/libclient/tools/floodfill.h b/src/libclient/tools/floodfill.h
@@ -28,7 +28,7 @@ class FloodFill final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 	bool isMultipart() const override;
 	void finishMultipart() override;
 	void undoMultipart() override;

diff --git a/src/libclient/tools/freehand.cpp b/src/libclient/tools/freehand.cpp
@@ -66,7 +66,7 @@ void Freehand::motion(const MotionParams &params)
 	m_brushEngine.sendMessagesTo(m_owner.client());
 }
 
-void Freehand::end()
+void Freehand::end(const EndParams &)
 {
 	if(m_drawing) {
 		m_drawing = false;

diff --git a/src/libclient/tools/freehand.h b/src/libclient/tools/freehand.h
@@ -15,7 +15,7 @@ class Freehand final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 
 	bool usesBrushColor() const override { return true; }
 

diff --git a/src/libclient/tools/inspector.cpp b/src/libclient/tools/inspector.cpp
@@ -27,18 +27,14 @@ void Inspector::motion(const MotionParams &params)
 	}
 }
 
-void Inspector::end()
+void Inspector::end(const EndParams &)
 {
-	m_inspecting = false;
-	canvas::CanvasModel *canvas = m_owner.model();
-	if(canvas) {
-		canvas->stopInspectingCanvas();
-	}
+	endInspecting();
 }
 
 void Inspector::cancelMultipart()
 {
-	end();
+	endInspecting();
 }
 
 void Inspector::inspect(const QPointF &point, bool clobber) const
@@ -49,4 +45,13 @@ void Inspector::inspect(const QPointF &point, bool clobber) const
 	}
 }
 
+void Inspector::endInspecting()
+{
+	m_inspecting = false;
+	canvas::CanvasModel *canvas = m_owner.model();
+	if(canvas) {
+		canvas->stopInspectingCanvas();
+	}
+}
+
 }
diff --git a/src/libclient/tools/inspector.h b/src/libclient/tools/inspector.h
@@ -16,14 +16,15 @@ class Inspector final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 
 	void cancelMultipart() override;
 
 	void setShowTiles(bool showTiles) { m_showTiles = showTiles; }
 
 private:
 	void inspect(const QPointF &point, bool clobber) const;
+	void endInspecting();
 
 	bool m_inspecting = false;
 	bool m_showTiles = false;

diff --git a/src/libclient/tools/laser.cpp b/src/libclient/tools/laser.cpp
@@ -45,7 +45,7 @@ void LaserPointer::motion(const MotionParams &params)
 	}
 }
 
-void LaserPointer::end()
+void LaserPointer::end(const EndParams &)
 {
 	if(m_drawing) {
 		m_drawing = false;

diff --git a/src/libclient/tools/laser.h b/src/libclient/tools/laser.h
@@ -11,7 +11,7 @@ class LaserPointer final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 
 	void setPersistence(int p) { m_persistence = p; }
 

diff --git a/src/libclient/tools/magicwand.cpp b/src/libclient/tools/magicwand.cpp
@@ -106,7 +106,7 @@ void MagicWandTool::motion(const MotionParams &params)
 	Q_UNUSED(params);
 }
 
-void MagicWandTool::end() {}
+void MagicWandTool::end(const EndParams &) {}
 
 bool MagicWandTool::isMultipart() const
 {

diff --git a/src/libclient/tools/magicwand.h b/src/libclient/tools/magicwand.h
@@ -14,7 +14,7 @@ class MagicWandTool final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 	bool isMultipart() const override;
 	void finishMultipart() override;
 	void undoMultipart() override;

diff --git a/src/libclient/tools/pan.cpp b/src/libclient/tools/pan.cpp
@@ -31,7 +31,7 @@ void PanTool::motion(const MotionParams &params)
 	}
 }
 
-void PanTool::end()
+void PanTool::end(const EndParams &)
 {
 	if(m_panning) {
 		setCursor(Qt::OpenHandCursor);

diff --git a/src/libclient/tools/pan.h b/src/libclient/tools/pan.h
@@ -12,7 +12,7 @@ class PanTool final : public Tool {
 
 	void begin(const BeginParams &params) override;
 	void motion(const MotionParams &params) override;
-	void end() override;
+	void end(const EndParams &params) override;
 
 private:
 	QPointF m_lastViewPos;

diff --git a/src/libclient/tools/selection.cpp b/src/libclient/tools/selection.cpp
@@ -35,32 +35,14 @@ void SelectionTool::motion(const MotionParams &params)
 	}
 }
 
-void SelectionTool::end()
+void SelectionTool::end(const EndParams &)
 {
-	m_clickDetector.end();
-	if(m_op != -1) {
-		bool isClick = m_clickDetector.isClick();
-		if(isClick && isInsideSelection(startPoint())) {
-			cancelSelection();
-			emit m_owner.transformRequested();
-		} else {
-			net::Client *client = m_owner.client();
-			uint8_t contextId = client->myId();
-			net::MessageList msgs = m_op != defaultOp() || !isClick
-										? endSelection(contextId)
-										: endDeselection(contextId);
-			if(!msgs.isEmpty()) {
-				msgs.prepend(net::makeUndoPointMessage(contextId));
-				client->sendMessages(msgs.size(), msgs.constData());
-			}
-		}
-		m_op = -1;
-	}
+	endSelection(true);
 }
 
 void SelectionTool::finishMultipart()
 {
-	end();
+	endSelection(false);
 }
 
 void SelectionTool::cancelMultipart()
@@ -120,6 +102,29 @@ void SelectionTool::removeSelectionPreview() const
 	updateSelectionPreview(QPainterPath());
 }
 
+void SelectionTool::endSelection(bool click)
+{
+	m_clickDetector.end();
+	if(m_op != -1) {
+		bool isClick = click && m_clickDetector.isClick();
+		if(isClick && isInsideSelection(startPoint())) {
+			cancelSelection();
+			emit m_owner.transformRequested();
+		} else {
+			net::Client *client = m_owner.client();
+			uint8_t contextId = client->myId();
+			net::MessageList msgs = m_op != defaultOp() || !isClick
+										? endSelection(contextId)
+										: endDeselection(contextId);
+			if(!msgs.isEmpty()) {
+				msgs.prepend(net::makeUndoPointMessage(contextId));
+				client->sendMessages(msgs.size(), msgs.constData());
+			}
+		}
+		m_op = -1;
+	}
+}
+
 net::MessageList SelectionTool::endDeselection(uint8_t contextId)
 {
 	cancelSelection();

diff --git a/src/libclient/tools/selection.h b/src/libclient/tools/selection.h
@@ -24,7 +24,7 @@ class SelectionTool : public Tool {
 
 	void begin(const BeginParams &params) final override;
 	void motion(const MotionParams &params) final override;
-	void end() override;
+	void end(const EndParams &params) override;
 
 	void finishMultipart() override final;
 	void cancelMultipart() override final;
@@ -51,6 +51,7 @@ class SelectionTool : public Tool {
 	virtual net::MessageList endSelection(uint8_t contextId) = 0;
 
 private:
+	void endSelection(bool click);
 	net::MessageList endDeselection(uint8_t contextId);
 	bool isInsideSelection(const QPointF &point) const;
 

diff --git a/src/libclient/tools/shapetools.cpp b/src/libclient/tools/shapetools.cpp
@@ -99,7 +99,7 @@ void ShapeTool::cancelMultipart()
 	m_drawing = false;
 }
 
-void ShapeTool::end()
+void ShapeTool::end(const EndParams &)
 {
 	if(!m_drawing)
 		return;

diff --git a/src/libclient/tools/shapetools.h b/src/libclient/tools/shapetools.h
@@ -24,7 +24,7 @@ class ShapeTool : public Tool {
 
 	void begin(const BeginParams &params) final override;
 	void motion(const MotionParams &params) override;
-	void end() final override;
+	void end(const EndParams &params) final override;
 
 	void cancelMultipart() final override;
 	bool usesBrushColor() const final override { return true; }

diff --git a/src/libclient/tools/tool.h b/src/libclient/tools/tool.h
@@ -73,6 +73,11 @@ class Tool {
 		bool flip;
 	};
 
+	struct EndParams {
+		bool constrain;
+		bool center;
+	};
+
 	Tool(
 		ToolController &owner, Type type, const QCursor &cursor,
 		bool allowColorPick, bool allowToolAdjust, bool allowRightClick,
@@ -106,7 +111,7 @@ class Tool {
 	virtual void begin(const BeginParams &params) = 0;
 	virtual void motion(const MotionParams &params) = 0;
 	virtual void hover(const HoverParams &params) { Q_UNUSED(params); }
-	virtual void end() = 0;
+	virtual void end(const EndParams &params) = 0;
 
 	//! Finish and commit a multipart stroke
 	virtual void finishMultipart() {}