diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-08-27 19:47:17 +0300 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-08-27 19:47:17 +0300 |
| commit | 24d1900ceb7e8978ba39e6e69e671c4521a270a4 (patch) | |
| tree | 2f6ed4da070a0d87989554e2edbc293dd0209d40 /indra | |
| parent | 127e1d50c465e9906c8076618275d1a19b2dc1d7 (diff) | |
VWR-20696, VWR-20697 FIXED Fixed selecting re-docked tab and toggling its tag button state.
Minor optimization of Side Tray expanding/collapsing upon toggling tab docked/undocked.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/879/.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 4e3de3650b..d57d414ff8 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -242,7 +242,10 @@ void LLSideTrayTab::toggleTabDocked() // Set FOLLOWS_ALL flag for the tab to follow floater dimensions upon resizing. setFollowsAll(); - side_tray->collapseSideBar(); + if (!side_tray->getCollapsed()) + { + side_tray->collapseSideBar(); + } } else { @@ -255,7 +258,13 @@ void LLSideTrayTab::toggleTabDocked() setRect(side_tray->getLocalRect()); reshape(getRect().getWidth(), getRect().getHeight()); - side_tray->expandSideBar(); + // Select the re-docked tab. + side_tray->selectTabByName(getName()); + + if (side_tray->getCollapsed()) + { + side_tray->expandSideBar(); + } } } |