From c56bb78cf38f5bb864ea66a755c1185cadae5348 Mon Sep 17 00:00:00 2001
From: Jeremy Borgman <borgman.jeremy@pm.me>
Date: Sat, 19 Sep 2020 20:38:06 -0500
Subject: [PATCH] Added preview to circle counter and auto adjust circle count
 font color.

---
 src/tools/circlecount/circlecounttool.cpp | 24 +++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/tools/circlecount/circlecounttool.cpp b/src/tools/circlecount/circlecounttool.cpp
index 03590f6c..10ac7065 100644
--- a/src/tools/circlecount/circlecounttool.cpp
+++ b/src/tools/circlecount/circlecounttool.cpp
@@ -95,8 +95,14 @@ CircleCountTool::process(QPainter& painter,
       painter.boundingRect(textRect, Qt::AlignCenter, QString::number(m_count));
   }
 
-  painter.drawText(textRect, Qt::AlignCenter, QString::number(m_count));
+  // Lightness value ranges from 0-255, we split at 75 as this looks best
+  if (m_color.lightness() <= 75) {
+    painter.setPen(Qt::white);
+  } else {
+    painter.setPen(Qt::black);
+  }
 
+  painter.drawText(textRect, Qt::AlignCenter, QString::number(m_count));
   painter.setFont(orig_font);
 }
 
@@ -104,11 +110,17 @@ void
 CircleCountTool::paintMousePreview(QPainter& painter,
                                    const CaptureContext& context)
 {
-  painter.setPen(QPen(context.color,
-                      PADDING_VALUE + context.thickness,
-                      Qt::SolidLine,
-                      Qt::RoundCap));
-  painter.drawLine(context.mousePos, context.mousePos);
+  m_thickness = context.thickness + PADDING_VALUE;
+  if (m_thickness < 15) {
+    m_thickness = 15;
+  }
+
+  // Thickness for pen is *2 to range from radius to diameter to match the
+  // ellipse draw function
+  painter.setPen(
+    QPen(context.color, m_thickness * 2, Qt::SolidLine, Qt::RoundCap));
+  painter.drawLine(context.mousePos,
+                   { context.mousePos.x() + 1, context.mousePos.y() + 1 });
 }
 
 void