From ca57215172936f3f45f30a7b5cf8ea489e14e131 Mon Sep 17 00:00:00 2001 From: hexyoungs Date: Mon, 28 Sep 2020 10:26:44 +0800 Subject: [PATCH] refactor: remove duplicated code in PR#982 --- src/tools/circlecount/circlecounttool.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/tools/circlecount/circlecounttool.cpp b/src/tools/circlecount/circlecounttool.cpp index b923a601..29333dc6 100644 --- a/src/tools/circlecount/circlecounttool.cpp +++ b/src/tools/circlecount/circlecounttool.cpp @@ -16,6 +16,7 @@ // along with Flameshot. If not, see . #include "circlecounttool.h" +#include "colorutils.h" #include namespace { #define PADDING_VALUE 2 @@ -90,11 +91,7 @@ void CircleCountTool::process(QPainter& painter, textRect, Qt::AlignCenter, QString::number(m_count)); } - // Calculate the perceptive luminance - human eye favors green color - double luma = ((0.299 * m_color.red()) + (0.587 * m_color.green()) + - (0.114 * m_color.blue())) / - 255; - if (luma <= 0.5) { + if (ColorUtils::colorIsDark(m_color)) { painter.setPen(Qt::white); } else { painter.setPen(Qt::black);