From 24d1900ceb7e8978ba39e6e69e671c4521a270a4 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Fri, 27 Aug 2010 19:47:17 +0300 Subject: 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/. --- indra/newview/llsidetray.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'indra') 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(); + } } } -- cgit v1.2.3