diff options
| author | James Cook <james@lindenlab.com> | 2010-01-05 16:28:22 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-05 16:28:22 -0800 |
| commit | a3adfe54cb9fc953cae0adf2f61c578aa3ca5842 (patch) | |
| tree | a33506af3c061e73b02a79166b009f7a006d5852 | |
| parent | cffe23df08bb0066c936efe667f60e90e0f89fd0 (diff) | |
EXT-3332 Disabled checkboxes don't use disabled text color
Text label color wasn't being set in constructor.
Added example to floater_test_widgets.xml
Reviewed with Richard
| -rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_widgets.xml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index cd10dfdb1c..3d32157406 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -107,8 +107,8 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p) { tbparams.font(p.font); } + tbparams.text_color( p.enabled() ? p.text_enabled_color() : p.text_disabled_color() ); mLabel = LLUICtrlFactory::create<LLTextBox> (tbparams); - addChild(mLabel); // Button diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 84adabe4fa..2f88c234cc 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -123,6 +123,12 @@ layout="topleft" tool_tip="checkbox" name="test_checkbox" /> + <check_box + top_pad="5" + enabled="false" + label="Checkbox Disabled" + tool_tip="checkbox disabled" + name="test_checkbox_disabled" /> <!-- "combo_box" is a pop-menu of items. Optionally the box itself can contain a general purpose line input editor, allowing the user to provide input that is not a list item. --> |