summaryrefslogtreecommitdiff
path: root/src/Compositor.cpp
diff options
context:
space:
mode:
authorozwaldorf <self@ossian.dev>2023-02-01 16:06:01 -0500
committerGitHub <noreply@github.com>2023-02-01 21:06:01 +0000
commit32d56fec977b109aeecb06288a1b45cfe6b83117 (patch)
tree3ac9a6c1f096277cab5675fe47658b6317b45947 /src/Compositor.cpp
parent1a41f729a38a57c7e925237efdeeaad1df14020e (diff)
feat: border angle animations (#1469)
Co-authored-by: vaxerski <43317083+vaxerski@users.noreply.github.com>
Diffstat (limited to 'src/Compositor.cpp')
-rw-r--r--src/Compositor.cpp8
1 files changed, 6 insertions, 2 deletions
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) {