Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
129a5222
Commit
129a5222
authored
13 years ago
by
Jonathan Yap
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/newview/lltoastnotifypanel.cpp
+3
-3
3 additions, 3 deletions
indra/newview/lltoastnotifypanel.cpp
with
4 additions
and
3 deletions
doc/contributions.txt
+
1
−
0
View file @
129a5222
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lltoastnotifypanel.cpp
+
3
−
3
View file @
129a5222
...
@@ -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 button
s
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment