Increment/decrement circle counter on mouse wheel (flameshot-org#4698)

* Increment/decrement circle counter on mouse wheel

* Cap circle counter tool to 999

---------

Co-authored-by: Maxim Inozemtsev <minozemtsev@ics.com>

Author: milnadar

src/tools/capturetool.h

@@ -105,6 +105,12 @@ class CaptureTool : public QObject
         return {};
     };
     virtual QRect boundingRect() const = 0;
+    virtual bool handleMouseWheelEvent(int delta,
+                                       bool adjustmentButtonPressed,
+                                       CaptureContext& context)
+    {
+        return false;
+    }
 
     // The icon of the tool.
     // inEditor is true when the icon is requested inside the editor

src/tools/circlecount/circlecounttool.cpp

@@ -10,6 +10,8 @@
 namespace {
 #define PADDING_VALUE 2
 #define THICKNESS_OFFSET 15
+int const MIN_COUNTER = 1;
+int const MAX_COUNTER = 999;
 }
 
 CircleCountTool::CircleCountTool(QObject* parent)
@@ -180,21 +182,50 @@ void CircleCountTool::paintMousePreview(QPainter& painter,
 
     // Thickness for pen is *2 to range from radius to diameter to match the
     // ellipse draw function
-    auto orig_pen = painter.pen();
-    auto orig_opacity = painter.opacity();
+    auto const previewWidth = (size() + THICKNESS_OFFSET) * 2;
+    painter.save();
     painter.setOpacity(0.35);
-    painter.setPen(QPen(context.color,
-                        (size() + THICKNESS_OFFSET) * 2,
-                        Qt::SolidLine,
-                        Qt::RoundCap));
+    painter.setPen(
+      QPen(context.color, previewWidth, Qt::SolidLine, Qt::RoundCap));
     painter.drawLine(context.mousePos,
                      { context.mousePos.x() + 1, context.mousePos.y() + 1 });
-    painter.setOpacity(orig_opacity);
-    painter.setPen(orig_pen);
+
+    auto font = painter.font();
+    font.setPixelSize(previewWidth / 2);
+    font.setBold(true);
+    painter.setFont(font);
+
+    painter.setPen(QPen("white"));
+    painter.drawText(QRect{ context.mousePos.x() - previewWidth / 2,
+                            context.mousePos.y() - previewWidth / 2,
+                            previewWidth,
+                            previewWidth },
+                     Qt::AlignCenter,
+                     QString::number(context.circleCount));
+
+    painter.restore();
+}
+
+bool CircleCountTool::handleMouseWheelEvent(int delta,
+                                            bool adjustmentButtonPressed,
+                                            CaptureContext& ctx)
+{
+    if (adjustmentButtonPressed) {
+        ctx.circleCount =
+          qBound(MIN_COUNTER, ctx.circleCount + delta, MAX_COUNTER);
+    }
+    return adjustmentButtonPressed;
 }
 
 void CircleCountTool::drawStart(const CaptureContext& context)
 {
+    setCount(context.circleCount);
+    // ------------------------------------------------------------------
+    // Temporary solution until the circle count variable removed from
+    // the context altogether and made part of Circle count tool
+    CaptureContext& ctx = const_cast<CaptureContext&>(context);
+    ctx.circleCount = qBound(MIN_COUNTER, ctx.circleCount + 1, MAX_COUNTER);
+    // ------------------------------------------------------------------
     AbstractTwoPointTool::drawStart(context);
     m_valid = true;
 }

src/tools/circlecount/circlecounttool.h

@@ -24,6 +24,7 @@ class CircleCountTool : public AbstractTwoPointTool
     void process(QPainter& painter, const QPixmap& pixmap) override;
     void paintMousePreview(QPainter& painter,
                            const CaptureContext& context) override;
+    bool handleMouseWheelEvent(int, bool, CaptureContext& ctx) override;
 
 protected:
     CaptureTool::Type type() const override;

src/widgets/capture/capturewidget.cpp

@@ -45,6 +45,8 @@
 
 #define MOUSE_DISTANCE_TO_START_MOVING 3
 
+auto const MOUSE_WHEEL_TRESHOLD = 60;
+
 // CaptureWidget is the main component used to capture the screen. It contains
 // an area of selection with its respective buttons.
 
@@ -834,11 +836,6 @@ bool CaptureWidget::startDrawObjectTool(const QPoint& pos)
 
         m_context.mousePos = m_displayGrid ? snapToGrid(pos) : pos;
         m_activeTool->drawStart(m_context);
-        // TODO this is the wrong place to do this
-
-        if (m_activeTool->type() == CaptureTool::TYPE_CIRCLECOUNT) {
-            m_activeTool->setCount(m_context.circleCount++);
-        }
 
         return true;
     }
@@ -1145,12 +1142,16 @@ void CaptureWidget::wheelEvent(QWheelEvent* e)
      * not accept events faster that one in 200ms.
      * */
     int toolSizeOffset = 0;
-    if (e->angleDelta().y() >= 60) {
-        // mouse scroll (wheel) increment
-        toolSizeOffset = 1;
-    } else if (e->angleDelta().y() <= -60) {
-        // mouse scroll (wheel) decrement
-        toolSizeOffset = -1;
+    if (qAbs(e->angleDelta().y()) >= MOUSE_WHEEL_TRESHOLD) {
+        auto const delta =
+          qMax(qMin(e->angleDelta().y() / MOUSE_WHEEL_TRESHOLD, 1), -1);
+        if (activeButtonTool() &&
+            activeButtonTool()->handleMouseWheelEvent(
+              delta, m_adjustmentButtonPressed, m_context)) {
+            this->repaint();
+            return;
+        }
+        toolSizeOffset = delta;
     } else {
         // touchpad scroll
         qint64 current = QDateTime::currentMSecsSinceEpoch();