From df83b02f1dce050aa905f9c18a55cbf23ffb5014 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:43:04 +1000 Subject: [PATCH] move interface item messages when bottomActionBar is enabled --- source/frontend/StarMainInterface.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source/frontend/StarMainInterface.cpp b/source/frontend/StarMainInterface.cpp index 591f43f..b43319f 100644 --- a/source/frontend/StarMainInterface.cpp +++ b/source/frontend/StarMainInterface.cpp @@ -1042,11 +1042,20 @@ void MainInterface::renderBreath() { } void MainInterface::renderMessages() { + if (m_messages.empty()) + return; + Vec2F totalOffset = {}; auto imgMetadata = Root::singleton().imageMetadataDatabase(); + unsigned bottomOffset = Root::singleton().configuration()->getPath("inventory.bottomActionBar").optBool().value(false) ? 32 : 0; for (auto& message : m_messages) { 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; messageOffset = totalOffset + hiddenOffset;