From 32d56fec977b109aeecb06288a1b45cfe6b83117 Mon Sep 17 00:00:00 2001 From: ozwaldorf Date: Wed, 1 Feb 2023 16:06:01 -0500 Subject: feat: border angle animations (#1469) Co-authored-by: vaxerski <43317083+vaxerski@users.noreply.github.com> --- src/Compositor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Compositor.cpp') diff --git a/src/Compositor.cpp b/src/Compositor.cpp index c2c80aee..af65d561 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1565,8 +1565,8 @@ void CCompositor::updateWindowAnimatedDecorationValues(CWindow* pWindow) { pWindow->m_cRealBorderColorPrevious = pWindow->m_cRealBorderColor; pWindow->m_cRealBorderColor = grad; - pWindow->m_fBorderAnimationProgress.setValueAndWarp(0.f); - pWindow->m_fBorderAnimationProgress = 1.f; + pWindow->m_fBorderFadeAnimationProgress.setValueAndWarp(0.f); + pWindow->m_fBorderFadeAnimationProgress = 1.f; }; // border @@ -1581,6 +1581,10 @@ void CCompositor::updateWindowAnimatedDecorationValues(CWindow* pWindow) { CGradientValueData(CColor(pWindow->m_sSpecialRenderData.inactiveBorderColor.toUnderlying())) : *INACTIVECOL)); + // tick angle if it's not running (aka dead) + if (!pWindow->m_fBorderAngleAnimationProgress.isBeingAnimated()) + pWindow->m_fBorderAngleAnimationProgress.setValueAndWarp(0.f); + // opacity const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(pWindow->m_iWorkspaceID); if (pWindow->m_bIsFullscreen && PWORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL) { -- cgit v1.2.3