From 83bda4883d4c2075554d3638c0dfb15e072217f7 Mon Sep 17 00:00:00 2001 From: Maximilian Seidler Date: Sun, 22 Dec 2024 08:49:21 +0100 Subject: [PATCH] input-field: improve behavior of *lock colors (#596) --- src/renderer/widgets/PasswordInputField.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/renderer/widgets/PasswordInputField.cpp b/src/renderer/widgets/PasswordInputField.cpp index f8b4be3..c9f8db2 100644 --- a/src/renderer/widgets/PasswordInputField.cpp +++ b/src/renderer/widgets/PasswordInputField.cpp @@ -56,9 +56,9 @@ CPasswordInputField::CPasswordInputField(const Vector2D& viewport_, const std::u dots.size = std::clamp(dots.size, 0.2f, 0.8f); dots.spacing = std::clamp(dots.spacing, -1.f, 1.f); colorConfig.transitionMs = std::clamp(colorConfig.transitionMs, 0, 1000); - colorConfig.both = colorConfig.both->m_bIsFallback ? colorConfig.outer : colorConfig.both; - colorConfig.caps = colorConfig.caps->m_bIsFallback ? colorConfig.outer : colorConfig.caps; - colorConfig.num = colorConfig.num->m_bIsFallback ? colorConfig.outer : colorConfig.num; + colorConfig.both = colorConfig.both->m_bIsFallback ? colorConfig.fail : colorConfig.both; + colorConfig.caps = colorConfig.caps->m_bIsFallback ? colorConfig.fail : colorConfig.caps; + colorConfig.num = colorConfig.num->m_bIsFallback ? colorConfig.fail : colorConfig.num; colorState.inner = colorConfig.inner; colorState.outer = *colorConfig.outer; @@ -489,11 +489,6 @@ void CPasswordInputField::updateColors() { // CGradientValueData* targetGrad = nullptr; - if (checkWaiting) - targetGrad = colorConfig.check; - else if (displayFail) - targetGrad = colorConfig.fail; - if (g_pHyprlock->m_bCapsLock && NUMLOCK) targetGrad = colorConfig.both; else if (g_pHyprlock->m_bCapsLock) @@ -501,6 +496,11 @@ void CPasswordInputField::updateColors() { else if (NUMLOCK) targetGrad = colorConfig.num; + if (checkWaiting) + targetGrad = colorConfig.check; + else if (displayFail) + targetGrad = colorConfig.fail; + CGradientValueData* outerTarget = colorConfig.outer; CColor innerTarget = colorConfig.inner; CColor fontTarget = (displayFail) ? colorConfig.fail->m_vColors.front() : colorConfig.font;