Skip to content
Snippets Groups Projects
Commit 9c7a1c78 authored by Richard Linden's avatar Richard Linden
Browse files

deprecated text_enabled_color and text_disabled_color from LLCheckBoxCtrl in...

deprecated text_enabled_color and text_disabled_color from LLCheckBoxCtrl in favor of label_text.text_color and label_text.text_readonly_color, respectively
parent 32d29496
No related branches found
No related tags found
No related merge requests found
......@@ -50,9 +50,7 @@ template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>(
const std::string& name, BOOL recurse) const;
LLCheckBoxCtrl::Params::Params()
: text_enabled_color("text_enabled_color"),
text_disabled_color("text_disabled_color"),
initial_value("initial_value", false),
: initial_value("initial_value", false),
label_text("label_text"),
check_button("check_button"),
radio_style("radio_style")
......@@ -61,8 +59,8 @@ LLCheckBoxCtrl::Params::Params()
LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p)
: LLUICtrl(p),
mTextEnabledColor(p.text_enabled_color()),
mTextDisabledColor(p.text_disabled_color()),
mTextEnabledColor(p.label_text.text_color()),
mTextDisabledColor(p.label_text.text_readonly_color()),
mFont(p.font())
{
mViewModel->setValue(LLSD(p.initial_value));
......@@ -89,7 +87,6 @@ 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);
......
......@@ -52,8 +52,6 @@ class LLCheckBoxCtrl
struct Params
: public LLInitParam::Block<Params, LLUICtrl::Params>
{
Optional<LLUIColor> text_enabled_color;
Optional<LLUIColor> text_disabled_color;
Optional<bool> initial_value; // override LLUICtrl initial_value
Optional<LLTextBox::Params> label_text;
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<check_box
text_enabled_color="LabelTextColor"
text_disabled_color="LabelDisabledColor"
label_text.text_color="LabelTextColor"
label_text.text_readonly_color="LabelDisabledColor"
font="SansSerif"
follows="left|top"
name="check"/>
\ No newline at end of file
......@@ -16,7 +16,7 @@
layout="topleft"
left="5"
name="DontShowFirstTimeTip_checkbox"
text_enabled_color="white"
label_text.text_color="white"
top="225"
width="200" />
</floater>
......@@ -41,7 +41,7 @@
layout="topleft"
left_delta="0"
name="text_enabled_color_checkbox"
text_enabled_color="EmphasisColor"
label_text.text_color="EmphasisColor"
top_pad="14"
width="150" />
<check_box
......@@ -51,7 +51,7 @@
layout="topleft"
left_delta="0"
name="text_disabled_color_checkbox"
text_disabled_color="EmphasisColor_35"
label_text.text_readonly_color="EmphasisColor_35"
top_pad="14"
width="150" />
<check_box
......
......@@ -242,7 +242,7 @@
left="8"
name="show_in_search_checkbox"
height="15"
text_enabled_color="white"
label_text.text_color="white"
top_pad="12"
width="100" />
<text
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<check_box text_enabled_color="LabelTextColor"
text_disabled_color="LabelDisabledColor"
font="SansSerifSmall"
<check_box font="SansSerifSmall"
follows="left|top">
<check_box.label_text name="checkbox label" />
<check_box.label_text name="checkbox label"
text_color="LabelTextColor"
text_readonly_color="LabelDisabledColor"/>
<check_box.check_button name="CheckboxCtrl Button"
commit_on_return="false"
label=""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment