summaryrefslogtreecommitdiff
path: root/indra/llui/llcheckboxctrl.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-01-28 21:47:35 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-01-28 21:47:35 +0000
commit38649767a03b0007991ff1c7dcf8d99f2511bbc5 (patch)
treeb9755bdcc3caa9b472bc1b758543c3187332ddea /indra/llui/llcheckboxctrl.h
parente63381a9365d69204b8e7593f47b963d3d037689 (diff)
parent2998552f3d7447da316afdd1713595528596a0c5 (diff)
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481
Merge
Diffstat (limited to 'indra/llui/llcheckboxctrl.h')
-rw-r--r--indra/llui/llcheckboxctrl.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index 07ae9c3b18..eb5bd5b6da 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -50,6 +50,19 @@ class LLCheckBoxCtrl
, public ll::ui::SearchableControl
{
public:
+
+ enum EWordWrap
+ {
+ WRAP_NONE,
+ WRAP_UP,
+ WRAP_DOWN
+ };
+
+ struct WordWrap : public LLInitParam::TypeValuesHelper<EWordWrap, WordWrap>
+ {
+ static void declareValues();
+ };
+
struct Params
: public LLInitParam::Block<Params, LLUICtrl::Params>
{
@@ -58,6 +71,8 @@ public:
Optional<LLTextBox::Params> label_text;
Optional<LLButton::Params> check_button;
+ Optional<EWordWrap, WordWrap> word_wrap;
+
Ignored radio_style;
Params();
@@ -129,6 +144,8 @@ protected:
LLUIColor mTextEnabledColor;
LLUIColor mTextDisabledColor;
+
+ EWordWrap mWordWrap; // off, shifts text up, shifts text down
};
// Build time optimization, generate once in .cpp file