mirror of
https://github.com/hyprwm/Hyprland.git
synced 2025-09-29 22:58:28 +00:00
animationmgr: don't warp based on POINTY value (#9000)
This commit is contained in:

committed by
GitHub

parent
c9822b08f9
commit
e66eab7b6a
@@ -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();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user