SL-20288 Lags in Appearance floater (code format in LLAccordionCtrl)
Alexander Gavriliuk
parent
f576fae46c
commit
61a04f5ee1
|
|
@ -60,7 +60,7 @@ LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params)
|
|||
initNoTabsWidget(params.no_matched_tabs_text);
|
||||
|
||||
mSingleExpansion = params.single_expansion;
|
||||
if(mFitParent && !mSingleExpansion)
|
||||
if (mFitParent && !mSingleExpansion)
|
||||
{
|
||||
LL_INFOS() << "fit_parent works best when combined with single_expansion" << LL_ENDL;
|
||||
}
|
||||
|
|
@ -102,14 +102,13 @@ void LLAccordionCtrl::draw()
|
|||
LLPanel::draw();
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
BOOL LLAccordionCtrl::postBuild()
|
||||
{
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
|
||||
|
||||
LLRect scroll_rect;
|
||||
scroll_rect.setOriginAndSize(
|
||||
scroll_rect.setOriginAndSize(
|
||||
getRect().getWidth() - scrollbar_size,
|
||||
1,
|
||||
scrollbar_size,
|
||||
|
|
@ -126,39 +125,42 @@ BOOL LLAccordionCtrl::postBuild()
|
|||
sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
|
||||
sbparams.change_callback(boost::bind(&LLAccordionCtrl::onScrollPosChangeCallback, this, _1, _2));
|
||||
|
||||
mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
|
||||
LLView::addChild( mScrollbar );
|
||||
mScrollbar->setVisible( false );
|
||||
mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
|
||||
LLView::addChild(mScrollbar);
|
||||
mScrollbar->setVisible(FALSE);
|
||||
mScrollbar->setFollowsRight();
|
||||
mScrollbar->setFollowsTop();
|
||||
mScrollbar->setFollowsBottom();
|
||||
|
||||
//if it was created from xml...
|
||||
std::vector<LLUICtrl*> accordion_tabs;
|
||||
for(child_list_const_iter_t it = getChildList()->begin();
|
||||
for (child_list_const_iter_t it = getChildList()->begin();
|
||||
getChildList()->end() != it; ++it)
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(*it);
|
||||
if(accordion_tab == NULL)
|
||||
if (accordion_tab == NULL)
|
||||
continue;
|
||||
if(std::find(mAccordionTabs.begin(),mAccordionTabs.end(),accordion_tab) == mAccordionTabs.end())
|
||||
if (std::find(mAccordionTabs.begin(), mAccordionTabs.end(), accordion_tab) == mAccordionTabs.end())
|
||||
{
|
||||
accordion_tabs.push_back(accordion_tab);
|
||||
}
|
||||
}
|
||||
|
||||
for(std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();it!=accordion_tabs.rend();++it)
|
||||
addCollapsibleCtrl(*it);
|
||||
|
||||
arrange ();
|
||||
|
||||
if(mSingleExpansion)
|
||||
for (std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();
|
||||
it < accordion_tabs.rend(); ++it)
|
||||
{
|
||||
if(!mAccordionTabs[0]->getDisplayChildren())
|
||||
addCollapsibleCtrl(*it);
|
||||
}
|
||||
|
||||
arrange();
|
||||
|
||||
if (mSingleExpansion)
|
||||
{
|
||||
if (!mAccordionTabs[0]->getDisplayChildren())
|
||||
mAccordionTabs[0]->setDisplayChildren(true);
|
||||
for(size_t i=1;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 1; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
if(mAccordionTabs[i]->getDisplayChildren())
|
||||
if (mAccordionTabs[i]->getDisplayChildren())
|
||||
mAccordionTabs[i]->setDisplayChildren(false);
|
||||
}
|
||||
}
|
||||
|
|
@ -205,23 +207,22 @@ BOOL LLAccordionCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
|
|||
//---------------------------------------------------------------------------------
|
||||
void LLAccordionCtrl::shiftAccordionTabs(S16 panel_num, S32 delta)
|
||||
{
|
||||
for(size_t i = panel_num; i < mAccordionTabs.size(); i++ )
|
||||
for (size_t i = panel_num; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
ctrlShiftVertical(mAccordionTabs[i],delta);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num)
|
||||
{
|
||||
if(mSingleExpansion)
|
||||
if (mSingleExpansion)
|
||||
{
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
if(i==panel_num)
|
||||
if (i == panel_num)
|
||||
continue;
|
||||
if(mAccordionTabs[i]->getDisplayChildren())
|
||||
if (mAccordionTabs[i]->getDisplayChildren())
|
||||
mAccordionTabs[i]->setDisplayChildren(false);
|
||||
}
|
||||
|
||||
|
|
@ -232,64 +233,63 @@ void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num)
|
|||
void LLAccordionCtrl::show_hide_scrollbar(S32 width, S32 height)
|
||||
{
|
||||
calcRecuiredHeight();
|
||||
if(getRecuiredHeight() > height )
|
||||
showScrollbar(width,height);
|
||||
if (getRecuiredHeight() > height)
|
||||
showScrollbar(width, height);
|
||||
else
|
||||
hideScrollbar(width,height);
|
||||
hideScrollbar(width, height);
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::showScrollbar(S32 width, S32 height)
|
||||
void LLAccordionCtrl::showScrollbar(S32 width, S32 height)
|
||||
{
|
||||
bool was_visible = mScrollbar->getVisible();
|
||||
|
||||
mScrollbar->setVisible(true);
|
||||
mScrollbar->setVisible(TRUE);
|
||||
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
|
||||
ctrlSetLeftTopAndSize(mScrollbar
|
||||
,width-scrollbar_size - PARENT_BORDER_MARGIN/2
|
||||
,height-PARENT_BORDER_MARGIN
|
||||
,scrollbar_size
|
||||
,height-2*PARENT_BORDER_MARGIN);
|
||||
, width - scrollbar_size - PARENT_BORDER_MARGIN / 2
|
||||
, height - PARENT_BORDER_MARGIN
|
||||
, scrollbar_size
|
||||
, height - PARENT_BORDER_MARGIN * 2);
|
||||
|
||||
mScrollbar->setPageSize(height);
|
||||
mScrollbar->setDocParams(mInnerRect.getHeight(),mScrollbar->getDocPos());
|
||||
mScrollbar->setDocParams(mInnerRect.getHeight(), mScrollbar->getDocPos());
|
||||
|
||||
if(was_visible)
|
||||
if (was_visible)
|
||||
{
|
||||
S32 scroll_pos = llmin(mScrollbar->getDocPos(), getRecuiredHeight() - height - 1);
|
||||
mScrollbar->setDocPos(scroll_pos);
|
||||
}
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::hideScrollbar( S32 width, S32 height )
|
||||
void LLAccordionCtrl::hideScrollbar(S32 width, S32 height)
|
||||
{
|
||||
if(mScrollbar->getVisible() == false)
|
||||
if (mScrollbar->getVisible() == FALSE)
|
||||
return;
|
||||
mScrollbar->setVisible(false);
|
||||
mScrollbar->setVisible(FALSE);
|
||||
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
|
||||
S32 panel_width = width - 2*BORDER_MARGIN;
|
||||
|
||||
//reshape all accordeons and shift all draggers
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
// Reshape all accordions and shift all draggers
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
LLRect panel_rect = mAccordionTabs[i]->getRect();
|
||||
ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_rect.mTop,panel_width,panel_rect.getHeight());
|
||||
ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_rect.mTop, panel_width, panel_rect.getHeight());
|
||||
}
|
||||
|
||||
mScrollbar->setDocPos(0);
|
||||
|
||||
if(mAccordionTabs.size()>0)
|
||||
if (!mAccordionTabs.empty())
|
||||
{
|
||||
S32 panel_top = height - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 panel_top = height - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 diff = panel_top - mAccordionTabs[0]->getRect().mTop;
|
||||
shiftAccordionTabs(0,diff);
|
||||
shiftAccordionTabs(0, diff);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
S32 LLAccordionCtrl::calcRecuiredHeight()
|
||||
{
|
||||
|
|
@ -305,7 +305,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
|
|||
}
|
||||
}
|
||||
|
||||
mInnerRect.setLeftTopAndSize(0,rec_height + BORDER_MARGIN*2,getRect().getWidth(),rec_height + BORDER_MARGIN);
|
||||
mInnerRect.setLeftTopAndSize(0, rec_height + BORDER_MARGIN * 2, getRect().getWidth(), rec_height + BORDER_MARGIN);
|
||||
|
||||
return mInnerRect.getHeight();
|
||||
}
|
||||
|
|
@ -313,7 +313,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
|
|||
//---------------------------------------------------------------------------------
|
||||
void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
|
||||
{
|
||||
if(!panel)
|
||||
if (!panel)
|
||||
return;
|
||||
LLRect panel_rect = panel->getRect();
|
||||
panel_rect.setLeftTopAndSize( left, top, width, height);
|
||||
|
|
@ -321,9 +321,9 @@ void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S3
|
|||
panel->setRect(panel_rect);
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
|
||||
void LLAccordionCtrl::ctrlShiftVertical(LLView* panel, S32 delta)
|
||||
{
|
||||
if(!panel)
|
||||
if (!panel)
|
||||
return;
|
||||
panel->translate(0,delta);
|
||||
}
|
||||
|
|
@ -333,9 +333,9 @@ void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
|
|||
void LLAccordionCtrl::addCollapsibleCtrl(LLView* view)
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(view);
|
||||
if(!accordion_tab)
|
||||
if (!accordion_tab)
|
||||
return;
|
||||
if(std::find(beginChild(), endChild(), accordion_tab) == endChild())
|
||||
if (std::find(beginChild(), endChild(), accordion_tab) == endChild())
|
||||
addChild(accordion_tab);
|
||||
mAccordionTabs.push_back(accordion_tab);
|
||||
|
||||
|
|
@ -369,7 +369,7 @@ void LLAccordionCtrl::removeCollapsibleCtrl(LLView* view)
|
|||
}
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
|
||||
void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
|
||||
{
|
||||
LLTextBox::Params tp = tb_params;
|
||||
tp.rect(getLocalRect());
|
||||
|
|
@ -377,39 +377,39 @@ void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
|
|||
mNoVisibleTabsHelpText = LLUICtrlFactory::create<LLTextBox>(tp, this);
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::updateNoTabsHelpTextVisibility()
|
||||
void LLAccordionCtrl::updateNoTabsHelpTextVisibility()
|
||||
{
|
||||
bool visible_exists = false;
|
||||
std::vector<LLAccordionCtrlTab*>::const_iterator it = mAccordionTabs.begin();
|
||||
const std::vector<LLAccordionCtrlTab*>::const_iterator it_end = mAccordionTabs.end();
|
||||
for (; it != it_end; ++it)
|
||||
while (it < it_end)
|
||||
{
|
||||
if ((*it)->getVisible())
|
||||
if ((*(it++))->getVisible())
|
||||
{
|
||||
visible_exists = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
mNoVisibleTabsHelpText->setVisible(!visible_exists);
|
||||
mNoVisibleTabsHelpText->setVisible(visible_exists ? FALSE : TRUE);
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::arrangeSinge()
|
||||
void LLAccordionCtrl::arrangeSingle()
|
||||
{
|
||||
S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
|
||||
S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 panel_width = getRect().getWidth() - 4; // Top coordinate of the first panel
|
||||
S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
|
||||
S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 panel_width = getRect().getWidth() - 4;
|
||||
S32 panel_height;
|
||||
|
||||
S32 collapsed_height = 0;
|
||||
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
|
||||
|
||||
if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
|
||||
if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
|
||||
continue;
|
||||
if(!accordion_tab->isExpanded() )
|
||||
if (!accordion_tab->isExpanded() )
|
||||
{
|
||||
collapsed_height+=mAccordionTabs[i]->getRect().getHeight();
|
||||
}
|
||||
|
|
@ -417,28 +417,28 @@ void LLAccordionCtrl::arrangeSinge()
|
|||
|
||||
S32 expanded_height = getRect().getHeight() - BORDER_MARGIN - collapsed_height;
|
||||
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
|
||||
|
||||
if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
|
||||
if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
|
||||
continue;
|
||||
if(!accordion_tab->isExpanded() )
|
||||
if (!accordion_tab->isExpanded() )
|
||||
{
|
||||
panel_height = accordion_tab->getRect().getHeight();
|
||||
}
|
||||
else
|
||||
{
|
||||
if(mFitParent)
|
||||
if (mFitParent)
|
||||
{
|
||||
panel_height = expanded_height;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(accordion_tab->getAccordionView())
|
||||
if (accordion_tab->getAccordionView())
|
||||
{
|
||||
panel_height = accordion_tab->getAccordionView()->getRect().getHeight() +
|
||||
accordion_tab->getHeaderHeight() + 2*BORDER_MARGIN;
|
||||
accordion_tab->getHeaderHeight() + BORDER_MARGIN * 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -451,67 +451,67 @@ void LLAccordionCtrl::arrangeSinge()
|
|||
panel_height = llmax(panel_height, accordion_tab->getHeaderHeight());
|
||||
|
||||
ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
|
||||
panel_top-=mAccordionTabs[i]->getRect().getHeight();
|
||||
panel_top -= mAccordionTabs[i]->getRect().getHeight();
|
||||
}
|
||||
|
||||
show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
|
||||
updateLayout(getRect().getWidth(), getRect().getHeight());
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::arrangeMultiple()
|
||||
void LLAccordionCtrl::arrangeMultiple()
|
||||
{
|
||||
S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
|
||||
S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 panel_width = getRect().getWidth() - 4; // Top coordinate of the first panel
|
||||
S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
|
||||
S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 panel_width = getRect().getWidth() - 4;
|
||||
|
||||
//Calculate params
|
||||
for(size_t i = 0; i < mAccordionTabs.size(); i++ )
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); i++ )
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
|
||||
|
||||
if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
|
||||
if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
|
||||
continue;
|
||||
|
||||
if(!accordion_tab->isExpanded() )
|
||||
if (!accordion_tab->isExpanded() )
|
||||
{
|
||||
ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, accordion_tab->getRect().getHeight());
|
||||
panel_top-=mAccordionTabs[i]->getRect().getHeight();
|
||||
panel_top -= mAccordionTabs[i]->getRect().getHeight();
|
||||
}
|
||||
else
|
||||
{
|
||||
S32 panel_height = accordion_tab->getRect().getHeight();
|
||||
|
||||
if(mFitParent)
|
||||
if (mFitParent)
|
||||
{
|
||||
// all expanded tabs will have equal height
|
||||
// All expanded tabs will have equal height
|
||||
panel_height = calcExpandedTabHeight(i, panel_top);
|
||||
ctrlSetLeftTopAndSize(accordion_tab, panel_left, panel_top, panel_width, panel_height);
|
||||
|
||||
// try to make accordion tab fit accordion view height.
|
||||
// Try to make accordion tab fit accordion view height.
|
||||
// Accordion View should implement getRequiredRect() and provide valid height
|
||||
S32 optimal_height = accordion_tab->getAccordionView()->getRequiredRect().getHeight();
|
||||
optimal_height += accordion_tab->getHeaderHeight() + 2 * BORDER_MARGIN;
|
||||
if(optimal_height < panel_height)
|
||||
if (optimal_height < panel_height)
|
||||
{
|
||||
panel_height = optimal_height;
|
||||
}
|
||||
|
||||
// minimum tab height is equal to header height
|
||||
if(mAccordionTabs[i]->getHeaderHeight() > panel_height)
|
||||
if (mAccordionTabs[i]->getHeaderHeight() > panel_height)
|
||||
{
|
||||
panel_height = mAccordionTabs[i]->getHeaderHeight();
|
||||
}
|
||||
}
|
||||
|
||||
ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
|
||||
panel_top-=panel_height;
|
||||
panel_top -= panel_height;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
|
||||
show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
|
||||
|
||||
updateLayout(getRect().getWidth(),getRect().getHeight());
|
||||
updateLayout(getRect().getWidth(), getRect().getHeight());
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -519,70 +519,67 @@ void LLAccordionCtrl::arrange()
|
|||
{
|
||||
updateNoTabsHelpTextVisibility();
|
||||
|
||||
if( mAccordionTabs.size() == 0)
|
||||
if (mAccordionTabs.empty())
|
||||
{
|
||||
//We do not arrange if we do not have what should be arranged
|
||||
// Nothing to arrange
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if(mAccordionTabs.size() == 1)
|
||||
if (mAccordionTabs.size() == 1)
|
||||
{
|
||||
S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 panel_width = getRect().getWidth() - 4; // Top coordinate of the first panel
|
||||
S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
|
||||
S32 panel_width = getRect().getWidth() - 4;
|
||||
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[0]);
|
||||
|
||||
LLRect panel_rect = accordion_tab->getRect();
|
||||
|
||||
S32 panel_height = getRect().getHeight() - 2*BORDER_MARGIN;
|
||||
|
||||
S32 panel_height = getRect().getHeight() - BORDER_MARGIN * 2;
|
||||
if (accordion_tab->getFitParent())
|
||||
panel_height = accordion_tab->getRect().getHeight();
|
||||
ctrlSetLeftTopAndSize(accordion_tab,panel_rect.mLeft,panel_top,panel_width,panel_height);
|
||||
|
||||
show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
|
||||
return;
|
||||
|
||||
ctrlSetLeftTopAndSize(accordion_tab, panel_rect.mLeft, panel_top, panel_width, panel_height);
|
||||
|
||||
show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
|
||||
return;
|
||||
}
|
||||
|
||||
if(mSingleExpansion)
|
||||
arrangeSinge ();
|
||||
if (mSingleExpansion)
|
||||
arrangeSingle();
|
||||
else
|
||||
arrangeMultiple ();
|
||||
arrangeMultiple();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
|
||||
BOOL LLAccordionCtrl::handleScrollWheel ( S32 x, S32 y, S32 clicks )
|
||||
BOOL LLAccordionCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
|
||||
{
|
||||
if(LLPanel::handleScrollWheel(x,y,clicks))
|
||||
if (LLPanel::handleScrollWheel(x, y, clicks))
|
||||
return TRUE;
|
||||
if( mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
|
||||
if (mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
|
||||
return TRUE;
|
||||
return false;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLAccordionCtrl::handleKeyHere (KEY key, MASK mask)
|
||||
BOOL LLAccordionCtrl::handleKeyHere(KEY key, MASK mask)
|
||||
{
|
||||
if( mScrollbar->getVisible() && mScrollbar->handleKeyHere( key,mask ) )
|
||||
if (mScrollbar->getVisible() && mScrollbar->handleKeyHere(key, mask))
|
||||
return TRUE;
|
||||
return LLPanel::handleKeyHere(key,mask);
|
||||
return LLPanel::handleKeyHere(key, mask);
|
||||
}
|
||||
|
||||
BOOL LLAccordionCtrl::handleDragAndDrop (S32 x, S32 y, MASK mask,
|
||||
BOOL drop,
|
||||
EDragAndDropType cargo_type,
|
||||
void* cargo_data,
|
||||
EAcceptance* accept,
|
||||
std::string& tooltip_msg)
|
||||
BOOL LLAccordionCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
|
||||
BOOL drop,
|
||||
EDragAndDropType cargo_type,
|
||||
void* cargo_data,
|
||||
EAcceptance* accept,
|
||||
std::string& tooltip_msg)
|
||||
{
|
||||
// Scroll folder view if needed. Never accepts a drag or drop.
|
||||
*accept = ACCEPT_NO;
|
||||
BOOL handled = autoScroll(x, y);
|
||||
|
||||
if( !handled )
|
||||
if (!handled)
|
||||
{
|
||||
handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
|
||||
cargo_data, accept, tooltip_msg) != NULL;
|
||||
|
|
@ -590,14 +587,14 @@ BOOL LLAccordionCtrl::handleDragAndDrop (S32 x, S32 y, MASK mask,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL LLAccordionCtrl::autoScroll (S32 x, S32 y)
|
||||
BOOL LLAccordionCtrl::autoScroll(S32 x, S32 y)
|
||||
{
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
|
||||
bool scrolling = false;
|
||||
if( mScrollbar->getVisible() )
|
||||
if (mScrollbar->getVisible())
|
||||
{
|
||||
LLRect rect_local( 0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0 );
|
||||
LLRect rect_local(0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0);
|
||||
LLRect screen_local_extents;
|
||||
|
||||
// clip rect against root view
|
||||
|
|
@ -610,51 +607,52 @@ BOOL LLAccordionCtrl::autoScroll (S32 x, S32 y)
|
|||
|
||||
LLRect bottom_scroll_rect = screen_local_extents;
|
||||
bottom_scroll_rect.mTop = rect_local.mBottom + auto_scroll_region_height;
|
||||
if( bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()) )
|
||||
if (bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()))
|
||||
{
|
||||
mScrollbar->setDocPos( mScrollbar->getDocPos() + auto_scroll_speed );
|
||||
mScrollbar->setDocPos(mScrollbar->getDocPos() + auto_scroll_speed);
|
||||
mAutoScrolling = true;
|
||||
scrolling = true;
|
||||
}
|
||||
|
||||
LLRect top_scroll_rect = screen_local_extents;
|
||||
top_scroll_rect.mBottom = rect_local.mTop - auto_scroll_region_height;
|
||||
if( top_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() > 0) )
|
||||
if (top_scroll_rect.pointInRect(x, y) && (mScrollbar->getDocPos() > 0))
|
||||
{
|
||||
mScrollbar->setDocPos( mScrollbar->getDocPos() - auto_scroll_speed );
|
||||
mScrollbar->setDocPos(mScrollbar->getDocPos() - auto_scroll_speed);
|
||||
mAutoScrolling = true;
|
||||
scrolling = true;
|
||||
}
|
||||
}
|
||||
return scrolling;
|
||||
|
||||
return scrolling ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::updateLayout (S32 width, S32 height)
|
||||
void LLAccordionCtrl::updateLayout(S32 width, S32 height)
|
||||
{
|
||||
S32 panel_top = height - BORDER_MARGIN ;
|
||||
if(mScrollbar->getVisible())
|
||||
panel_top+=mScrollbar->getDocPos();
|
||||
if (mScrollbar->getVisible())
|
||||
panel_top += mScrollbar->getDocPos();
|
||||
|
||||
S32 panel_width = width - 2*BORDER_MARGIN;
|
||||
S32 panel_width = width - BORDER_MARGIN * 2;
|
||||
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
if(mScrollbar->getVisible())
|
||||
panel_width-=scrollbar_size;
|
||||
if (mScrollbar->getVisible())
|
||||
panel_width -= scrollbar_size;
|
||||
|
||||
//set sizes for first panels and dragbars
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
// set sizes for first panels and dragbars
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
if(!mAccordionTabs[i]->getVisible())
|
||||
if (!mAccordionTabs[i]->getVisible())
|
||||
continue;
|
||||
LLRect panel_rect = mAccordionTabs[i]->getRect();
|
||||
ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
|
||||
panel_top-=panel_rect.getHeight();
|
||||
ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
|
||||
panel_top -= panel_rect.getHeight();
|
||||
}
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
|
||||
void LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
|
||||
{
|
||||
updateLayout(getRect().getWidth(),getRect().getHeight());
|
||||
updateLayout(getRect().getWidth(), getRect().getHeight());
|
||||
}
|
||||
|
||||
// virtual
|
||||
|
|
@ -687,42 +685,43 @@ void LLAccordionCtrl::onUpdateScrollToChild(const LLUICtrl *cntrl)
|
|||
LLUICtrl::onUpdateScrollToChild(cntrl);
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::onOpen (const LLSD& key)
|
||||
void LLAccordionCtrl::onOpen(const LLSD& key)
|
||||
{
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
|
||||
LLPanel* panel = dynamic_cast<LLPanel*>(accordion_tab->getAccordionView());
|
||||
if(panel!=NULL)
|
||||
if (panel != NULL)
|
||||
{
|
||||
panel->onOpen(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
S32 LLAccordionCtrl::notifyParent(const LLSD& info)
|
||||
{
|
||||
if(info.has("action"))
|
||||
if (info.has("action"))
|
||||
{
|
||||
std::string str_action = info["action"];
|
||||
if(str_action == "size_changes")
|
||||
if (str_action == "size_changes")
|
||||
{
|
||||
//
|
||||
arrange();
|
||||
return 1;
|
||||
}
|
||||
else if(str_action == "select_next")
|
||||
if (str_action == "select_next")
|
||||
{
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
|
||||
if(accordion_tab->hasFocus())
|
||||
if (accordion_tab->hasFocus())
|
||||
{
|
||||
while(++i<mAccordionTabs.size())
|
||||
while (++i < mAccordionTabs.size())
|
||||
{
|
||||
if(mAccordionTabs[i]->getVisible())
|
||||
if (mAccordionTabs[i]->getVisible())
|
||||
break;
|
||||
}
|
||||
if(i<mAccordionTabs.size())
|
||||
if (i < mAccordionTabs.size())
|
||||
{
|
||||
accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
|
||||
accordion_tab->notify(LLSD().with("action","select_first"));
|
||||
|
|
@ -733,17 +732,17 @@ S32 LLAccordionCtrl::notifyParent(const LLSD& info)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
else if(str_action == "select_prev")
|
||||
if (str_action == "select_prev")
|
||||
{
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
|
||||
if(accordion_tab->hasFocus() && i>0)
|
||||
if (accordion_tab->hasFocus() && i > 0)
|
||||
{
|
||||
bool prev_visible_tab_found = false;
|
||||
while(i>0)
|
||||
while (i > 0)
|
||||
{
|
||||
if(mAccordionTabs[--i]->getVisible())
|
||||
if (mAccordionTabs[--i]->getVisible())
|
||||
{
|
||||
prev_visible_tab_found = true;
|
||||
break;
|
||||
|
|
@ -761,12 +760,12 @@ S32 LLAccordionCtrl::notifyParent(const LLSD& info)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
else if(str_action == "select_current")
|
||||
if (str_action == "select_current")
|
||||
{
|
||||
for(size_t i=0;i<mAccordionTabs.size();++i)
|
||||
for (size_t i = 0; i < mAccordionTabs.size(); ++i)
|
||||
{
|
||||
// Set selection to the currently focused tab.
|
||||
if(mAccordionTabs[i]->hasFocus())
|
||||
if (mAccordionTabs[i]->hasFocus())
|
||||
{
|
||||
if (mAccordionTabs[i] != mSelectedTab)
|
||||
{
|
||||
|
|
@ -783,7 +782,7 @@ S32 LLAccordionCtrl::notifyParent(const LLSD& info)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
else if(str_action == "deselect_current")
|
||||
if (str_action == "deselect_current")
|
||||
{
|
||||
// Reset selection to the currently selected tab.
|
||||
if (mSelectedTab)
|
||||
|
|
@ -802,9 +801,9 @@ S32 LLAccordionCtrl::notifyParent(const LLSD& info)
|
|||
screenRectToLocal(screen_rc, &local_rc);
|
||||
|
||||
// Translate to parent coordinatess to check if we are in visible rectangle
|
||||
local_rc.translate( getRect().mLeft, getRect().mBottom );
|
||||
local_rc.translate(getRect().mLeft, getRect().mBottom);
|
||||
|
||||
if ( !getRect().contains (local_rc) )
|
||||
if (!getRect().contains (local_rc))
|
||||
{
|
||||
// Back to local coords and calculate position for scroller
|
||||
S32 bottom = mScrollbar->getDocPos() - local_rc.mBottom + getRect().mBottom;
|
||||
|
|
@ -814,7 +813,7 @@ S32 LLAccordionCtrl::notifyParent(const LLSD& info)
|
|||
bottom, // min vertical scroll
|
||||
top); // max vertical scroll
|
||||
|
||||
mScrollbar->setDocPos( scroll_pos );
|
||||
mScrollbar->setDocPos(scroll_pos);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -834,15 +833,16 @@ S32 LLAccordionCtrl::notifyParent(const LLSD& info)
|
|||
}
|
||||
return LLPanel::notifyParent(info);
|
||||
}
|
||||
void LLAccordionCtrl::reset ()
|
||||
|
||||
void LLAccordionCtrl::reset()
|
||||
{
|
||||
if(mScrollbar)
|
||||
if (mScrollbar)
|
||||
mScrollbar->setDocPos(0);
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::expandDefaultTab()
|
||||
{
|
||||
if (mAccordionTabs.size() > 0)
|
||||
if (!mAccordionTabs.empty())
|
||||
{
|
||||
LLAccordionCtrlTab* tab = mAccordionTabs.front();
|
||||
|
||||
|
|
@ -877,7 +877,7 @@ void LLAccordionCtrl::sort()
|
|||
arrange();
|
||||
}
|
||||
|
||||
void LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
|
||||
void LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
|
||||
{
|
||||
LLStringUtil::format_map_t args;
|
||||
args["[SEARCH_TERM]"] = LLURI::escape(filter_string);
|
||||
|
|
@ -907,7 +907,7 @@ const LLAccordionCtrlTab* LLAccordionCtrl::getExpandedTab() const
|
|||
|
||||
S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 available_height /* = 0 */)
|
||||
{
|
||||
if(tab_index < 0)
|
||||
if (tab_index < 0)
|
||||
{
|
||||
return available_height;
|
||||
}
|
||||
|
|
@ -915,9 +915,9 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
|
|||
S32 collapsed_tabs_height = 0;
|
||||
S32 num_expanded = 0;
|
||||
|
||||
for(size_t n = tab_index; n < mAccordionTabs.size(); ++n)
|
||||
for (size_t n = tab_index; n < mAccordionTabs.size(); ++n)
|
||||
{
|
||||
if(!mAccordionTabs[n]->isExpanded())
|
||||
if (!mAccordionTabs[n]->isExpanded())
|
||||
{
|
||||
collapsed_tabs_height += mAccordionTabs[n]->getHeaderHeight();
|
||||
}
|
||||
|
|
@ -927,7 +927,7 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
|
|||
}
|
||||
}
|
||||
|
||||
if(0 == num_expanded)
|
||||
if (0 == num_expanded)
|
||||
{
|
||||
return available_height;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ private:
|
|||
void initNoTabsWidget(const LLTextBox::Params& tb_params);
|
||||
void updateNoTabsHelpTextVisibility();
|
||||
|
||||
void arrangeSinge();
|
||||
void arrangeSingle();
|
||||
void arrangeMultiple();
|
||||
|
||||
// Calc Splitter's height that is necessary to display all child content
|
||||
|
|
|
|||
|
|
@ -69,13 +69,13 @@ public:
|
|||
virtual BOOL postBuild();
|
||||
|
||||
std::string getTitle();
|
||||
void setTitle(const std::string& title, const std::string& hl);
|
||||
void setTitle(const std::string& title, const std::string& hl);
|
||||
|
||||
void setTitleFontStyle(std::string style);
|
||||
void setTitleFontStyle(std::string style);
|
||||
|
||||
void setTitleColor(LLUIColor);
|
||||
void setTitleColor(LLUIColor);
|
||||
|
||||
void setSelected(bool is_selected) { mIsSelected = is_selected; }
|
||||
void setSelected(bool is_selected) { mIsSelected = is_selected; }
|
||||
|
||||
virtual void onMouseEnter(S32 x, S32 y, MASK mask);
|
||||
virtual void onMouseLeave(S32 x, S32 y, MASK mask);
|
||||
|
|
@ -85,8 +85,8 @@ public:
|
|||
void* cargo_data,
|
||||
EAcceptance* accept,
|
||||
std::string& tooltip_msg);
|
||||
private:
|
||||
|
||||
private:
|
||||
LLTextBox* mHeaderTextbox;
|
||||
|
||||
// Overlay images (arrows)
|
||||
|
|
@ -102,7 +102,7 @@ private:
|
|||
LLPointer<LLUIImage> mImageHeaderFocused;
|
||||
|
||||
// style saved when applying it in setTitleFontStyle
|
||||
LLStyle::Params mStyleParams;
|
||||
LLStyle::Params mStyleParams;
|
||||
|
||||
LLUIColor mHeaderBGColor;
|
||||
|
||||
|
|
@ -157,19 +157,17 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::postBuild()
|
|||
|
||||
std::string LLAccordionCtrlTab::LLAccordionCtrlTabHeader::getTitle()
|
||||
{
|
||||
if(mHeaderTextbox)
|
||||
if (mHeaderTextbox)
|
||||
{
|
||||
return mHeaderTextbox->getText();
|
||||
}
|
||||
else
|
||||
{
|
||||
return LLStringUtil::null;
|
||||
}
|
||||
|
||||
return LLStringUtil::null;
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitle(const std::string& title, const std::string& hl)
|
||||
{
|
||||
if(mHeaderTextbox)
|
||||
if (mHeaderTextbox)
|
||||
{
|
||||
LLTextUtil::textboxSetHighlightedVal(
|
||||
mHeaderTextbox,
|
||||
|
|
@ -192,7 +190,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleFontStyle(std::string
|
|||
|
||||
void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleColor(LLUIColor color)
|
||||
{
|
||||
if(mHeaderTextbox)
|
||||
if (mHeaderTextbox)
|
||||
{
|
||||
mHeaderTextbox->setColor(color);
|
||||
}
|
||||
|
|
@ -204,11 +202,11 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
|
|||
S32 height = getRect().getHeight();
|
||||
|
||||
F32 alpha = getCurrentTransparency();
|
||||
gl_rect_2d(0,0,width - 1 ,height - 1,mHeaderBGColor.get() % alpha,true);
|
||||
gl_rect_2d(0, 0, width - 1, height - 1, mHeaderBGColor.get() % alpha, TRUE);
|
||||
|
||||
LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
|
||||
bool collapsible = (parent && parent->getCollapsible());
|
||||
bool expanded = (parent && parent->getDisplayChildren());
|
||||
bool collapsible = parent && parent->getCollapsible();
|
||||
bool expanded = parent && parent->getDisplayChildren();
|
||||
|
||||
// Handle overlay images, if needed
|
||||
// Only show green "focus" background image if the accordion is open,
|
||||
|
|
@ -218,23 +216,22 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
|
|||
/*&& !(collapsible && !expanded)*/ // WHY??
|
||||
)
|
||||
{
|
||||
mImageHeaderFocused->draw(0,0,width,height);
|
||||
mImageHeaderFocused->draw(0, 0, width, height);
|
||||
}
|
||||
else
|
||||
{
|
||||
mImageHeader->draw(0,0,width,height);
|
||||
mImageHeader->draw(0, 0, width, height);
|
||||
}
|
||||
|
||||
if(mNeedsHighlight)
|
||||
if (mNeedsHighlight)
|
||||
{
|
||||
mImageHeaderOver->draw(0,0,width,height);
|
||||
mImageHeaderOver->draw(0, 0, width, height);
|
||||
}
|
||||
|
||||
|
||||
if(collapsible)
|
||||
if (collapsible)
|
||||
{
|
||||
LLPointer<LLUIImage> overlay_image;
|
||||
if(expanded)
|
||||
if (expanded)
|
||||
{
|
||||
overlay_image = mImageExpanded;
|
||||
}
|
||||
|
|
@ -242,8 +239,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
|
|||
{
|
||||
overlay_image = mImageCollapsed;
|
||||
}
|
||||
overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET,
|
||||
(height - overlay_image->getHeight()) / 2);
|
||||
overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET, (height - overlay_image->getHeight()) / 2);
|
||||
}
|
||||
|
||||
LLUICtrl::draw();
|
||||
|
|
@ -253,7 +249,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::reshape(S32 width, S32 height
|
|||
{
|
||||
S32 header_height = mHeaderTextbox->getTextPixelHeight();
|
||||
|
||||
LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET,(height+header_height)/2 ,width,(height-header_height)/2);
|
||||
LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET, (height + header_height) / 2, width, (height - header_height) / 2);
|
||||
mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
|
||||
mHeaderTextbox->setRect(textboxRect);
|
||||
|
||||
|
|
@ -272,20 +268,24 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseEnter(S32 x, S32 y, MA
|
|||
LLUICtrl::onMouseEnter(x, y, mask);
|
||||
mNeedsHighlight = true;
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseLeave(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
LLUICtrl::onMouseLeave(x, y, mask);
|
||||
mNeedsHighlight = false;
|
||||
mAutoOpenTimer.stop();
|
||||
}
|
||||
|
||||
BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleKey(KEY key, MASK mask, BOOL called_from_parent)
|
||||
{
|
||||
if ( ( key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
|
||||
if ((key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
|
||||
{
|
||||
return getParent()->handleKey(key, mask, called_from_parent);
|
||||
}
|
||||
|
||||
return LLUICtrl::handleKey(key, mask, called_from_parent);
|
||||
}
|
||||
|
||||
BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32 y, MASK mask,
|
||||
BOOL drop,
|
||||
EDragAndDropType cargo_type,
|
||||
|
|
@ -295,7 +295,7 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
|
|||
{
|
||||
LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
|
||||
|
||||
if ( parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose() )
|
||||
if (parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose())
|
||||
{
|
||||
if (mAutoOpenTimer.getStarted())
|
||||
{
|
||||
|
|
@ -307,12 +307,15 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
|
|||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mAutoOpenTimer.start();
|
||||
}
|
||||
}
|
||||
|
||||
return LLUICtrl::handleDragAndDrop(x, y, mask, drop, cargo_type,
|
||||
cargo_data, accept, tooltip_msg);
|
||||
}
|
||||
|
||||
LLAccordionCtrlTab::Params::Params()
|
||||
: title("title")
|
||||
,display_children("expanded", true)
|
||||
|
|
@ -384,41 +387,39 @@ LLAccordionCtrlTab::~LLAccordionCtrlTab()
|
|||
{
|
||||
}
|
||||
|
||||
|
||||
void LLAccordionCtrlTab::setDisplayChildren(bool display)
|
||||
{
|
||||
mDisplayChildren = display;
|
||||
LLRect rect = getRect();
|
||||
|
||||
rect.mBottom = rect.mTop - (getDisplayChildren() ?
|
||||
mExpandedHeight : HEADER_HEIGHT);
|
||||
rect.mBottom = rect.mTop - (getDisplayChildren() ? mExpandedHeight : HEADER_HEIGHT);
|
||||
setRect(rect);
|
||||
|
||||
if(mContainerPanel)
|
||||
if (mContainerPanel)
|
||||
{
|
||||
mContainerPanel->setVisible(getDisplayChildren());
|
||||
}
|
||||
|
||||
if(mDisplayChildren)
|
||||
if (mDisplayChildren)
|
||||
{
|
||||
adjustContainerPanel();
|
||||
}
|
||||
else
|
||||
{
|
||||
if(mScrollbar)
|
||||
mScrollbar->setVisible(false);
|
||||
if (mScrollbar)
|
||||
mScrollbar->setVisible(FALSE);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
|
||||
{
|
||||
LLRect headerRect;
|
||||
|
||||
headerRect.setLeftTopAndSize(
|
||||
0,height,width,HEADER_HEIGHT);
|
||||
headerRect.setLeftTopAndSize(0, height, width, HEADER_HEIGHT);
|
||||
mHeader->setRect(headerRect);
|
||||
mHeader->reshape(headerRect.getWidth(), headerRect.getHeight());
|
||||
|
||||
if(!mDisplayChildren)
|
||||
if (!mDisplayChildren)
|
||||
return;
|
||||
|
||||
LLRect childRect;
|
||||
|
|
@ -426,7 +427,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
|
|||
childRect.setLeftTopAndSize(
|
||||
getPaddingLeft(),
|
||||
height - getHeaderHeight() - getPaddingTop(),
|
||||
width - getPaddingLeft() - getPaddingRight(),
|
||||
width - getPaddingLeft() - getPaddingRight(),
|
||||
height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
|
||||
|
||||
adjustContainerPanel(childRect);
|
||||
|
|
@ -434,7 +435,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
|
|||
|
||||
void LLAccordionCtrlTab::changeOpenClose(bool is_open)
|
||||
{
|
||||
if(is_open)
|
||||
if (is_open)
|
||||
mExpandedHeight = getRect().getHeight();
|
||||
|
||||
setDisplayChildren(!is_open);
|
||||
|
|
@ -483,14 +484,14 @@ void LLAccordionCtrlTab::onUpdateScrollToChild(const LLUICtrl *cntrl)
|
|||
|
||||
BOOL LLAccordionCtrlTab::handleMouseDown(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
if(mCollapsible && mHeaderVisible && mCanOpenClose)
|
||||
if (mCollapsible && mHeaderVisible && mCanOpenClose)
|
||||
{
|
||||
if(y >= (getRect().getHeight() - HEADER_HEIGHT) )
|
||||
if (y >= (getRect().getHeight() - HEADER_HEIGHT))
|
||||
{
|
||||
mHeader->setFocus(true);
|
||||
changeOpenClose(getDisplayChildren());
|
||||
|
||||
//reset stored state
|
||||
// Reset stored state
|
||||
mWasStateStored = false;
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -510,7 +511,7 @@ boost::signals2::connection LLAccordionCtrlTab::setDropDownStateChangedCallback(
|
|||
|
||||
bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
|
||||
{
|
||||
if(DD_HEADER_NAME != child->getName())
|
||||
if (DD_HEADER_NAME != child->getName())
|
||||
{
|
||||
reshape(child->getRect().getWidth() , child->getRect().getHeight() + HEADER_HEIGHT );
|
||||
mExpandedHeight = getRect().getHeight();
|
||||
|
|
@ -518,12 +519,12 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
|
|||
|
||||
bool res = LLUICtrl::addChild(child, tab_group);
|
||||
|
||||
if(DD_HEADER_NAME != child->getName())
|
||||
if (DD_HEADER_NAME != child->getName())
|
||||
{
|
||||
if(!mCollapsible)
|
||||
if (!mCollapsible)
|
||||
setDisplayChildren(true);
|
||||
else
|
||||
setDisplayChildren(getDisplayChildren());
|
||||
setDisplayChildren(getDisplayChildren());
|
||||
}
|
||||
|
||||
if (!mContainerPanel)
|
||||
|
|
@ -534,7 +535,7 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
|
|||
|
||||
void LLAccordionCtrlTab::setAccordionView(LLView* panel)
|
||||
{
|
||||
addChild(panel,0);
|
||||
addChild(panel, 0);
|
||||
}
|
||||
|
||||
std::string LLAccordionCtrlTab::getTitle() const
|
||||
|
|
@ -543,10 +544,8 @@ std::string LLAccordionCtrlTab::getTitle() const
|
|||
{
|
||||
return mHeader->getTitle();
|
||||
}
|
||||
else
|
||||
{
|
||||
return LLStringUtil::null;
|
||||
}
|
||||
|
||||
return LLStringUtil::null;
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::setTitle(const std::string& title, const std::string& hl)
|
||||
|
|
@ -579,6 +578,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusReceivedCallback(const f
|
|||
{
|
||||
return mHeader->setFocusReceivedCallback(cb);
|
||||
}
|
||||
|
||||
return boost::signals2::connection();
|
||||
}
|
||||
|
||||
|
|
@ -588,6 +588,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusLostCallback(const focus
|
|||
{
|
||||
return mHeader->setFocusLostCallback(cb);
|
||||
}
|
||||
|
||||
return boost::signals2::connection();
|
||||
}
|
||||
|
||||
|
|
@ -601,59 +602,65 @@ void LLAccordionCtrlTab::setSelected(bool is_selected)
|
|||
|
||||
LLView* LLAccordionCtrlTab::findContainerView()
|
||||
{
|
||||
for(child_list_const_iter_t it = getChildList()->begin();
|
||||
getChildList()->end() != it; ++it)
|
||||
child_list_const_iter_t it = getChildList()->begin(), it_end = getChildList()->end();
|
||||
while (it != it_end)
|
||||
{
|
||||
LLView* child = *it;
|
||||
if(DD_HEADER_NAME == child->getName())
|
||||
continue;
|
||||
if(!child->getVisible())
|
||||
continue;
|
||||
return child;
|
||||
LLView* child = *(it++);
|
||||
if (DD_HEADER_NAME != child->getName() && child->getVisible())
|
||||
return child;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::selectOnFocusReceived()
|
||||
{
|
||||
if (getParent()) // A parent may not be set if tabs are added dynamically.
|
||||
{
|
||||
getParent()->notifyParent(LLSD().with("action", "select_current"));
|
||||
}
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::deselectOnFocusLost()
|
||||
{
|
||||
if(getParent()) // A parent may not be set if tabs are added dynamically.
|
||||
if (getParent()) // A parent may not be set if tabs are added dynamically.
|
||||
{
|
||||
getParent()->notifyParent(LLSD().with("action", "deselect_current"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
S32 LLAccordionCtrlTab::getHeaderHeight()
|
||||
{
|
||||
return mHeaderVisible?HEADER_HEIGHT:0;
|
||||
return mHeaderVisible ? HEADER_HEIGHT : 0;
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::setHeaderVisible(bool value)
|
||||
void LLAccordionCtrlTab::setHeaderVisible(bool value)
|
||||
{
|
||||
if(mHeaderVisible == value)
|
||||
if (mHeaderVisible == value)
|
||||
return;
|
||||
|
||||
mHeaderVisible = value;
|
||||
if(mHeader)
|
||||
mHeader->setVisible(value);
|
||||
|
||||
if (mHeader)
|
||||
{
|
||||
mHeader->setVisible(value ? TRUE : FALSE);
|
||||
}
|
||||
|
||||
reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
|
||||
};
|
||||
|
||||
//virtual
|
||||
BOOL LLAccordionCtrlTab::postBuild()
|
||||
{
|
||||
if(mHeader)
|
||||
if (mHeader)
|
||||
{
|
||||
mHeader->setVisible(mHeaderVisible);
|
||||
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
}
|
||||
|
||||
static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
|
||||
|
||||
LLRect scroll_rect;
|
||||
scroll_rect.setOriginAndSize(
|
||||
scroll_rect.setOriginAndSize(
|
||||
getRect().getWidth() - scrollbar_size,
|
||||
1,
|
||||
scrollbar_size,
|
||||
|
|
@ -661,7 +668,7 @@ BOOL LLAccordionCtrlTab::postBuild()
|
|||
|
||||
mContainerPanel = findContainerView();
|
||||
|
||||
if(!mFitPanel)
|
||||
if (!mFitPanel)
|
||||
{
|
||||
LLScrollbar::Params sbparams;
|
||||
sbparams.name("scrollable vertical");
|
||||
|
|
@ -674,9 +681,8 @@ BOOL LLAccordionCtrlTab::postBuild()
|
|||
sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
|
||||
sbparams.change_callback(boost::bind(&LLAccordionCtrlTab::onScrollPosChangeCallback, this, _1, _2));
|
||||
|
||||
|
||||
mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
|
||||
LLView::addChild( mScrollbar );
|
||||
mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
|
||||
LLView::addChild(mScrollbar);
|
||||
mScrollbar->setFollowsRight();
|
||||
mScrollbar->setFollowsTop();
|
||||
mScrollbar->setFollowsBottom();
|
||||
|
|
@ -684,44 +690,48 @@ BOOL LLAccordionCtrlTab::postBuild()
|
|||
mScrollbar->setVisible(false);
|
||||
}
|
||||
|
||||
if(mContainerPanel)
|
||||
if (mContainerPanel)
|
||||
{
|
||||
mContainerPanel->setVisible(mDisplayChildren);
|
||||
}
|
||||
|
||||
return LLUICtrl::postBuild();
|
||||
}
|
||||
bool LLAccordionCtrlTab::notifyChildren (const LLSD& info)
|
||||
|
||||
bool LLAccordionCtrlTab::notifyChildren (const LLSD& info)
|
||||
{
|
||||
if(info.has("action"))
|
||||
if (info.has("action"))
|
||||
{
|
||||
std::string str_action = info["action"];
|
||||
if(str_action == "store_state")
|
||||
if (str_action == "store_state")
|
||||
{
|
||||
storeOpenCloseState();
|
||||
return true;
|
||||
}
|
||||
if(str_action == "restore_state")
|
||||
|
||||
if (str_action == "restore_state")
|
||||
{
|
||||
restoreOpenCloseState();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return LLUICtrl::notifyChildren(info);
|
||||
}
|
||||
|
||||
S32 LLAccordionCtrlTab::notifyParent(const LLSD& info)
|
||||
{
|
||||
if(info.has("action"))
|
||||
if (info.has("action"))
|
||||
{
|
||||
std::string str_action = info["action"];
|
||||
if(str_action == "size_changes")
|
||||
if (str_action == "size_changes")
|
||||
{
|
||||
//
|
||||
S32 height = info["height"];
|
||||
height = llmax(height,10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
|
||||
height = llmax(height, 10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
|
||||
|
||||
mExpandedHeight = height;
|
||||
|
||||
if(isExpanded() && !mSkipChangesOnNotifyParent)
|
||||
if (isExpanded() && !mSkipChangesOnNotifyParent)
|
||||
{
|
||||
LLRect panel_rect = getRect();
|
||||
panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), height);
|
||||
|
|
@ -729,12 +739,13 @@ S32 LLAccordionCtrlTab::notifyParent(const LLSD& info)
|
|||
setRect(panel_rect);
|
||||
}
|
||||
|
||||
//LLAccordionCtrl should rearrange accordion tab if one of accordion change its size
|
||||
// LLAccordionCtrl should rearrange accordion tab if one of accordions changed its size
|
||||
if (getParent()) // A parent may not be set if tabs are added dynamically.
|
||||
getParent()->notifyParent(info);
|
||||
return 1;
|
||||
}
|
||||
else if(str_action == "select_prev")
|
||||
|
||||
if (str_action == "select_prev")
|
||||
{
|
||||
showAndFocusHeader();
|
||||
return 1;
|
||||
|
|
@ -772,78 +783,85 @@ S32 LLAccordionCtrlTab::notifyParent(const LLSD& info)
|
|||
|
||||
S32 LLAccordionCtrlTab::notify(const LLSD& info)
|
||||
{
|
||||
if(info.has("action"))
|
||||
if (info.has("action"))
|
||||
{
|
||||
std::string str_action = info["action"];
|
||||
if(str_action == "select_first")
|
||||
if (str_action == "select_first")
|
||||
{
|
||||
showAndFocusHeader();
|
||||
return 1;
|
||||
}
|
||||
else if( str_action == "select_last" )
|
||||
|
||||
if (str_action == "select_last")
|
||||
{
|
||||
if(getDisplayChildren() == false)
|
||||
if (!getDisplayChildren())
|
||||
{
|
||||
showAndFocusHeader();
|
||||
}
|
||||
else
|
||||
{
|
||||
LLView* view = getAccordionView();
|
||||
if(view)
|
||||
view->notify(LLSD().with("action","select_last"));
|
||||
if (view)
|
||||
{
|
||||
view->notify(LLSD().with("action", "select_last"));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent)
|
||||
{
|
||||
if( !mHeader->hasFocus() )
|
||||
if (!mHeader->hasFocus())
|
||||
return LLUICtrl::handleKey(key, mask, called_from_parent);
|
||||
|
||||
if ( (key == KEY_RETURN )&& mask == MASK_NONE)
|
||||
if ((key == KEY_RETURN) && mask == MASK_NONE)
|
||||
{
|
||||
changeOpenClose(getDisplayChildren());
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if ( (key == KEY_ADD || key == KEY_RIGHT)&& mask == MASK_NONE)
|
||||
if ((key == KEY_ADD || key == KEY_RIGHT) && mask == MASK_NONE)
|
||||
{
|
||||
if(getDisplayChildren() == false)
|
||||
{
|
||||
changeOpenClose(getDisplayChildren());
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
if ( (key == KEY_SUBTRACT || key == KEY_LEFT)&& mask == MASK_NONE)
|
||||
{
|
||||
if(getDisplayChildren() == true)
|
||||
if (!getDisplayChildren())
|
||||
{
|
||||
changeOpenClose(getDisplayChildren());
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if ( key == KEY_DOWN && mask == MASK_NONE)
|
||||
if ((key == KEY_SUBTRACT || key == KEY_LEFT) && mask == MASK_NONE)
|
||||
{
|
||||
//if collapsed go to the next accordion
|
||||
if(getDisplayChildren() == false)
|
||||
//we processing notifyParent so let call parent directly
|
||||
getParent()->notifyParent(LLSD().with("action","select_next"));
|
||||
if (getDisplayChildren())
|
||||
{
|
||||
changeOpenClose(getDisplayChildren());
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (key == KEY_DOWN && mask == MASK_NONE)
|
||||
{
|
||||
// if collapsed go to the next accordion
|
||||
if (!getDisplayChildren())
|
||||
{
|
||||
// we're processing notifyParent so let call parent directly
|
||||
getParent()->notifyParent(LLSD().with("action", "select_next"));
|
||||
}
|
||||
else
|
||||
{
|
||||
getAccordionView()->notify(LLSD().with("action","select_first"));
|
||||
getAccordionView()->notify(LLSD().with("action", "select_first"));
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if ( key == KEY_UP && mask == MASK_NONE)
|
||||
if (key == KEY_UP && mask == MASK_NONE)
|
||||
{
|
||||
//go to the previous accordion
|
||||
// go to the previous accordion
|
||||
|
||||
//we processing notifyParent so let call parent directly
|
||||
getParent()->notifyParent(LLSD().with("action","select_prev"));
|
||||
// we're processing notifyParent so let call parent directly
|
||||
getParent()->notifyParent(LLSD().with("action", "select_prev"));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -869,28 +887,29 @@ void LLAccordionCtrlTab::showAndFocusHeader()
|
|||
// accordion tab (assuming that the parent is an LLAccordionCtrl) the calls chain
|
||||
// is shortened and messages from inside the collapsed tabs are avoided.
|
||||
// See STORM-536.
|
||||
getParent()->notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));
|
||||
getParent()->notifyParent(LLSD().with("scrollToShowRect", screen_rc.getValue()));
|
||||
}
|
||||
void LLAccordionCtrlTab::storeOpenCloseState()
|
||||
|
||||
void LLAccordionCtrlTab::storeOpenCloseState()
|
||||
{
|
||||
if(mWasStateStored)
|
||||
if (mWasStateStored)
|
||||
return;
|
||||
mStoredOpenCloseState = getDisplayChildren();
|
||||
mWasStateStored = true;
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::restoreOpenCloseState()
|
||||
void LLAccordionCtrlTab::restoreOpenCloseState()
|
||||
{
|
||||
if(!mWasStateStored)
|
||||
if (!mWasStateStored)
|
||||
return;
|
||||
if(getDisplayChildren() != mStoredOpenCloseState)
|
||||
if (getDisplayChildren() != mStoredOpenCloseState)
|
||||
{
|
||||
changeOpenClose(getDisplayChildren());
|
||||
}
|
||||
mWasStateStored = false;
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::adjustContainerPanel ()
|
||||
void LLAccordionCtrlTab::adjustContainerPanel()
|
||||
{
|
||||
S32 width = getRect().getWidth();
|
||||
S32 height = getRect().getHeight();
|
||||
|
|
@ -907,83 +926,83 @@ void LLAccordionCtrlTab::adjustContainerPanel ()
|
|||
|
||||
void LLAccordionCtrlTab::adjustContainerPanel(const LLRect& child_rect)
|
||||
{
|
||||
if(!mContainerPanel)
|
||||
if (!mContainerPanel)
|
||||
return;
|
||||
|
||||
if(!mFitPanel)
|
||||
if (!mFitPanel)
|
||||
{
|
||||
show_hide_scrollbar(child_rect);
|
||||
updateLayout(child_rect);
|
||||
}
|
||||
else
|
||||
{
|
||||
mContainerPanel->reshape(child_rect.getWidth(),child_rect.getHeight());
|
||||
mContainerPanel->reshape(child_rect.getWidth(), child_rect.getHeight());
|
||||
mContainerPanel->setRect(child_rect);
|
||||
}
|
||||
}
|
||||
|
||||
S32 LLAccordionCtrlTab::getChildViewHeight()
|
||||
{
|
||||
if(!mContainerPanel)
|
||||
if (!mContainerPanel)
|
||||
return 0;
|
||||
return mContainerPanel->getRect().getHeight();
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::show_hide_scrollbar(const LLRect& child_rect)
|
||||
{
|
||||
if(getChildViewHeight() > child_rect.getHeight() )
|
||||
if (getChildViewHeight() > child_rect.getHeight())
|
||||
showScrollbar(child_rect);
|
||||
else
|
||||
hideScrollbar(child_rect);
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::showScrollbar(const LLRect& child_rect)
|
||||
{
|
||||
if(!mContainerPanel || !mScrollbar)
|
||||
if (!mContainerPanel || !mScrollbar)
|
||||
return;
|
||||
bool was_visible = mScrollbar->getVisible();
|
||||
mScrollbar->setVisible(true);
|
||||
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
|
||||
{
|
||||
ctrlSetLeftTopAndSize(mScrollbar,child_rect.getWidth()-scrollbar_size,
|
||||
child_rect.getHeight()-PARENT_BORDER_MARGIN,
|
||||
scrollbar_size,
|
||||
child_rect.getHeight()-2*PARENT_BORDER_MARGIN);
|
||||
}
|
||||
ctrlSetLeftTopAndSize(mScrollbar,
|
||||
child_rect.getWidth() - scrollbar_size,
|
||||
child_rect.getHeight() - PARENT_BORDER_MARGIN,
|
||||
scrollbar_size,
|
||||
child_rect.getHeight() - PARENT_BORDER_MARGIN * 2);
|
||||
|
||||
LLRect orig_rect = mContainerPanel->getRect();
|
||||
|
||||
mScrollbar->setPageSize(child_rect.getHeight());
|
||||
mScrollbar->setDocParams(orig_rect.getHeight(),mScrollbar->getDocPos());
|
||||
mScrollbar->setDocParams(orig_rect.getHeight(), mScrollbar->getDocPos());
|
||||
|
||||
if(was_visible)
|
||||
if (was_visible)
|
||||
{
|
||||
S32 scroll_pos = llmin(mScrollbar->getDocPos(), orig_rect.getHeight() - child_rect.getHeight() - 1);
|
||||
mScrollbar->setDocPos(scroll_pos);
|
||||
}
|
||||
else//shrink child panel
|
||||
else // Shrink child panel
|
||||
{
|
||||
updateLayout(child_rect);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::hideScrollbar( const LLRect& child_rect )
|
||||
void LLAccordionCtrlTab::hideScrollbar(const LLRect& child_rect)
|
||||
{
|
||||
if(!mContainerPanel || !mScrollbar)
|
||||
if (!mContainerPanel || !mScrollbar)
|
||||
return;
|
||||
|
||||
if(mScrollbar->getVisible() == false)
|
||||
if (mScrollbar->getVisible() == FALSE)
|
||||
return;
|
||||
mScrollbar->setVisible(false);
|
||||
|
||||
mScrollbar->setVisible(FALSE);
|
||||
mScrollbar->setDocPos(0);
|
||||
|
||||
//shrink child panel
|
||||
updateLayout(child_rect);
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
|
||||
void LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
|
||||
{
|
||||
LLRect child_rect;
|
||||
|
||||
|
|
@ -999,21 +1018,20 @@ void LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
|
|||
updateLayout(child_rect);
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
|
||||
void LLAccordionCtrlTab::drawChild(const LLRect& root_rect, LLView* child)
|
||||
{
|
||||
if (child && child->getVisible() && child->getRect().isValid())
|
||||
{
|
||||
LLRect screen_rect;
|
||||
localRectToScreen(child->getRect(),&screen_rect);
|
||||
|
||||
if ( root_rect.overlaps(screen_rect) && sDirtyRect.overlaps(screen_rect))
|
||||
localRectToScreen(child->getRect(), &screen_rect);
|
||||
|
||||
if (root_rect.overlaps(screen_rect) && sDirtyRect.overlaps(screen_rect))
|
||||
{
|
||||
gGL.matrixMode(LLRender::MM_MODELVIEW);
|
||||
LLUI::pushMatrix();
|
||||
{
|
||||
LLUI::translate((F32)child->getRect().mLeft, (F32)child->getRect().mBottom);
|
||||
child->draw();
|
||||
|
||||
}
|
||||
LLUI::popMatrix();
|
||||
}
|
||||
|
|
@ -1022,64 +1040,67 @@ void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
|
|||
|
||||
void LLAccordionCtrlTab::draw()
|
||||
{
|
||||
if(mFitPanel)
|
||||
if (mFitPanel)
|
||||
{
|
||||
LLUICtrl::draw();
|
||||
}
|
||||
else
|
||||
{
|
||||
LLRect root_rect = getRootView()->getRect();
|
||||
drawChild(root_rect,mHeader);
|
||||
drawChild(root_rect,mScrollbar );
|
||||
{
|
||||
LLRect child_rect;
|
||||
LLRect root_rect(getRootView()->getRect());
|
||||
drawChild(root_rect, mHeader);
|
||||
drawChild(root_rect, mScrollbar);
|
||||
|
||||
S32 width = getRect().getWidth();
|
||||
S32 height = getRect().getHeight();
|
||||
LLRect child_rect;
|
||||
|
||||
child_rect.setLeftTopAndSize(
|
||||
getPaddingLeft(),
|
||||
height - getHeaderHeight() - getPaddingTop(),
|
||||
width - getPaddingLeft() - getPaddingRight(),
|
||||
height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
|
||||
S32 width = getRect().getWidth();
|
||||
S32 height = getRect().getHeight();
|
||||
|
||||
LLLocalClipRect clip(child_rect);
|
||||
drawChild(root_rect,mContainerPanel);
|
||||
}
|
||||
child_rect.setLeftTopAndSize(
|
||||
getPaddingLeft(),
|
||||
height - getHeaderHeight() - getPaddingTop(),
|
||||
width - getPaddingLeft() - getPaddingRight(),
|
||||
height - getHeaderHeight() - getPaddingTop() - getPaddingBottom());
|
||||
|
||||
LLLocalClipRect clip(child_rect);
|
||||
drawChild(root_rect,mContainerPanel);
|
||||
}
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::updateLayout ( const LLRect& child_rect )
|
||||
void LLAccordionCtrlTab::updateLayout(const LLRect& child_rect)
|
||||
{
|
||||
LLView* child = getAccordionView();
|
||||
if(!mContainerPanel)
|
||||
if (!mContainerPanel)
|
||||
return;
|
||||
|
||||
S32 panel_top = child_rect.getHeight();
|
||||
S32 panel_width = child_rect.getWidth();
|
||||
|
||||
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
|
||||
if(mScrollbar && mScrollbar->getVisible() != false)
|
||||
static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
|
||||
if (mScrollbar && mScrollbar->getVisible())
|
||||
{
|
||||
panel_top+=mScrollbar->getDocPos();
|
||||
panel_width-=scrollbar_size;
|
||||
panel_top += mScrollbar->getDocPos();
|
||||
panel_width -= scrollbar_size;
|
||||
}
|
||||
|
||||
//set sizes for first panels and dragbars
|
||||
// Set sizes for first panels and dragbars
|
||||
LLRect panel_rect = child->getRect();
|
||||
ctrlSetLeftTopAndSize(mContainerPanel,child_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
|
||||
ctrlSetLeftTopAndSize(mContainerPanel, child_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
|
||||
}
|
||||
|
||||
void LLAccordionCtrlTab::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
|
||||
{
|
||||
if(!panel)
|
||||
if (!panel)
|
||||
return;
|
||||
LLRect panel_rect = panel->getRect();
|
||||
panel_rect.setLeftTopAndSize( left, top, width, height);
|
||||
panel_rect.setLeftTopAndSize(left, top, width, height);
|
||||
panel->reshape( width, height, 1);
|
||||
panel->setRect(panel_rect);
|
||||
}
|
||||
|
||||
BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
//header may be not the first child but we need to process it first
|
||||
if(y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT/2) )
|
||||
if (y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT / 2))
|
||||
{
|
||||
//inside tab header
|
||||
//fix for EXT-6619
|
||||
|
|
@ -1088,16 +1109,18 @@ BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
|
|||
}
|
||||
return LLUICtrl::handleToolTip(x, y, mask);
|
||||
}
|
||||
BOOL LLAccordionCtrlTab::handleScrollWheel ( S32 x, S32 y, S32 clicks )
|
||||
|
||||
BOOL LLAccordionCtrlTab::handleScrollWheel(S32 x, S32 y, S32 clicks)
|
||||
{
|
||||
if( LLUICtrl::handleScrollWheel(x,y,clicks))
|
||||
if (LLUICtrl::handleScrollWheel(x, y, clicks))
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
if( mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
|
||||
|
||||
if (mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ public:
|
|||
virtual void setDisplayChildren(bool display);
|
||||
|
||||
// Returns expand/collapse state
|
||||
virtual bool getDisplayChildren() const {return mDisplayChildren;};
|
||||
virtual bool getDisplayChildren() const { return mDisplayChildren; };
|
||||
|
||||
//set LLAccordionCtrlTab panel
|
||||
void setAccordionView(LLView* panel);
|
||||
|
|
|
|||
|
|
@ -1198,7 +1198,7 @@ void LLFlatListView::onFocusReceived()
|
|||
{
|
||||
if (size())
|
||||
{
|
||||
mSelectedItemsBorder->setVisible(TRUE);
|
||||
mSelectedItemsBorder->setVisible(TRUE);
|
||||
}
|
||||
gEditMenuHandler = this;
|
||||
}
|
||||
|
|
@ -1207,7 +1207,7 @@ void LLFlatListView::onFocusLost()
|
|||
{
|
||||
mSelectedItemsBorder->setVisible(FALSE);
|
||||
// Route menu back to the default
|
||||
if( gEditMenuHandler == this )
|
||||
if (gEditMenuHandler == this)
|
||||
{
|
||||
gEditMenuHandler = NULL;
|
||||
}
|
||||
|
|
@ -1216,16 +1216,16 @@ void LLFlatListView::onFocusLost()
|
|||
//virtual
|
||||
S32 LLFlatListView::notify(const LLSD& info)
|
||||
{
|
||||
if(info.has("action"))
|
||||
if (info.has("action"))
|
||||
{
|
||||
std::string str_action = info["action"];
|
||||
if(str_action == "select_first")
|
||||
if (str_action == "select_first")
|
||||
{
|
||||
setFocus(true);
|
||||
selectFirstItem();
|
||||
return 1;
|
||||
}
|
||||
else if(str_action == "select_last")
|
||||
else if (str_action == "select_last")
|
||||
{
|
||||
setFocus(true);
|
||||
selectLastItem();
|
||||
|
|
@ -1238,6 +1238,7 @@ S32 LLFlatListView::notify(const LLSD& info)
|
|||
notifyParentItemsRectChanged();
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1249,10 +1250,8 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
|
|||
detached_items.clear();
|
||||
// Go through items and detach valid items, remove them from items panel
|
||||
// and add to detached_items.
|
||||
for (pairs_iterator_t
|
||||
iter = mItemPairs.begin(),
|
||||
iter_end = mItemPairs.end();
|
||||
iter != iter_end; ++iter)
|
||||
pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
|
||||
while (iter != iter_end)
|
||||
{
|
||||
LLPanel* pItem = (*iter)->first;
|
||||
if (1 == pItem->notify(action))
|
||||
|
|
@ -1261,6 +1260,7 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
|
|||
mItemsPanel->removeChild(pItem);
|
||||
detached_items.push_back(pItem);
|
||||
}
|
||||
iter++;
|
||||
}
|
||||
if (!detached_items.empty())
|
||||
{
|
||||
|
|
@ -1268,13 +1268,12 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
|
|||
if (detached_items.size() == mItemPairs.size())
|
||||
{
|
||||
// This way will be faster if all items were disconnected
|
||||
for (pairs_iterator_t
|
||||
iter = mItemPairs.begin(),
|
||||
iter_end = mItemPairs.end();
|
||||
iter != iter_end; ++iter)
|
||||
pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
|
||||
while (iter != iter_end)
|
||||
{
|
||||
(*iter)->first = NULL;
|
||||
delete *iter;
|
||||
iter++;
|
||||
}
|
||||
mItemPairs.clear();
|
||||
// Also set items panel height to zero.
|
||||
|
|
@ -1287,16 +1286,14 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
|
|||
}
|
||||
else
|
||||
{
|
||||
for (std::vector<LLPanel*>::const_iterator
|
||||
detached_iter = detached_items.begin(),
|
||||
detached_iter_end = detached_items.end();
|
||||
detached_iter != detached_iter_end; ++detached_iter)
|
||||
std::vector<LLPanel*>::const_iterator
|
||||
detached_iter = detached_items.begin(),
|
||||
detached_iter_end = detached_items.end();
|
||||
while (detached_iter < detached_iter_end)
|
||||
{
|
||||
LLPanel* pDetachedItem = *detached_iter;
|
||||
for (pairs_iterator_t
|
||||
iter = mItemPairs.begin(),
|
||||
iter_end = mItemPairs.end();
|
||||
iter != iter_end; ++iter)
|
||||
pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
|
||||
while (iter != iter_end)
|
||||
{
|
||||
item_pair_t* item_pair = *iter;
|
||||
if (item_pair->first == pDetachedItem)
|
||||
|
|
@ -1306,7 +1303,9 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
|
|||
delete item_pair;
|
||||
break;
|
||||
}
|
||||
iter++;
|
||||
}
|
||||
detached_iter++;
|
||||
}
|
||||
rearrangeItems();
|
||||
}
|
||||
|
|
@ -1322,7 +1321,6 @@ LLFlatListViewEx::Params::Params()
|
|||
: no_items_msg("no_items_msg")
|
||||
, no_filtered_items_msg("no_filtered_items_msg")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
LLFlatListViewEx::LLFlatListViewEx(const Params& p)
|
||||
|
|
@ -1332,7 +1330,6 @@ LLFlatListViewEx::LLFlatListViewEx(const Params& p)
|
|||
, mForceShowingUnmatchedItems(false)
|
||||
, mHasMatchedItems(false)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
|
||||
|
|
@ -1352,7 +1349,6 @@ void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
|
|||
// list does not contain any items at all
|
||||
setNoItemsCommentText(mNoItemsMsg);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool LLFlatListViewEx::getForceShowingUnmatchedItems()
|
||||
|
|
@ -1411,12 +1407,10 @@ void LLFlatListViewEx::filterItems()
|
|||
getItems(items);
|
||||
|
||||
mHasMatchedItems = false;
|
||||
for (item_panel_list_t::iterator
|
||||
iter = items.begin(),
|
||||
iter_end = items.end();
|
||||
iter != iter_end; ++iter)
|
||||
item_panel_list_t::iterator iter = items.begin(), iter_end = items.end();
|
||||
while (iter < iter_end)
|
||||
{
|
||||
LLPanel* pItem = (*iter);
|
||||
LLPanel* pItem = *(iter++);
|
||||
updateItemVisibility(pItem, action);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue