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
96b7e176
Commit
96b7e176
authored
14 years ago
by
Sergei Litovchuk
Browse files
Options
Downloads
Patches
Plain Diff
VWR-21060 FIXED creating dummy widget in Side Tray when attempting to get a detached tab.
parent
785de381
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llsidetray.cpp
+19
-3
19 additions, 3 deletions
indra/newview/llsidetray.cpp
with
19 additions
and
3 deletions
indra/newview/llsidetray.cpp
+
19
−
3
View file @
96b7e176
...
...
@@ -529,12 +529,14 @@ void LLSideTray::handleLoginComplete()
LLSideTrayTab
*
LLSideTray
::
getTab
(
const
std
::
string
&
name
)
{
return
get
Child
<
LLSideTrayTab
>
(
name
,
false
);
return
find
Child
<
LLSideTrayTab
>
(
name
,
false
);
}
bool
LLSideTray
::
isTabAttached
(
const
std
::
string
&
name
)
{
LLSideTrayTab
*
tab
=
getTab
(
name
);
if
(
!
tab
)
return
false
;
return
std
::
find
(
mTabs
.
begin
(),
mTabs
.
end
(),
tab
)
!=
mTabs
.
end
();
}
...
...
@@ -619,6 +621,7 @@ bool LLSideTray::selectTabByIndex(size_t index)
bool
LLSideTray
::
selectTabByName
(
const
std
::
string
&
name
)
{
LLSideTrayTab
*
new_tab
=
getTab
(
name
);
if
(
!
new_tab
)
return
false
;
// Bail out if already selected.
if
(
new_tab
==
mActiveTab
)
...
...
@@ -865,8 +868,10 @@ void LLSideTray::processTriState ()
void
LLSideTray
::
onTabButtonClick
(
string
name
)
{
LLSideTrayTab
*
side_bar
=
getTab
(
name
);
if
(
side_bar
==
mActiveTab
)
LLSideTrayTab
*
tab
=
getTab
(
name
);
if
(
!
tab
)
return
;
if
(
tab
==
mActiveTab
)
{
processTriState
();
return
;
...
...
@@ -1141,6 +1146,17 @@ LLPanel *findChildPanel(LLPanel *panel, const std::string& name, bool recurse)
LLPanel
*
LLSideTray
::
getPanel
(
const
std
::
string
&
panel_name
)
{
// Look up the panel in the list of detached tabs.
for
(
child_vector_const_iter_t
child_it
=
mDetachedTabs
.
begin
();
child_it
!=
mDetachedTabs
.
end
();
++
child_it
)
{
LLPanel
*
panel
=
findChildPanel
(
*
child_it
,
panel_name
,
true
);
if
(
panel
)
{
return
panel
;
}
}
// Look up the panel in the list of attached tabs.
for
(
child_vector_const_iter_t
child_it
=
mTabs
.
begin
();
child_it
!=
mTabs
.
end
();
++
child_it
)
{
LLPanel
*
panel
=
findChildPanel
(
*
child_it
,
panel_name
,
true
);
...
...
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