Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just fixed this file up a bit to look a bit nicer... Won't affect performance.

Browse Source
This commit is contained in:
Lirusaito
2012-01-06 11:18:31 -05:00
parent 566152c230
commit 900d063d4f
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llui/llradiogroup.cpp
View File

@@ -47,11 +47,9 @@
static LLRegisterWidget<LLRadioGroup> r("radio_group"); static LLRegisterWidget<LLRadioGroup> r("radio_group");
LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect, LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
const std::string& control_name, const std::string& control_name, LLUICtrlCallback callback,
LLUICtrlCallback callback, void* userdata, BOOL border) :
void* userdata, LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
BOOL border)
: LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
mSelectedIndex(0) mSelectedIndex(0)
{ {
setControlName(control_name, NULL); setControlName(control_name, NULL);
@@ -59,10 +57,8 @@ LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
} }
LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect, LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
S32 initial_index, S32 initial_index, LLUICtrlCallback callback,
LLUICtrlCallback callback, void* userdata, BOOL border) :
void* userdata,
BOOL border) :
LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP), LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
mSelectedIndex(initial_index) mSelectedIndex(initial_index)
{ {
@@ -74,10 +70,8 @@ void LLRadioGroup::init(BOOL border)
if (border) if (border)
{ {
addChild( new LLViewBorder( std::string("radio group border"), addChild( new LLViewBorder( std::string("radio group border"),
LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), LLRect(0, getRect().getHeight(), getRect().getWidth(), 0),
LLViewBorder::BEVEL_NONE, LLViewBorder::BEVEL_NONE, LLViewBorder::STYLE_LINE, 1 ));
LLViewBorder::STYLE_LINE,
1 ) );
} }
mHasBorder = border; mHasBorder = border;
} }
@@ -257,8 +251,7 @@ void LLRadioGroup::draw()
LLRadioCtrl* LLRadioGroup::addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font ) LLRadioCtrl* LLRadioGroup::addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font )
{ {
// Highlight will get fixed in draw method above // Highlight will get fixed in draw method above
LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font, LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font, onClickButton, this);
onClickButton, this);
addChild(radio); addChild(radio);
mRadioButtons.push_back(radio); mRadioButtons.push_back(radio);
return radio; return radio;