Add option to disable the Circle Counter outline (#4882)

The counter bubble is always drawn with a contrasting ring. An outer
ellipse is filled with the anti-contrast color and the pen strokes both
ellipses with the contrast color, so the ring reads as black either way:
on dark draw colors it comes from the outer ellipse's fill, and on light
ones from the pen. There was no way to turn it off.

Add a `drawCircleCounterOutline` option together with a checkbox in
Configuration > General. It defaults to true, so the existing appearance
is unchanged.

Closes #3580

Co-authored-by: Bekir Soylu <bso@apptec360.com>

Author: bekirsoylu

flameshot.example.ini

@@ -73,6 +73,9 @@
 ;; Last used Circle Counter size (int)
 ;drawCircleCounterSize=1
 ;
+;; Draw a contrasting outline ring around the Circle Counter bubble (bool)
+;drawCircleCounterOutline=true
+;
 ;; Last used Pixelate pixel size (int)
 ;drawPixelateSize=2
 ;

src/config/generalconf.cpp

@@ -79,6 +79,7 @@ GeneralConf::GeneralConf(QWidget* parent)
     initSquareMagnifier();
     initJpegQuality();
     initReverseArrow();
+    initDrawCircleCounterOutline();
     // this has to be at the end
     initConfigButtons();
     updateComponents();
@@ -113,6 +114,7 @@ void GeneralConf::_updateComponents(bool allowEmptySavePath)
     m_squareMagnifier->setChecked(config.squareMagnifier());
     m_saveLastRegion->setChecked(config.saveLastRegion());
     m_reverseArrow->setChecked(config.reverseArrow());
+    m_drawCircleCounterOutline->setChecked(config.drawCircleCounterOutline());
     m_autoCloseIdleDaemon->setChecked(config.autoCloseIdleDaemon());
     m_predefinedColorPaletteLarge->setChecked(
       config.predefinedColorPaletteLarge());
@@ -865,6 +867,20 @@ void GeneralConf::initReverseArrow()
       m_reverseArrow, &QCheckBox::clicked, this, &GeneralConf::setReverseArrow);
 }
 
+void GeneralConf::initDrawCircleCounterOutline()
+{
+    m_drawCircleCounterOutline =
+      new QCheckBox(tr("Draw outline around circle counter"), this);
+    m_drawCircleCounterOutline->setToolTip(
+      tr("Draw a contrasting ring around the counter bubble so it stays "
+         "visible on any background"));
+    m_scrollAreaLayout->addWidget(m_drawCircleCounterOutline);
+
+    connect(m_drawCircleCounterOutline, &QCheckBox::clicked, [](bool checked) {
+        ConfigHandler().setDrawCircleCounterOutline(checked);
+    });
+}
+
 void GeneralConf::initInsecurePixelate()
 {
     m_insecurePixelate = new QCheckBox(tr("Insecure Pixelate"), this);

src/config/generalconf.h

@@ -107,6 +107,7 @@ private slots:
     void initShowSelectionGeometry();
     void initJpegQuality();
     void initReverseArrow();
+    void initDrawCircleCounterOutline();
     void initInsecurePixelate();
 #if !defined(Q_OS_MACOS)
     void initCaptureActiveMonitor();
@@ -164,6 +165,7 @@ private slots:
     QSpinBox* m_xywhTimeout;
     QSpinBox* m_jpegQuality;
     QCheckBox* m_reverseArrow;
+    QCheckBox* m_drawCircleCounterOutline;
     QCheckBox* m_insecurePixelate;
 #if !defined(Q_OS_MACOS)
     QCheckBox* m_captureActiveMonitor;

src/tools/circlecount/circlecounttool.cpp

@@ -3,6 +3,7 @@
 
 #include "circlecounttool.h"
 #include "utils/colorutils.h"
+#include "utils/confighandler.h"
 
 #include <QPainter>
 #include <QPainterPath>
@@ -134,10 +135,15 @@ void CircleCountTool::process(QPainter& painter, const QPixmap& pixmap)
         painter.drawPath(path);
     }
 
-    painter.setPen(contrastColor);
-    painter.setBrush(antiContrastColor);
-    painter.drawEllipse(
-      points().first, bubble_size + PADDING_VALUE, bubble_size + PADDING_VALUE);
+    if (ConfigHandler().drawCircleCounterOutline()) {
+        painter.setPen(contrastColor);
+        painter.setBrush(antiContrastColor);
+        painter.drawEllipse(points().first,
+                            bubble_size + PADDING_VALUE,
+                            bubble_size + PADDING_VALUE);
+    } else {
+        painter.setPen(Qt::NoPen);
+    }
     painter.setBrush(color());
     painter.drawEllipse(points().first, bubble_size, bubble_size);
     QRect textRect = QRect(points().first.x() - bubble_size / 2,

src/utils/confighandler.cpp

@@ -118,6 +118,7 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     OPTION("drawThickness"               ,LowerBoundedInt    ( 1, 3          )),
     OPTION("drawFontSize"                ,LowerBoundedInt    ( 1, 8          )),
     OPTION("drawCircleCounterSize"       ,LowerBoundedInt    ( 1, 1          )),
+    OPTION("drawCircleCounterOutline"    ,Bool               ( true          )),
     OPTION("drawPixelateSize"            ,LowerBoundedInt    ( 1, 2          )),
     OPTION("drawRectangleSize"           ,LowerBoundedInt    ( 1, 1          )),
     OPTION("drawMarkerSize"              ,LowerBoundedInt    ( 1, 5          )),

src/utils/confighandler.h

@@ -94,6 +94,9 @@ class ConfigHandler : public QObject
     CONFIG_GETTER_SETTER(drawThickness, setDrawThickness, int)
     CONFIG_GETTER_SETTER(drawFontSize, setDrawFontSize, int)
     CONFIG_GETTER_SETTER(drawCircleCounterSize, setDrawCircleCounterSize, int)
+    CONFIG_GETTER_SETTER(drawCircleCounterOutline,
+                         setDrawCircleCounterOutline,
+                         bool)
     CONFIG_GETTER_SETTER(drawPixelateSize, setDrawPixelateSize, int)
     CONFIG_GETTER_SETTER(drawRectangleSize, setDrawRectangleSize, int)
     CONFIG_GETTER_SETTER(drawMarkerSize, setDrawMarkerSize, int)