diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-11 19:02:16 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-11 19:02:16 -0700 |
| commit | b05bf882dbf5cdcb4683b4c6201ea50a38491a7b (patch) | |
| tree | 233f0aaead89eec311c888a350bc1a9ff3e79481 /indra/llui | |
| parent | 21d7c1d0ba7fa548e5ea88010bb72e47656a53f5 (diff) | |
CHUI-912 : WIP : Fix resize test when folder is empty, add more traces (to be deleted)
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 4 | ||||
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index c6868c9538..5bca589bc4 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -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) diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 3693920e05..43267b428e 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -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 |