diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-06-22 16:54:42 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-06-22 16:54:42 +0300 |
| commit | 6bb554fc3661d3b8b1284db96bb7c7b0934df621 (patch) | |
| tree | 565b9912d0b3e292030abd850a072f71e1d9e0a6 /indra/newview/llimfloater.cpp | |
| parent | d866328f6a9e6537eb8a9775acf4f403b7ad6af6 (diff) | |
CHUI-160 FIXED (Text entered in local chat text field scrolls up and becomes only partially visible after hitting return)
- Replaced LLLineEditor with LLChatEntry in nearby chat
- Moved reshape method from LLIMFloater to the base LLIMConversation so that vertical reshaping work properly for both LLNearbyChat and LLIMFloater
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 4b954de738..98ebc82f99 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -64,7 +64,6 @@ LLIMFloater::LLIMFloater(const LLUUID& session_id) mLastMessageIndex(-1), mDialog(IM_NOTHING_SPECIAL), mInputEditor(NULL), - mInputEditorTopPad(0), mSavedTitle(), mTypingStart(), mShouldSendTypingState(false), @@ -314,12 +313,9 @@ BOOL LLIMFloater::postBuild() mInputEditor->setPassDelete( TRUE ); mInputEditor->setCommitCallback(boost::bind(onSendMsg, _1, this)); - mInputEditor->setTextExpandedCallback(boost::bind(&LLIMFloater::reshapeChatHistory, this)); mChatHistory = getChild<LLChatHistory>("chat_history"); - mInputEditorTopPad = mChatHistory->getRect().mBottom - mInputEditor->getRect().mTop; - setDocked(true); mTypingStart = LLTrans::getString("IM_typing_start_string"); @@ -1171,17 +1167,6 @@ void LLIMFloater::removeTypingIndicator(const LLIMInfo* im_info) } } -void LLIMFloater::reshapeChatHistory() -{ - LLRect chat_rect = mChatHistory->getRect(); - LLRect input_rect = mInputEditor->getRect(); - - int delta_height = chat_rect.mBottom - (input_rect.mTop + mInputEditorTopPad); - - chat_rect.setLeftTopAndSize(chat_rect.mLeft, chat_rect.mTop, chat_rect.getWidth(), chat_rect.getHeight() + delta_height); - mChatHistory->setShape(chat_rect); -} - // static void LLIMFloater::closeHiddenIMToasts() { |