diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
| commit | ba5760a4d9d110890aab26a394479b36e60915d7 (patch) | |
| tree | acad21a7c576de056bfa21a37027a673feab8fad /indra/llui/lllayoutstack.cpp | |
| parent | bd64c483639ae33518609398fce7c51ddc73dae7 (diff) | |
| parent | f2510ca0d629a2cd6cd85588698672f5a0c4e64a (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 4c730286da..be6d359c9a 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -767,7 +767,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect& { // freeze new size as fraction F32 new_fractional_size = (updated_auto_resize_headroom == 0.f) ? MAX_FRACTIONAL_SIZE - : llclamp(total_visible_fraction * (F32)(new_dim - panelp->getRelevantMinDim()) / updated_auto_resize_headroom, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE); + : llclamp(total_visible_fraction * (F32)(new_dim - panelp->getRelevantMinDim() - 1) / updated_auto_resize_headroom, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE); fraction_given_up -= new_fractional_size - panelp->mFractionalSize; fraction_remaining -= panelp->mFractionalSize; panelp->mFractionalSize = new_fractional_size; |