From 10738b1447b1fa0e30d2c2620976b82ad042feab Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 17 Feb 2021 15:14:32 +0100
Subject: [PATCH] FIRE-30763: Fix chat header layout

---
 indra/newview/fschathistory.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index 61bcf6b519..b154ac17ef 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -141,6 +141,7 @@ public:
 		mUserNameFont(NULL),
 		mUserNameTextBox(NULL),
 		mTimeBoxTextBox(NULL),
+		mHeaderLayoutStack(NULL),
 		mAvatarNameCacheConnection()
 	{}
 
@@ -577,6 +578,7 @@ public:
 
 		mUserNameTextBox = getChild<LLTextBox>("user_name");
 		mTimeBoxTextBox = getChild<LLTextBox>("time_box");
+		mHeaderLayoutStack = getChild<LLLayoutStack>("header_ls");
 
 		mInfoCtrl = LLUICtrlFactory::getInstance()->createFromFile<LLUICtrl>("inspector_info_ctrl.xml", this, LLPanel::child_registry_t::instance());
 		llassert(mInfoCtrl != NULL);
@@ -1063,8 +1065,10 @@ private:
 		mTimeBoxTextBox->translate(delta_pos_x, delta_pos_y);
 
 		//... & change width of the name control
-		const LLRect& user_rect = mUserNameTextBox->getRect();
-		mUserNameTextBox->reshape(user_rect.getWidth() + delta_pos_x, user_rect.getHeight());
+		//const LLRect& user_rect = mUserNameTextBox->getRect();
+		//mUserNameTextBox->reshape(user_rect.getWidth() + delta_pos_x, user_rect.getHeight());
+		const LLRect& layoutstack_rect = mHeaderLayoutStack->getRect();
+		mHeaderLayoutStack->reshape(layoutstack_rect.getWidth() + delta_pos_x, layoutstack_rect.getHeight());
 	}
 
 	void fetchAvatarName()
@@ -1127,6 +1131,7 @@ protected:
 	const LLFontGL*		mUserNameFont;
 	LLTextBox*			mUserNameTextBox;
 	LLTextBox*			mTimeBoxTextBox;
+	LLLayoutStack*		mHeaderLayoutStack;
 
 	LLStyle::Params		mNameStyleParams;