diff options
| author | Paul Guslisty <pguslisty@productengine.com> | 2010-11-29 16:48:58 +0200 |
|---|---|---|
| committer | Paul Guslisty <pguslisty@productengine.com> | 2010-11-29 16:48:58 +0200 |
| commit | 2f0919b175444221783942ce6f49e2e04a725227 (patch) | |
| tree | 4cd441b1870ff58ff86d8b673f7def8810fbc21f /indra/newview | |
| parent | bca2162c4fac7f80f6137f4a8bae9bc7740eb8e1 (diff) | |
STORM-688 FIXED Sidebar becomes semitransparent if dock semitransparent side panel back to the Sidebar
- Before docking the tab back to the sidetray, set floater's children to non-transparent state
- After detaching tab from the sidetray there is no need to set manually floater's children transparency. It happens automatically when floater gets focus.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index a4f855f279..526f3d1e77 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -118,7 +118,7 @@ public: protected: LLSideTrayTab(const Params& params); - void dock(); + void dock(LLFloater* floater_tab); void undock(LLFloater* floater_tab); LLSideTray* getSideTray(); @@ -259,7 +259,7 @@ void LLSideTrayTab::toggleTabDocked() if (docking) { - dock(); + dock(floater_tab); } else { @@ -271,11 +271,14 @@ void LLSideTrayTab::toggleTabDocked() LLFloaterReg::toggleInstance("side_bar_tab", tab_name); } -void LLSideTrayTab::dock() +void LLSideTrayTab::dock(LLFloater* floater_tab) { LLSideTray* side_tray = getSideTray(); if (!side_tray) return; + // Before docking the tab, reset its (and its children's) transparency to default (STORM-688). + floater_tab->updateChildrenTransparency(TT_DEFAULT); + if (!side_tray->addTab(this)) { llwarns << "Failed to add tab " << getName() << " to side tray" << llendl; |