summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-03-04 15:27:28 -0800
committerRichard Nelson <none@none>2010-03-04 15:27:28 -0800
commit5208aa56bd28490084166d0f755ce8d2f0dcd5a2 (patch)
treed666377bb47542a012e425529bbe79d6bd04942f /indra
parent902548c55cce856633a74fe98f515ad4b1804c05 (diff)
fixed expandable text box not hiding when clicking off them
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llexpandabletextbox.cpp7
-rw-r--r--indra/newview/llexpandabletextbox.h6
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index 9a906d8323..362010d65a 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -412,6 +412,13 @@ void LLExpandableTextBox::onFocusLost()
LLUICtrl::onFocusLost();
}
+void LLExpandableTextBox::onTopLost()
+{
+ collapseTextBox();
+
+ LLUICtrl::onTopLost();
+}
+
void LLExpandableTextBox::setValue(const LLSD& value)
{
collapseTextBox();
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
index 690c500e84..9d4a8aef76 100644
--- a/indra/newview/llexpandabletextbox.h
+++ b/indra/newview/llexpandabletextbox.h
@@ -140,6 +140,12 @@ public:
/*virtual*/ void onFocusLost();
/**
+ * Collapses text box on top_lost event
+ */
+ /*virtual*/ void onTopLost();
+
+
+ /**
* Draws text box, collapses text box if its expanded and its parent's position changed
*/
/*virtual*/ void draw();