livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1822 Change size of Block button in dialog boxes to help prevent accidental clicks

meow-7.2.2
Jonathan Yap 2012-03-22 12:29:03 -04:00
parent 289d756ea8
commit 129a522235
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -610,6 +610,7 @@ Jonathan Yap
STORM-1788
STORM-1799
STORM-1796
STORM-1822
Kadah Coba
STORM-1060
Jondan Lundquist

6
indra/newview/lltoastnotifypanel.cpp
View File

@ -243,8 +243,8 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
mBtnCallbackData.push_back(userdata);
LLButton::Params p;
bool is_ignore_btn = form_element["index"].asInteger() == -1;
const LLFontGL* font = is_ignore_btn ? sFontSmall: sFont; // for ignore button in script dialog
bool make_small_btn = form_element["index"].asInteger() == -1 || form_element["index"].asInteger() == -2;
const LLFontGL* font = make_small_btn ? sFontSmall: sFont; // for block and ignore buttons in script dialog
p.name(form_element["name"].asString());
p.label(form_element["text"].asString());
p.font(font);
@ -264,7 +264,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
p.rect.width = 1;
p.auto_resize = true;
}
else if (mIsScriptDialog && is_ignore_btn)
else if (mIsScriptDialog && make_small_btn)
{
// this is ignore button, make it smaller
p.rect.height = BTN_HEIGHT_SMALL;