mirror of https://github.com/PCSX2/pcsx2.git
parent
d9ddab1a33
commit
5536342f9d
|
@ -755,9 +755,21 @@ void ImGuiManager::DrawOSDMessages(Common::Timer::Value current_time)
|
|||
float actual_y = msg.last_y;
|
||||
if (msg.target_y != expected_y)
|
||||
{
|
||||
if (msg.last_y < 0.0f)
|
||||
{
|
||||
// First showing.
|
||||
msg.last_y = expected_y;
|
||||
}
|
||||
else
|
||||
{
|
||||
// We got repositioned, probably due to another message above getting removed.
|
||||
const float time_since_move =
|
||||
static_cast<float>(Common::Timer::ConvertValueToSeconds(current_time - msg.move_time));
|
||||
const float frac = Easing::OutExpo(time_since_move / MOVE_DURATION);
|
||||
msg.last_y = std::floor(msg.last_y - ((msg.last_y - msg.target_y) * frac));
|
||||
}
|
||||
msg.move_time = current_time;
|
||||
msg.target_y = expected_y;
|
||||
msg.last_y = (msg.last_y < 0.0f) ? expected_y : msg.last_y;
|
||||
actual_y = msg.last_y;
|
||||
}
|
||||
else if (actual_y != expected_y)
|
||||
|
@ -773,7 +785,7 @@ void ImGuiManager::DrawOSDMessages(Common::Timer::Value current_time)
|
|||
else
|
||||
{
|
||||
const float frac = Easing::OutExpo(time_since_move / MOVE_DURATION);
|
||||
actual_y = msg.last_y - ((msg.last_y - msg.target_y) * frac);
|
||||
actual_y = std::floor(msg.last_y - ((msg.last_y - msg.target_y) * frac));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue