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
8acb521a
Commit
8acb521a
authored
14 years ago
by
Merov Linden
Browse files
Options
Downloads
Plain Diff
STORM-693 : pull into viewer-development
parents
1fb47692
18a18f59
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/llscrollingpanelparam.cpp
+6
-2
6 additions, 2 deletions
indra/newview/llscrollingpanelparam.cpp
indra/newview/lltoolmorph.cpp
+2
-2
2 additions, 2 deletions
indra/newview/lltoolmorph.cpp
indra/newview/lltoolmorph.h
+1
-1
1 addition, 1 deletion
indra/newview/lltoolmorph.h
with
9 additions
and
5 deletions
indra/newview/llscrollingpanelparam.cpp
+
6
−
2
View file @
8acb521a
...
...
@@ -165,12 +165,16 @@ void LLScrollingPanelParam::draw()
getChildView
(
"max param text"
)
->
setVisible
(
FALSE
);
LLPanel
::
draw
();
// If we're in a focused floater, don't apply the floater's alpha to visual param hint,
// making its behavior similar to texture controls'.
F32
alpha
=
getTransparencyType
()
==
TT_ACTIVE
?
1.0
f
:
getCurrentTransparency
();
// Draw the hints over the "less" and "more" buttons.
gGL
.
pushUIMatrix
();
{
const
LLRect
&
r
=
mHintMin
->
getRect
();
gGL
.
translateUI
((
F32
)
r
.
mLeft
,
(
F32
)
r
.
mBottom
,
0.
f
);
mHintMin
->
draw
();
mHintMin
->
draw
(
alpha
);
}
gGL
.
popUIMatrix
();
...
...
@@ -178,7 +182,7 @@ void LLScrollingPanelParam::draw()
{
const
LLRect
&
r
=
mHintMax
->
getRect
();
gGL
.
translateUI
((
F32
)
r
.
mLeft
,
(
F32
)
r
.
mBottom
,
0.
f
);
mHintMax
->
draw
();
mHintMax
->
draw
(
alpha
);
}
gGL
.
popUIMatrix
();
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lltoolmorph.cpp
+
2
−
2
View file @
8acb521a
...
...
@@ -244,13 +244,13 @@ BOOL LLVisualParamHint::render()
//-----------------------------------------------------------------------------
// draw()
//-----------------------------------------------------------------------------
void
LLVisualParamHint
::
draw
()
void
LLVisualParamHint
::
draw
(
F32
alpha
)
{
if
(
!
mIsVisible
)
return
;
gGL
.
getTexUnit
(
0
)
->
bind
(
this
);
gGL
.
color4f
(
1.
f
,
1.
f
,
1.
f
,
1.
f
);
gGL
.
color4f
(
1.
f
,
1.
f
,
1.
f
,
alpha
);
LLGLSUIDefault
gls_ui
;
gGL
.
begin
(
LLRender
::
QUADS
);
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lltoolmorph.h
+
1
−
1
View file @
8acb521a
...
...
@@ -68,7 +68,7 @@ class LLVisualParamHint : public LLViewerDynamicTexture
BOOL
render
();
void
requestUpdate
(
S32
delay_frames
)
{
mNeedsUpdate
=
TRUE
;
mDelayFrames
=
delay_frames
;
}
void
setUpdateDelayFrames
(
S32
delay_frames
)
{
mDelayFrames
=
delay_frames
;
}
void
draw
();
void
draw
(
F32
alpha
);
LLViewerVisualParam
*
getVisualParam
()
{
return
mVisualParam
;
}
F32
getVisualParamWeight
()
{
return
mVisualParamWeight
;
}
...
...
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