From 3d63d9b129d5def270bc8a2471347e6f97274e2b Mon Sep 17 00:00:00 2001 From: Maximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com> Date: Sun, 29 Dec 2024 18:38:16 +0000 Subject: [PATCH] input-field: don't change outer color when numlock_color is not set (#621) * input-field: don't change outer color when numlock_color is not set * input-field: same for bothlock_color --- src/renderer/widgets/PasswordInputField.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/widgets/PasswordInputField.cpp b/src/renderer/widgets/PasswordInputField.cpp index 455ab33..b80e425 100644 --- a/src/renderer/widgets/PasswordInputField.cpp +++ b/src/renderer/widgets/PasswordInputField.cpp @@ -56,9 +56,7 @@ 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.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 +487,11 @@ void CPasswordInputField::updateColors() { // CGradientValueData* targetGrad = nullptr; - if (g_pHyprlock->m_bCapsLock && NUMLOCK) + if (g_pHyprlock->m_bCapsLock && NUMLOCK && !colorConfig.both->m_bIsFallback) targetGrad = colorConfig.both; else if (g_pHyprlock->m_bCapsLock) targetGrad = colorConfig.caps; - else if (NUMLOCK) + else if (NUMLOCK && !colorConfig.num->m_bIsFallback) targetGrad = colorConfig.num; if (checkWaiting)