diff options
author | Denis Serdjuk <dserduk@productengine.com> | 2010-03-09 13:42:39 +0200 |
---|---|---|
committer | Denis Serdjuk <dserduk@productengine.com> | 2010-03-09 13:42:39 +0200 |
commit | ded6723781fa87954b4bba9bee98f9a50c6f9d82 (patch) | |
tree | d56d9ad404ed98d3f53bb4724fa14d74f379c468 /indra/newview/llscriptfloater.cpp | |
parent | b52c1682a8c103d99e5ebc702b0bae28971e1886 (diff) |
fixed Normal Bug EXT-5999 llDialog in 2.0 viewer has different text limits than in 1.23 viewer
Cause:
Dialog floater had arranged own shape to the shape of toast panel. So there is no way to change such behaviour from xml without changing of other toasts
Solution:
New param has been added to constructor of toast panel to make possible setting an initial shape of panel before update buttons layout
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
-rw-r--r-- | indra/newview/llscriptfloater.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index eb71cc52c8..f35cb3516a 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -154,14 +154,17 @@ void LLScriptFloater::createForm(const LLUUID& notification_id) } // create new form - mScriptForm = new LLToastNotifyPanel(notification); + LLRect toast_rect = getRect(); + // LLToastNotifyPanel will fit own content in vertical direction, + // but it needs an initial rect to properly calculate its width + // Use an initial rect of the script floater to make the floater window more configurable. + mScriptForm = new LLToastNotifyPanel(notification, toast_rect); addChild(mScriptForm); // position form on floater mScriptForm->setOrigin(0, 0); // make floater size fit form size - LLRect toast_rect = getRect(); LLRect panel_rect = mScriptForm->getRect(); toast_rect.setLeftTopAndSize(toast_rect.mLeft, toast_rect.mTop, panel_rect.getWidth(), panel_rect.getHeight() + getHeaderHeight()); setShape(toast_rect); |