diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-02 20:13:25 +0300 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-02 20:13:25 +0300 |
| commit | c2935e40a6966f47ebd87705dd730ab0960e2b6d (patch) | |
| tree | 0531fde42b4fbf7bada15068cb20516acc0e0de5 /indra | |
| parent | 61555ce1f0d2b45ec21fe123ab604b6e18c21ccc (diff) | |
VWR-20696 ADDITIONAL FIX Fix dock/undock button image changing depending on tab state.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml | 15 |
2 files changed, 23 insertions, 2 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 9893370dcf..086e35dfdc 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -176,6 +176,7 @@ BOOL LLSideTrayTab::postBuild() title_panel->getChild<LLTextBox>(TAB_PANEL_CAPTION_TITLE_BOX)->setValue(mTabTitle); + getChild<LLButton>("undock")->setCommitCallback(boost::bind(&LLSideTrayTab::toggleTabDocked, this)); getChild<LLButton>("dock")->setCommitCallback(boost::bind(&LLSideTrayTab::toggleTabDocked, this)); return true; @@ -221,7 +222,14 @@ void LLSideTrayTab::toggleTabDocked() LLSideTray* side_tray = LLSideTray::getInstance(); - if (LLFloater::isShown(floater_tab)) + bool is_tab_undocked = LLFloater::isShown(floater_tab); + + // Hide the "Tear Off" button when a tab gets undocked + // and show "Dock" button instead. + getChild<LLButton>("undock")->setVisible(!is_tab_undocked); + getChild<LLButton>("dock")->setVisible(is_tab_undocked); + + if (is_tab_undocked) { // Remove the tab from Side Tray's tabs list. // We have to do it despite removing the tab from Side Tray's child view tree diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index 60c2e0830c..349b625cef 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml @@ -22,6 +22,18 @@ <button follows="right|top" height="16" + image_selected="tearoffbox.tga" + image_unselected="tearoffbox.tga" + image_disabled="tearoff_pressed.tga" + layout="topleft" + name="undock" + top="10" + right="-28" + width="16" + tool_tip="Undock" /> + <button + follows="right|top" + height="16" image_selected="Icon_Dock_Press" image_unselected="Icon_Dock_Foreground" image_disabled="Icon_Dock_Press" @@ -30,7 +42,8 @@ top="10" right="-28" width="16" - tool_tip="Dock/Undock tab" /> + tool_tip="Dock" + visible="false" /> <button follows="right|top" height="16" |