livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-101 WIP Make LLFolderview general purpose 

one more gcc build fix
meow-7.2.2
Richard Linden 2012-06-21 10:11:55 -07:00
parent c517863b9c
commit a02f2e63f2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfolderview.cpp
View File

@ -289,6 +289,9 @@ LLFolderView::~LLFolderView( void )
delete mFilter;
mFilter = NULL;
delete mViewModel;
mViewModel = NULL;
}
BOOL LLFolderView::canFocusChildren() const
@ -345,12 +348,12 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen
LLFolderViewFolder::arrange(&mMinWidth, &target_height, mFilter->getFirstSuccessGeneration());
LLRect scroll_rect = mScrollContainer->getContentWindowRect();
reshape( llmax(scroll_rect.getWidth(), mMinWidth), mCurHeight );
reshape( llmax(scroll_rect.getWidth(), mMinWidth), llround(mCurHeight) );
LLRect new_scroll_rect = mScrollContainer->getContentWindowRect();
if (new_scroll_rect.getWidth() != scroll_rect.getWidth())
{
reshape( llmax(scroll_rect.getWidth(), mMinWidth), mCurHeight );
reshape( llmax(scroll_rect.getWidth(), mMinWidth), llround(mCurHeight) );
}
// move item renamer text field to item's new position

3
indra/newview/llinventorypanel.cpp
View File

@ -685,7 +685,8 @@ LLFolderView * LLInventoryPanel::createFolderView(LLInvFVBridge * bridge, bool u
p.rect = folder_rect;
p.parent_panel = this;
p.tool_tip = p.name;
p.listener = bridge;
p.listener = bridge;
p.view_model = new LLFolderViewModelInventory();
p.use_label_suffix = useLabelSuffix;
p.allow_multiselect = mAllowMultiSelect;
p.show_empty_message = mShowEmptyMessage;