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:
@@ -607,59 +607,3 @@ void LLToolPlacer::handleDeselect()
|
||||
{
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
// LLToolPlacerPanel
|
||||
|
||||
S32 LLToolPlacerPanel::sButtonsAdded = 0;
|
||||
LLButton* LLToolPlacerPanel::sButtons[ TOOL_PLACER_NUM_BUTTONS ];
|
||||
|
||||
LLToolPlacerPanel::LLToolPlacerPanel(const std::string& name, const LLRect& rect)
|
||||
:
|
||||
LLPanel( name, rect )
|
||||
{
|
||||
}
|
||||
|
||||
void LLToolPlacerPanel::addButton( const std::string& up_state, const std::string& down_state, LLPCode* pcode )
|
||||
{
|
||||
const S32 TOOL_SIZE = 32;
|
||||
const S32 HORIZ_SPACING = TOOL_SIZE + 5;
|
||||
const S32 VERT_SPACING = TOOL_SIZE + 5;
|
||||
const S32 VPAD = 10;
|
||||
const S32 HPAD = 7;
|
||||
|
||||
S32 row = sButtonsAdded / 4;
|
||||
S32 column = sButtonsAdded % 4;
|
||||
|
||||
LLRect help_rect = gSavedSettings.getRect("ToolHelpRect");
|
||||
|
||||
// Build the rectangle, recalling the origin is at lower left
|
||||
// and we want the icons to build down from the top.
|
||||
LLRect rect;
|
||||
rect.setLeftTopAndSize(
|
||||
HPAD + (column * HORIZ_SPACING),
|
||||
help_rect.mBottom - VPAD - (row * VERT_SPACING),
|
||||
TOOL_SIZE,
|
||||
TOOL_SIZE );
|
||||
|
||||
LLButton* btn = new LLButton(
|
||||
std::string("ToolPlacerOptBtn"),
|
||||
rect,
|
||||
up_state,
|
||||
down_state,
|
||||
LLStringUtil::null, &LLToolPlacerPanel::setObjectType,
|
||||
pcode,
|
||||
LLFontGL::getFontSansSerif());
|
||||
btn->setFollowsBottom();
|
||||
btn->setFollowsLeft();
|
||||
addChild(btn);
|
||||
|
||||
sButtons[sButtonsAdded] = btn;
|
||||
sButtonsAdded++;
|
||||
}
|
||||
|
||||
// static
|
||||
void LLToolPlacerPanel::setObjectType( void* data )
|
||||
{
|
||||
LLPCode pcode = *(LLPCode*) data;
|
||||
LLToolPlacer::setObjectType( pcode );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user