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

CHUI-912 : WIP : Fix resize test when folder is empty, add more traces (to be deleted)

master
Merov Linden 2013-04-11 19:02:16 -07:00
parent 21d7c1d0ba
commit b05bf882db
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llfolderview.cpp
View File

@ -662,7 +662,7 @@ void LLFolderView::draw()
// get preferable text height...
S32 pixel_height = mStatusTextBox->getTextPixelHeight();
bool height_changed = local_rect.getHeight() != pixel_height;
bool height_changed = (local_rect.getHeight() < pixel_height);
if (height_changed)
{
// ... if it does not match current height, lets rearrange current view.
@ -1616,7 +1616,7 @@ void LLFolderView::update()
{
getFolderViewModel()->getFilter().clearModified();
}
llinfos << "Merov : LLFolderView::update: modified = " << getFolderViewModel()->getFilter().isModified() << ", default = " << getFolderViewModel()->getFilter().isNotDefault() << ", count = " << getFolderViewModel()->getFilter().getFilterCount() << llendl;
llinfos << "Merov : LLFolderView::update: parent = " << mParentPanel->getName() << ", modified = " << getFolderViewModel()->getFilter().isModified() << ", not default = " << getFolderViewModel()->getFilter().isNotDefault() << ", count = " << getFolderViewModel()->getFilter().getFilterCount() << llendl;
// automatically show matching items, and select first one if we had a selection
if (mNeedsAutoSelect)

6
indra/llui/llfolderviewitem.cpp
View File

@ -795,6 +795,12 @@ void LLFolderViewItem::drawLabel(const LLFontGL * font, const F32 x, const F32 y
void LLFolderViewItem::draw()
{
LLFolderViewModelItem& vmi = *getViewModelItem();
if (vmi.getSearchableName() == "A NOUNOURS")
{
llinfos << "Merov : LLFolderViewItem::draw : Special NOUNOURS, draw it!" << llendl;
}
const BOOL show_context = (getRoot() ? getRoot()->getShowSelectionContext() : FALSE);
const BOOL filled = show_context || (getRoot() ? getRoot()->getParentPanel()->hasFocus() : FALSE); // If we have keyboard focus, draw selection filled

6
indra/newview/llinventorypanel.cpp
View File

@ -194,7 +194,9 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
p.show_item_link_overlays = mShowItemLinkOverlays;
p.root = NULL;
p.options_menu = "menu_inventory.xml";
llinfos << "Merov : LLInventoryPanel::createFolderRoot, name = " << getName() << ", label = " << getLabel() << ", root id = " << root_id << llendl;
return LLUICtrlFactory::create<LLFolderView>(p);
}
@ -403,6 +405,8 @@ void LLInventoryPanel::modelChanged(U32 mask)
static LLFastTimer::DeclareTimer FTM_REFRESH("Inventory Refresh");
LLFastTimer t2(FTM_REFRESH);
llinfos << "Merov : LLInventoryPanel::modelChanged, mask = " << mask << ", name = " << getName() << ", label = " << getLabel() << llendl;
bool handled = false;
if (!mViewsInitialized) return;