From 59d3087700c786212fcc2a44455fca6fb4a6a739 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 4 Mar 2010 16:05:05 +0200
Subject: Backed out changeset: 317082ea4701 reverted fix for (EXT-3852 Tabs in
Tabbed Instant Messaging do not auto focus the text field when clicked)
Previously implemented solution conflicts with test case in EXT-5387.
--HG--
branch : product-engine
---
indra/newview/llimfloater.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index fdc5d14d97..9bd5a8d5aa 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -629,9 +629,8 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void*
// child on tab button's mouse up. This leads input field lost focus. See EXT-3852.
if (isChatMultiTab())
{
- // So, clear control captured mouse to prevent LLTabContainer set focus on the panel's first child.
- // do not pass self->mInputEditor, this leads to have "Edit Text" mouse pointer wherever it is.
- gFocusMgr.setMouseCapture(NULL);
+ // So, let capture mouse tp prevent LLTabContainer set focus on the panel's first child.
+ gFocusMgr.setMouseCapture(self->mInputEditor);
}
}
--
cgit v1.2.3
From dea244dcead7ed362eae330794c9fcd5a389394b Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 4 Mar 2010 16:06:58 +0200
Subject: Backed out changeset: 07f21c92896f reverted fix for (EXT-3852 Tabs in
Tabbed Instant Messaging do not auto focus the text field when clicked)
Previously implemented solution conflicts with test case in EXT-5387.
--HG--
branch : product-engine
---
indra/newview/llimfloater.cpp | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 9bd5a8d5aa..259f629bdd 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -120,12 +120,6 @@ void LLIMFloater::onFocusLost()
void LLIMFloater::onFocusReceived()
{
LLIMModel::getInstance()->setActiveSessionID(mSessionID);
-
- // return focus to the input field when active tab in the multitab container is clicked.
- if (isChatMultiTab() && mInputEditor)
- {
- mInputEditor->setFocus(TRUE);
- }
}
// virtual
@@ -624,14 +618,6 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void*
//in disconnected state IM input editor should be disabled
self->mInputEditor->setEnabled(!gDisconnected);
}
-
- // when IM Floater is a part of the multitab container LLTabContainer set focus to the first
- // child on tab button's mouse up. This leads input field lost focus. See EXT-3852.
- if (isChatMultiTab())
- {
- // So, let capture mouse tp prevent LLTabContainer set focus on the panel's first child.
- gFocusMgr.setMouseCapture(self->mInputEditor);
- }
}
// static
--
cgit v1.2.3