hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-01-10 17:29:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

animationmgr: don't warp based on POINTY value (#9000)

Browse source
This commit is contained in:
Maximilian Seidler 2025-01-09 11:13:47 +00:00 committed by GitHub
parent c9822b08f9
commit e66eab7b6a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/managers/AnimationManager.cpp
View file

@ -40,7 +40,7 @@ CHyprAnimationManager::CHyprAnimationManager() {
template <Animable VarType> template <Animable VarType>
void updateVariable(CAnimatedVariable<VarType>& av, const float POINTY, bool warp = false) { void updateVariable(CAnimatedVariable<VarType>& av, const float POINTY, bool warp = false) {
if (POINTY >= 1.f || warp || av.value() == av.goal()) { if (warp || av.value() == av.goal()) {
av.warp(); av.warp();
return; return;
} }
@ -50,7 +50,7 @@ void updateVariable(CAnimatedVariable<VarType>& av, const float POINTY, bool war
} }
void updateColorVariable(CAnimatedVariable<CHyprColor>& av, const float POINTY, bool warp) { void updateColorVariable(CAnimatedVariable<CHyprColor>& av, const float POINTY, bool warp) {
if (POINTY >= 1.f || warp || av.value() == av.goal()) { if (warp || av.value() == av.goal()) {
av.warp(); av.warp();
return; return;
} }
@ -146,11 +146,12 @@ static void handleUpdate(CAnimatedVariable<VarType>& av, bool warp) {
const auto SPENT = av.getPercent(); const auto SPENT = av.getPercent();
const auto PBEZIER = g_pAnimationManager->getBezier(av.getBezierName()); const auto PBEZIER = g_pAnimationManager->getBezier(av.getBezierName());
const auto POINTY = PBEZIER->getYForPoint(SPENT); const auto POINTY = PBEZIER->getYForPoint(SPENT);
const bool WARP = animationsDisabled || SPENT >= 1.f;
if constexpr (std::same_as<VarType, CHyprColor>) if constexpr (std::same_as<VarType, CHyprColor>)
updateColorVariable(av, POINTY, animationsDisabled); updateColorVariable(av, POINTY, WARP);
else else
updateVariable<VarType>(av, POINTY, animationsDisabled); updateVariable<VarType>(av, POINTY, WARP);
av.onUpdate(); av.onUpdate();