1 files changed, 63 insertions, 10 deletions

diff --git a/indra/newview/lltoastscriptquestion.cpp b/indra/newview/lltoastscriptquestion.cpp
index 25dc0982b8..55e178e084 100644
--- a/indra/newview/lltoastscriptquestion.cpp
+++ b/indra/newview/lltoastscriptquestion.cpp
@@ -48,7 +48,12 @@ bool LLToastScriptQuestion::postBuild()
     LLTextBox* mFooter = getChild<LLTextBox>("bottom_info_message");
 
     mMessage->setValue(mNotification->getMessage());
-    mFooter->setValue(mNotification->getFooter());
+    std::string footer = mNotification->getFooter();
+    mFooter->setValue(footer);
+    if (footer.empty())
+    {
+        mFooter->setVisible(false);
+    }
 
     snapToMessageHeight();
 
@@ -78,21 +83,69 @@ void LLToastScriptQuestion::snapToMessageHeight()
 
     if (mMessage->getVisible() && mFooter->getVisible())
     {
-        S32 heightDelta = 0;
-        S32 maxTextHeight = (mMessage->getFont()->getLineHeight() * MAX_LINES_COUNT)
+        S32 height_delta = 0;
+        S32 max_text_height = (mMessage->getFont()->getLineHeight() * MAX_LINES_COUNT)
                           + (mFooter->getFont()->getLineHeight() * MAX_LINES_COUNT);
 
-        LLRect messageRect = mMessage->getRect();
-        LLRect footerRect  = mFooter->getRect();
+        LLRect message_rect = mMessage->getRect();
+
+        S32 old_message_height = message_rect.getHeight();
+        S32 new_message_height = mMessage->getTextBoundingRect().getHeight();
+        S32 new_footer_height = mFooter->getTextBoundingRect().getHeight();
+
+        constexpr S32 FOOTER_PADDING = 8; // new height should include padding for newly added footer
+        S32 required_text_height = new_message_height + new_footer_height + FOOTER_PADDING;
+        S32 new_text_height = llmin(required_text_height, max_text_height);
+
+        // Footer was invisible, so use old_message_height for old height
+        height_delta = new_text_height - old_message_height;
+
+        reshape( getRect().getWidth(), llmax(getRect().getHeight() + height_delta, MIN_PANEL_HEIGHT));
+
+        // Floater was resized, now resize and shift children
+        // Message follows top, so it's top is in a correct position, but needs to be resized down
+        S32 message_delta = new_message_height - old_message_height;
+        message_rect = mMessage->getRect(); // refresh since it might have changed after reshape
+        message_rect.mBottom = message_rect.mBottom - message_delta;
+        mMessage->setRect(message_rect);
+        mMessage->needsReflow();
+        // Button panel should stay the same size, just translate it
+        LLPanel* panel = getChild<LLPanel>("buttons_panel");
+        panel->translate(0, -message_delta);
+        // Footer should be both moved and resized
+        LLRect footer_rect = mFooter->getRect();
+        footer_rect.mTop = footer_rect.mTop - message_delta;
+        footer_rect.mBottom = footer_rect.mTop - new_footer_height;
+        mFooter->setRect(footer_rect);
+        mFooter->needsReflow();
+    }
+    else if (mMessage->getVisible())
+    {
+        S32 height_delta = 0;
+        S32 max_text_height = (mMessage->getFont()->getLineHeight() * MAX_LINES_COUNT);
+
+        LLRect message_rect = mMessage->getRect();
+
+        S32 old_message_height = message_rect.getHeight();
+        S32 new_message_height = mMessage->getTextBoundingRect().getHeight();
 
-        S32 oldTextHeight = messageRect.getHeight() + footerRect.getHeight();
+        S32 new_text_height = llmin(new_message_height, max_text_height);
 
-        S32 requiredTextHeight = mMessage->getTextBoundingRect().getHeight() + mFooter->getTextBoundingRect().getHeight();
-        S32 newTextHeight = llmin(requiredTextHeight, maxTextHeight);
+        // Footer was invisible, so use old_message_height for old height
+        height_delta = new_text_height - old_message_height;
 
-        heightDelta = newTextHeight - oldTextHeight - heightDelta;
+        reshape(getRect().getWidth(), llmax(getRect().getHeight() + height_delta, MIN_PANEL_HEIGHT));
 
-        reshape( getRect().getWidth(), llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT));
+        // Floater was resized, now resize and shift children
+        // Message follows top, so it's top is in a correct position, but needs to be resized down
+        S32 message_delta = new_message_height - old_message_height;
+        message_rect = mMessage->getRect(); // refresh since it might have changed after reshape
+        message_rect.mBottom = message_rect.mBottom - message_delta;
+        mMessage->setRect(message_rect);
+        mMessage->needsReflow();
+        // Button panel should stay the same size, just translate it
+        LLPanel* panel = getChild<LLPanel>("buttons_panel");
+        panel->translate(0, -message_delta);
     }
 }