diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-07-22 22:47:15 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-07-22 22:47:15 +0300 |
| commit | 39c9ec49bffcede6a975290093d070ef6720f197 (patch) | |
| tree | 96350b62190bb673915ed6bd594372629a86f577 /indra | |
| parent | 3dc2c420eb630e8f4e2fa461427e276bd78c8300 (diff) | |
EXT-8342 FIXED Fixed displacement of decription textbox in Place Profile after reshape.
Bug was reproducible on Windows and not on Linux because of different moment when onTopLost() was called for textbox.
On Windows it happened only after reshape, on Linux- before reshape. Made windows behaviour in case of top lost consistent with Linux behaviour.
- An if was added into LLPanelPlaceInfo::reshape to force collapsing description textbox on Windows at the beginning of reshape
(the only case when reshape is skipped there now is when it's caused by expanding/collapsing this textbox, so called_from_parent for panel is FALSE).
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/779
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelplaceinfo.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 8c1f5d0915..99e48cca6d 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -60,7 +60,8 @@ LLPanelPlaceInfo::LLPanelPlaceInfo() mScrollingPanelWidth(0), mInfoType(UNKNOWN), mScrollingPanel(NULL), - mScrollContainer(NULL) + mScrollContainer(NULL), + mDescEditor(NULL) {} //virtual @@ -248,6 +249,16 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data) // virtual void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent) { + + // This if was added to force collapsing description textbox on Windows at the beginning of reshape + // (the only case when reshape is skipped here is when it's caused by this textbox, so called_from_parent is FALSE) + // This way it is consistent with Linux where topLost collapses textbox at the beginning of reshape. + // On windows it collapsed only after reshape which caused EXT-8342. + if(called_from_parent) + { + if(mDescEditor) mDescEditor->onTopLost(); + } + LLPanel::reshape(width, height, called_from_parent); if (!mScrollContainer || !mScrollingPanel) |