move interface item messages when bottomActionBar is enabled

This commit is contained in:
Kae 2023-07-31 15:43:04 +10:00
parent f575bad5e1
commit df83b02f1d

View File

@ -1042,11 +1042,20 @@ void MainInterface::renderBreath() {
} }
void MainInterface::renderMessages() { void MainInterface::renderMessages() {
if (m_messages.empty())
return;
Vec2F totalOffset = {}; Vec2F totalOffset = {};
auto imgMetadata = Root::singleton().imageMetadataDatabase(); auto imgMetadata = Root::singleton().imageMetadataDatabase();
unsigned bottomOffset = Root::singleton().configuration()->getPath("inventory.bottomActionBar").optBool().value(false) ? 32 : 0;
for (auto& message : m_messages) { for (auto& message : m_messages) {
Vec2F hiddenOffset = Vec2F(m_config->messageHiddenOffset); Vec2F hiddenOffset = Vec2F(m_config->messageHiddenOffset);
Vec2F messageOffset = lerp(message->springState, Vec2F(), Vec2F(m_config->messageActiveOffset) - hiddenOffset); Vec2F activeOffset = Vec2F(m_config->messageActiveOffset);
if (bottomOffset) {
activeOffset[1] += bottomOffset;
bottomOffset = 0;
}
Vec2F messageOffset = lerp(message->springState, Vec2F(), activeOffset - hiddenOffset);
totalOffset += messageOffset; totalOffset += messageOffset;
messageOffset = totalOffset + hiddenOffset; messageOffset = totalOffset + hiddenOffset;