diff options
| author | richard <none@none> | 2009-10-28 12:33:25 -0700 |
|---|---|---|
| committer | richard <none@none> | 2009-10-28 12:33:25 -0700 |
| commit | 6e8c5d206ef72357bea7354f88248f671092bc0e (patch) | |
| tree | 92830626fa8978d9da7d7fd22aaba0629dad5a8d /indra | |
| parent | 16f5b86ff9d35e4224b0f8490c61099b16ddf014 (diff) | |
fix for layout updates of chat history
update document rect twice
increased right padding of inline widgets
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chat_history.xml | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 66ee8f4c1a..653505a12e 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2058,9 +2058,7 @@ void LLTextBase::updateRects() // update document container dimensions according to text contents LLRect doc_rect = mContentsRect; // use old mTextRect constraint document to width of viewable region - LLRect scroll_rect = mTextRect; - // doc_rect.mLeft should be 0 - doc_rect.mRight = doc_rect.mLeft + scroll_rect.getWidth(); + doc_rect.mRight = doc_rect.mLeft + mTextRect.getWidth(); mDocumentView->setShape(doc_rect); @@ -2078,6 +2076,10 @@ void LLTextBase::updateRects() { needsReflow(); } + + // update document container again, using new mTextRect + doc_rect.mRight = doc_rect.mLeft + mTextRect.getWidth(); + mDocumentView->setShape(doc_rect); } diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index 502c396ed8..ea6997ebd5 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -5,7 +5,7 @@ left_text_pad="10" right_text_pad="15" left_widget_pad="0" - right_widget_pad="0" + right_widget_pad="10" max_length="2147483647" enabled="false" track_bottom="true" |