mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-25 23:55:38 +00:00
Very minor code consistency fix.
This commit is contained in:
parent
bef997420d
commit
261ad3735a
|
@ -87,24 +87,6 @@ public:
|
||||||
scrollUp->setOpacity(0);
|
scrollUp->setOpacity(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (downFadeIn) {
|
|
||||||
auto downFadeInFunc = [scrollDown](float t) {
|
|
||||||
scrollDown->setOpacity(
|
|
||||||
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
|
|
||||||
};
|
|
||||||
scrollDown->setAnimation(new LambdaAnimation(downFadeInFunc, fadeInTime), 0,
|
|
||||||
nullptr, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (downFadeOut) {
|
|
||||||
auto downFadeOutFunc = [scrollDown](float t) {
|
|
||||||
scrollDown->setOpacity(
|
|
||||||
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
|
|
||||||
};
|
|
||||||
scrollDown->setAnimation(new LambdaAnimation(downFadeOutFunc, fadeInTime), 0,
|
|
||||||
nullptr, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (upFadeIn) {
|
if (upFadeIn) {
|
||||||
auto upFadeInFunc = [scrollUp](float t) {
|
auto upFadeInFunc = [scrollUp](float t) {
|
||||||
scrollUp->setOpacity(
|
scrollUp->setOpacity(
|
||||||
|
@ -123,6 +105,24 @@ public:
|
||||||
nullptr, true);
|
nullptr, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (downFadeIn) {
|
||||||
|
auto downFadeInFunc = [scrollDown](float t) {
|
||||||
|
scrollDown->setOpacity(
|
||||||
|
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
|
||||||
|
};
|
||||||
|
scrollDown->setAnimation(new LambdaAnimation(downFadeInFunc, fadeInTime), 0,
|
||||||
|
nullptr, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (downFadeOut) {
|
||||||
|
auto downFadeOutFunc = [scrollDown](float t) {
|
||||||
|
scrollDown->setOpacity(
|
||||||
|
static_cast<unsigned char>(glm::mix(0.0f, 1.0f, t) * 255));
|
||||||
|
};
|
||||||
|
scrollDown->setAnimation(new LambdaAnimation(downFadeOutFunc, fadeInTime), 0,
|
||||||
|
nullptr, true);
|
||||||
|
}
|
||||||
|
|
||||||
mPreviousScrollState = state;
|
mPreviousScrollState = state;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue