UI cleanup.
-Added ui-local transformation matrix. -Gutted legacy commitcallbacks throughout ui widget ctors. -Created filter_editor ui widget which issues commit on keypress -search_editor commits on focus loss/enter press -search_editor and filter_editor now have a built in 'x' button to clear text. -LLComboBox::setPrearrangeCallback now uses boost::function -LLComboBox::setTextEntryCallback now uses boost::function -LLLineEditor::setKeystrokeCallback now uses boost::function -LLLineEditor::setPrevalidate now uses boost::function -LLPanel::childSetKeystrokeCallback removed -LLPanel::childSetPrevalidate removed -LLPanel::childSetActionTextbox now uses boost::function -LLTextBox::setClickedCallback now uses boost::function -LLTextEditor::setKeystrokeCallback added. -Cleaned up JCFloaterAreaSearch
This commit is contained in:
@@ -136,7 +136,7 @@ const F32 ACTIVATE_HIGHLIGHT_TIME = 0.3f;
|
||||
|
||||
// Default constructor
|
||||
LLMenuItemGL::LLMenuItemGL( const std::string& name, const std::string& label, KEY key, MASK mask ) :
|
||||
LLUICtrl( name, LLRect(), TRUE, NULL, NULL ),
|
||||
LLUICtrl( name ),
|
||||
mJumpKey(KEY_NONE),
|
||||
mAllowKeyRepeat(FALSE),
|
||||
mHighlight( FALSE ),
|
||||
@@ -268,19 +268,6 @@ BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp)
|
||||
accelerator = *list_it;
|
||||
if ((accelerator->mKey == mAcceleratorKey) && (accelerator->mMask == (mAcceleratorMask & MASK_NORMALKEYS)))
|
||||
{
|
||||
|
||||
// *NOTE: get calling code to throw up warning or route
|
||||
// warning messages back to app-provided output
|
||||
// std::string warning;
|
||||
// warning.append("Duplicate key binding <");
|
||||
// appendAcceleratorString( warning );
|
||||
// warning.append("> for menu items:\n ");
|
||||
// warning.append(accelerator->mName);
|
||||
// warning.append("\n ");
|
||||
// warning.append(mLabel);
|
||||
|
||||
// llwarns << warning << llendl;
|
||||
// LLAlertDialog::modalAlert(warning);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@@ -1826,7 +1813,7 @@ static LLRegisterWidget<LLMenuGL> r1("menu");
|
||||
|
||||
// Default constructor
|
||||
LLMenuGL::LLMenuGL( const std::string& name, const std::string& label )
|
||||
: LLUICtrl( name, LLRect(), FALSE, NULL, NULL ),
|
||||
: LLUICtrl( name, LLRect(), FALSE),
|
||||
mBackgroundColor( sDefaultBackgroundColor ),
|
||||
mBgVisible( TRUE ),
|
||||
mHasSelection( FALSE ),
|
||||
@@ -1852,7 +1839,7 @@ LLMenuGL::LLMenuGL( const std::string& name, const std::string& label )
|
||||
}
|
||||
|
||||
LLMenuGL::LLMenuGL( const std::string& label)
|
||||
: LLUICtrl( label, LLRect(), FALSE, NULL, NULL ),
|
||||
: LLUICtrl( label, LLRect(), FALSE),
|
||||
mBackgroundColor( sDefaultBackgroundColor ),
|
||||
mBgVisible( TRUE ),
|
||||
mHasSelection( FALSE ),
|
||||
|
||||
Reference in New Issue
Block a user