Implement reverse arrow (#2144) (#3477)

Author: lvhungdev

src/config/generalconf.cpp

@@ -67,6 +67,7 @@ GeneralConf::GeneralConf(QWidget* parent)
     initShowMagnifier();
     initSquareMagnifier();
     initJpegQuality();
+    initReverseArrow();
     // this has to be at the end
     initConfigButtons();
     updateComponents();
@@ -96,6 +97,7 @@ void GeneralConf::_updateComponents(bool allowEmptySavePath)
     m_showMagnifier->setChecked(config.showMagnifier());
     m_squareMagnifier->setChecked(config.squareMagnifier());
     m_saveLastRegion->setChecked(config.saveLastRegion());
+    m_reverseArrow->setChecked(config.reverseArrow());
 
 #if !defined(Q_OS_WIN)
     m_autoCloseIdleDaemon->setChecked(config.autoCloseIdleDaemon());
@@ -829,6 +831,16 @@ void GeneralConf::initJpegQuality()
             &GeneralConf::setJpegQuality);
 }
 
+void GeneralConf::initReverseArrow()
+{
+    m_reverseArrow = new QCheckBox(tr("Reverse arrow"), this);
+    m_reverseArrow->setToolTip(tr("Draw the arrow head first"));
+    m_scrollAreaLayout->addWidget(m_reverseArrow);
+
+    connect(
+      m_reverseArrow, &QCheckBox::clicked, this, &GeneralConf::setReverseArrow);
+}
+
 void GeneralConf::setSelGeoHideTime(int v)
 {
     ConfigHandler().setValue("showSelectionGeometryHideTime", v);
@@ -859,3 +871,8 @@ void GeneralConf::useJpgForClipboardChanged(bool checked)
 {
     ConfigHandler().setUseJpgForClipboard(checked);
 }
+
+void GeneralConf::setReverseArrow(bool checked)
+{
+    ConfigHandler().setReverseArrow(checked);
+}

src/config/generalconf.h

@@ -59,6 +59,7 @@ private slots:
     void setGeometryLocation(int index);
     void setSelGeoHideTime(int v);
     void setJpegQuality(int v);
+    void setReverseArrow(bool checked);
 
 private:
     const QString chooseFolder(const QString& currentPath = "");
@@ -95,6 +96,7 @@ private slots:
     void initSaveLastRegion();
     void initShowSelectionGeometry();
     void initJpegQuality();
+    void initReverseArrow();
 
     void _updateComponents(bool allowEmptySavePath);
 
@@ -141,4 +143,5 @@ private slots:
     QComboBox* m_selectGeometryLocation;
     QSpinBox* m_xywhTimeout;
     QSpinBox* m_jpegQuality;
+    QCheckBox* m_reverseArrow;
 };

src/tools/arrow/arrowtool.cpp

@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
 
 #include "arrowtool.h"
+#include "confighandler.h"
 #include <cmath>
 
 namespace {
@@ -148,10 +149,15 @@ void ArrowTool::copyParams(const ArrowTool* from, ArrowTool* to)
 
 void ArrowTool::process(QPainter& painter, const QPixmap& pixmap)
 {
+    bool isArrowReversed = ConfigHandler().reverseArrow();
+
+    const QPoint& head = isArrowReversed ? points().second : points().first;
+    const QPoint& tail = isArrowReversed ? points().first : points().second;
+
     Q_UNUSED(pixmap)
     painter.setPen(QPen(color(), size()));
-    painter.drawLine(getShorterLine(points().first, points().second, size()));
-    m_arrowPath = getArrowHead(points().first, points().second, size());
+    painter.drawLine(getShorterLine(head, tail, size()));
+    m_arrowPath = getArrowHead(head, tail, size());
     painter.fillPath(m_arrowPath, QBrush(color()));
 }
 

src/utils/confighandler.cpp

@@ -129,7 +129,8 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     OPTION("uploadClientSecret"          ,String             ( "313baf0c7b4d3ff"            )),
     OPTION("showSelectionGeometry"  , BoundedInt               (0,5,4)),
     OPTION("showSelectionGeometryHideTime", LowerBoundedInt       (0, 3000)),
-    OPTION("jpegQuality", BoundedInt     (0,100,75))
+    OPTION("jpegQuality", BoundedInt     (0,100,75)),
+    OPTION("reverseArrow"                    ,Bool               ( false      )),
 };
 
 static QMap<QString, QSharedPointer<KeySequence>> recognizedShortcuts = {

src/utils/confighandler.h

@@ -131,6 +131,7 @@ class ConfigHandler : public QObject
     CONFIG_GETTER_SETTER(saveLastRegion, setSaveLastRegion, bool)
     CONFIG_GETTER_SETTER(showSelectionGeometry, setShowSelectionGeometry, int)
     CONFIG_GETTER_SETTER(jpegQuality, setJpegQuality, int)
+    CONFIG_GETTER_SETTER(reverseArrow, setReverseArrow, bool)
     CONFIG_GETTER_SETTER(showSelectionGeometryHideTime,
                          showSelectionGeometryHideTime,
                          int)