diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-02-02 21:53:52 +0200 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-02-02 21:53:52 +0200 |
| commit | 347daac67daddad37f0722ea2ea9b717e96c10ab (patch) | |
| tree | 072eea2665074a3a96e877d035725b6a8431de27 /indra/newview/llexpandabletextbox.h | |
| parent | df7292b716168b464b957731325b76d2e952f3aa (diff) | |
Fixed normal bug EXT-4105 ([BSI] group names are not able to be copied from side panel) - changed LLTextBoxEx class to inherit the LLTextEditor behavior
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llexpandabletextbox.h')
| -rw-r--r-- | indra/newview/llexpandabletextbox.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 2b4f9e527c..58316ddb98 100644 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -33,7 +33,7 @@ #ifndef LL_LLEXPANDABLETEXTBOX_H #define LL_LLEXPANDABLETEXTBOX_H -#include "lltextbox.h" +#include "lltexteditor.h" #include "llscrollcontainer.h" /** @@ -49,10 +49,10 @@ protected: * Extended text box. "More" link will appear at end of text if * text is too long to fit into text box size. */ - class LLTextBoxEx : public LLTextBox + class LLTextBoxEx : public LLTextEditor { public: - struct Params : public LLInitParam::Block<Params, LLTextBox::Params> + struct Params : public LLInitParam::Block<Params, LLTextEditor::Params> { Mandatory<std::string> more_label; Params(); @@ -70,6 +70,11 @@ protected: virtual S32 getVerticalTextDelta(); /** + * Returns the height of text rect. + */ + S32 getTextPixelHeight(); + + /** * Shows "More" link */ void showExpandText(); |