From d6726e6e4b40efaee35b8df5ac9d1098f208bcac Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Fri, 23 Jul 2010 17:42:06 +0300 Subject: EXT-8299 FIXED Added rearranging of the group accordion to fit all space if only General tab is visible. Also fixed name of accordion in code to be consistent with xml. Replaced findChild with getChild (when getting accordion and its tabs) to avoid extra checks against NULL of returned pointers and have warnings in log is xml is not consistent with code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/798/ --HG-- branch : product-engine --- indra/newview/llpanelgroup.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index d997b83cbb..2112c8c026 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -413,19 +413,14 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) getChild("prepend_founded_by")->setVisible(!is_null_group_id); - LLAccordionCtrl* tab_ctrl = findChild("group_accordion"); - if(tab_ctrl) - tab_ctrl->reset(); + LLAccordionCtrl* tab_ctrl = getChild("groups_accordion"); + tab_ctrl->reset(); - LLAccordionCtrlTab* tab_general = findChild("group_general_tab"); - LLAccordionCtrlTab* tab_roles = findChild("group_roles_tab"); - LLAccordionCtrlTab* tab_notices = findChild("group_notices_tab"); - LLAccordionCtrlTab* tab_land = findChild("group_land_tab"); + LLAccordionCtrlTab* tab_general = getChild("group_general_tab"); + LLAccordionCtrlTab* tab_roles = getChild("group_roles_tab"); + LLAccordionCtrlTab* tab_notices = getChild("group_notices_tab"); + LLAccordionCtrlTab* tab_land = getChild("group_land_tab"); - - if(!tab_general || !tab_roles || !tab_notices || !tab_land) - return; - if(mButtonJoin) mButtonJoin->setVisible(false); @@ -486,6 +481,8 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) button_chat->setVisible(is_member); } + tab_ctrl->arrange(); + reposButtons(); update(GC_ALL);//show/hide "join" button if data is already ready } -- cgit v1.2.3