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/llfloater.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/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 8cf65fe76a..36a9e0a650 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2347,8 +2347,7 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out } LLRect::tCoordType screen_width = getSnapRect().getWidth(); LLRect::tCoordType screen_height = getSnapRect().getHeight(); - // convert to local coordinate frame - LLRect snap_rect_local = getLocalSnapRect(); + // only automatically resize non-minimized, resizable floaters if( floater->isResizable() && !floater->isMinimized() ) @@ -2388,7 +2387,7 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out } // move window fully onscreen - if (floater->translateIntoRect( snap_rect_local, allow_partial_outside )) + if (floater->translateIntoRect( getLocalRect(), allow_partial_outside )) { floater->clearSnapTarget(); } |