diff options
| author | richard <none@none> | 2009-11-25 18:24:39 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-25 18:24:39 -0800 |
| commit | cdb223228479e97d9cfe7d80d0afef0d99179d24 (patch) | |
| tree | 210d1bed1a0bb716ad919d516a66a4170f6bcdd4 /indra/llui/lltooltip.cpp | |
| parent | 52a387e00f963d9920f36ffc0dcc855889f36cad (diff) | |
created container for LLFloaterView for future z-swapping with sidetray
floaters can now overlap sidetray
fixed text selection background color to be inverse of text fg color
EXT-2713 Script editor automatically scrolls to the top of script text when text is longer than the window.
reviewed by James
Diffstat (limited to 'indra/llui/lltooltip.cpp')
| -rw-r--r-- | indra/llui/lltooltip.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 959313a5b6..cf135997b2 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -300,9 +300,8 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p) mTextBox->setText(p.message()); } - LLRect text_contents_rect = mTextBox->getContentsRect(); - S32 text_width = llmin(p.max_width(), text_contents_rect.getWidth()); - S32 text_height = text_contents_rect.getHeight(); + S32 text_width = llmin(p.max_width(), mTextBox->getTextPixelWidth()); + S32 text_height = mTextBox->getTextPixelHeight(); mTextBox->reshape(text_width, text_height); // reshape tooltip panel to fit text box |