diff --git a/src/capture/button.cpp b/src/capture/button.cpp index 75ea97da..14a5b627 100644 --- a/src/capture/button.cpp +++ b/src/capture/button.cpp @@ -157,7 +157,8 @@ QString Button::getStyle(const QColor &mainColor) { "background-color: %1; }"; QColor contrast(mainColor.darker(120)); - if (mainColor.valueF() < 0.5) { + if (mainColor.value() < m_colorValueLimit || + mainColor.saturation() > m_colorSaturationLimit) { contrast = mainColor.lighter(160); } @@ -222,9 +223,10 @@ void Button::updateIconColor() { } bool Button::iconIsWhite(const QColor &c) { - bool isWhite = true; - if (c.valueF() > 0.65) { - isWhite = false; + bool isWhite = false; + if (c.value() < m_colorValueLimit || + c.saturation() > m_colorSaturationLimit) { + isWhite = true; } return isWhite; } diff --git a/src/capture/button.h b/src/capture/button.h index 89143eb6..bd987650 100644 --- a/src/capture/button.h +++ b/src/capture/button.h @@ -85,6 +85,8 @@ signals: private: Button(QWidget *parent = 0); const Type m_buttonType; + static const int m_colorValueLimit = 160; + static const int m_colorSaturationLimit = 110; bool m_pressed; QPropertyAnimation *emergeAnimation;