Skip to content
Snippets Groups Projects
Commit 129a5222 authored by Jonathan Yap's avatar Jonathan Yap
Browse files

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

parent 289d756e
No related branches found
No related tags found
No related merge requests found
...@@ -610,6 +610,7 @@ Jonathan Yap ...@@ -610,6 +610,7 @@ Jonathan Yap
STORM-1788 STORM-1788
STORM-1799 STORM-1799
STORM-1796 STORM-1796
STORM-1822
Kadah Coba Kadah Coba
STORM-1060 STORM-1060
Jondan Lundquist Jondan Lundquist
......
...@@ -243,8 +243,8 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt ...@@ -243,8 +243,8 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
mBtnCallbackData.push_back(userdata); mBtnCallbackData.push_back(userdata);
LLButton::Params p; LLButton::Params p;
bool is_ignore_btn = form_element["index"].asInteger() == -1; bool make_small_btn = form_element["index"].asInteger() == -1 || form_element["index"].asInteger() == -2;
const LLFontGL* font = is_ignore_btn ? sFontSmall: sFont; // for ignore button in script dialog const LLFontGL* font = make_small_btn ? sFontSmall: sFont; // for block and ignore buttons in script dialog
p.name(form_element["name"].asString()); p.name(form_element["name"].asString());
p.label(form_element["text"].asString()); p.label(form_element["text"].asString());
p.font(font); p.font(font);
...@@ -264,7 +264,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt ...@@ -264,7 +264,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
p.rect.width = 1; p.rect.width = 1;
p.auto_resize = true; p.auto_resize = true;
} }
else if (mIsScriptDialog && is_ignore_btn) else if (mIsScriptDialog && make_small_btn)
{ {
// this is ignore button, make it smaller // this is ignore button, make it smaller
p.rect.height = BTN_HEIGHT_SMALL; p.rect.height = BTN_HEIGHT_SMALL;
......
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