Sclae arrow head with width #84

Author: DamirPorobic

CHANGELOG.md

@@ -8,6 +8,7 @@
 * New: Add tab context menu for close all tabs and close other tabs. ([#93](https://github.com/ksnip/kImageAnnotator/issues/93))
 * Changed: Make dropdown buttons show popup on click. ([#89](https://github.com/ksnip/kImageAnnotator/issues/89))
 * Changed: Hide unavailable setting widgets. ([#101](https://github.com/ksnip/kImageAnnotator/issues/101))
+* Changed: Make arrow size decrease with stroke size. ([#84](https://github.com/ksnip/kImageAnnotator/issues/84))
 * Fixed: Using select tool marks image as changed. ([#97](https://github.com/ksnip/kImageAnnotator/issues/97))
 
 ## Release 0.2.1

src/annotations/items/AnnotationArrow.cpp

@@ -37,22 +37,25 @@ ToolTypes AnnotationArrow::toolType() const
 
 void AnnotationArrow::updateShape()
 {
-	QPainterPath path(mLine->p1());
-	path.lineTo(mLine->p2());
+	QLineF shaft(*mLine);
+	shaft.setLength(shaft.length() - 5);
 
-	auto arrow = createArrow();
+	QPainterPath path(shaft.p1());
+	path.lineTo(shaft.p2());
+
+	auto arrow = createArrowHead(properties()->width() / 2);
 	auto finishedArrow = positionArrowHeadAtEnd(arrow);
 
 	path.addPolygon(finishedArrow);
 	path.closeSubpath();
 	setShape(path);
 }
 
-QPolygonF AnnotationArrow::createArrow() const
+QPolygonF AnnotationArrow::createArrowHead(int scaleFactor) const
 {
-	int mArrowHeadLength = 20;
-	int mArrowHeadWidth = 10;
-	int mArrowHeadMid = 17;
+	int mArrowHeadLength = 15 + scaleFactor;
+	int mArrowHeadWidth = 5 + scaleFactor;
+	int mArrowHeadMid = 13 + scaleFactor;
 
 	QPointF p0(0, 0);
 	QPointF p1(-mArrowHeadLength, mArrowHeadWidth);

src/annotations/items/AnnotationArrow.h

@@ -34,7 +34,7 @@ class AnnotationArrow : public AbstractAnnotationLine
 
 protected:
 	void updateShape() override;
-	QPolygonF createArrow() const;
+	QPolygonF createArrowHead(int scaleFactor) const;
 	QPolygonF positionArrowHeadAtEnd(const QPolygonF &arrow) const;
 };
 

src/annotations/items/AnnotationDoubleArrow.cpp

@@ -38,10 +38,15 @@ ToolTypes AnnotationDoubleArrow::toolType() const
 
 void AnnotationDoubleArrow::updateShape()
 {
-	QPainterPath path(mLine->p1());
-	path.lineTo(mLine->p2());
+	QLineF shaft(mLine->p2(), mLine->p1());
+	shaft.setLength(shaft.length() - 5);
+	shaft.setPoints(shaft.p2(), shaft.p1());
+	shaft.setLength(shaft.length() - 5);
 
-	auto arrow = createArrow();
+	QPainterPath path(shaft.p1());
+	path.lineTo(shaft.p2());
+
+	auto arrow = createArrowHead(properties()->width() / 2);
 	auto startArrowHead = positionArrowHeadAtStart(arrow);
 	auto endArrowHead = positionArrowHeadAtEnd(arrow);