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
795695a2
Commit
795695a2
authored
13 years ago
by
Leslie Linden
Browse files
Options
Downloads
Patches
Plain Diff
EXP-1396 FIX -- Local chat toasts appear is upper left corner, reviewed by Richard.
parent
a2e32429
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llnearbychathandler.cpp
+6
-6
6 additions, 6 deletions
indra/newview/llnearbychathandler.cpp
with
6 additions
and
6 deletions
indra/newview/llnearbychathandler.cpp
+
6
−
6
View file @
795695a2
...
...
@@ -384,9 +384,9 @@ void LLNearbyChatScreenChannel::arrangeToasts()
channel_rect
.
mLeft
+=
10
;
channel_rect
.
mRight
=
channel_rect
.
mLeft
+
300
;
S32
channel_to
p
=
channel_rect
.
m
Top
;
S32
channel_
bot
to
m
=
channel_rect
.
m
Bottom
;
S32
to
p
=
channel_
top
-
10
;
S32
bot
to
m
=
channel_
bottom
+
10
;
S32
margin
=
gSavedSettings
.
getS32
(
"ToastGap"
);
//sort active toasts
...
...
@@ -403,9 +403,9 @@ void LLNearbyChatScreenChannel::arrangeToasts()
continue
;
}
S32
toast_bottom
=
top
-
toast
->
getRect
().
getHeight
()
-
margin
;
S32
toast_
top
=
bottom
+
toast
->
getRect
().
getHeight
()
+
margin
;
if
(
toast_
bottom
<
channel_rect
.
mBottom
)
if
(
toast_
top
>
channel_rect
.
getHeight
()
)
{
while
(
it
!=
m_active_toasts
.
end
())
{
...
...
@@ -416,10 +416,10 @@ void LLNearbyChatScreenChannel::arrangeToasts()
}
toast_rect
=
toast
->
getRect
();
toast_rect
.
set
Origin
AndSize
(
channel_rect
.
mLeft
,
toast_
bottom
,
toast_rect
.
getWidth
()
,
toast_rect
.
getHeight
());
toast_rect
.
set
LeftTop
AndSize
(
channel_rect
.
mLeft
,
bottom
+
toast_rect
.
getHeight
()
,
toast_rect
.
getWidth
()
,
toast_rect
.
getHeight
());
toast
->
setRect
(
toast_rect
);
top
-
=
toast_rect
.
getHeight
()
-
toast
->
getTopPad
()
+
margin
;
bottom
+
=
toast_rect
.
getHeight
()
-
toast
->
getTopPad
()
+
margin
;
}
// use reverse order to provide correct z-order and avoid toast blinking
...
...
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