mirror of
https://github.com/hyprwm/hyprlock.git
synced 2025-01-24 19:39:49 +01:00
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
This commit is contained in:
parent
753c538dea
commit
3d63d9b129
1 changed files with 2 additions and 4 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue