Updated LLView:
-Removed a few extra unneeded virtuals -Pulled tabgroups out of llpanel and into LLView -removeChild doesn't support delete. Delete manually. -addChildAtEnd renamed to addChildInBack -getScreenRect renamed to calcScreenRect -added calcScreenBoundingRect and calcBoundingRect(which updateBoundingRect calls -General cleanup. Someone at LL figured out that dynamic_cast actually exists. Fixed PieMenu not reliably centering on cursor. Fixed context menu crash in line and text editors. Classes with LLEditMenuHandler as a base do not need to set gEditMenuHandler to NULL, since LLEditMenuHandler's dtor does that already!
This commit is contained in:
@@ -79,7 +79,6 @@ void LLPanel::init()
|
||||
mBorder = NULL;
|
||||
mDefaultBtn = NULL;
|
||||
setIsChrome(FALSE); //is this a decorator to a live window or a form?
|
||||
mLastTabGroup = 0;
|
||||
|
||||
mPanelHandle.bind(this);
|
||||
setTabStop(FALSE);
|
||||
@@ -269,20 +268,6 @@ void LLPanel::setDefaultBtn(const std::string& id)
|
||||
}
|
||||
}
|
||||
|
||||
void LLPanel::addCtrl( LLUICtrl* ctrl, S32 tab_group)
|
||||
{
|
||||
mLastTabGroup = tab_group;
|
||||
|
||||
LLView::addCtrl(ctrl, tab_group);
|
||||
}
|
||||
|
||||
void LLPanel::addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group)
|
||||
{
|
||||
mLastTabGroup = tab_group;
|
||||
|
||||
LLView::addCtrlAtEnd(ctrl, tab_group);
|
||||
}
|
||||
|
||||
BOOL LLPanel::handleKeyHere( KEY key, MASK mask )
|
||||
{
|
||||
BOOL handled = FALSE;
|
||||
@@ -1189,9 +1174,13 @@ void LLLayoutStack::draw()
|
||||
}
|
||||
}
|
||||
|
||||
void LLLayoutStack::removeCtrl(LLUICtrl* ctrl)
|
||||
void LLLayoutStack::removeChild(LLView* ctrl)
|
||||
{
|
||||
LLEmbeddedPanel* embedded_panelp = findEmbeddedPanel((LLPanel*)ctrl);
|
||||
LLView::removeChild(ctrl);
|
||||
LLPanel* panel = dynamic_cast<LLPanel*>(ctrl);
|
||||
if(!panel)
|
||||
return;
|
||||
LLEmbeddedPanel* embedded_panelp = findEmbeddedPanel(panel);
|
||||
|
||||
if (embedded_panelp)
|
||||
{
|
||||
@@ -1200,10 +1189,8 @@ void LLLayoutStack::removeCtrl(LLUICtrl* ctrl)
|
||||
}
|
||||
|
||||
// need to update resizebars
|
||||
|
||||
|
||||
calcMinExtents();
|
||||
|
||||
LLView::removeCtrl(ctrl);
|
||||
}
|
||||
|
||||
LLXMLNodePtr LLLayoutStack::getXML(bool save_children) const
|
||||
|
||||
Reference in New Issue
Block a user