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

EXP-1099 FIX Cannot drag item on to empty space in outbox folder

meow-7.2.2
Richard Linden 2011-08-16 13:59:46 -07:00
parent 25f1653ca0
commit bffd5b3a6c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfolderview.cpp
View File

@ -527,6 +527,7 @@ void LLFolderView::reshape(S32 width, S32 height, BOOL called_from_parent)
scroll_rect = mScrollContainer->getContentWindowRect();
}
width = llmax(mMinWidth, scroll_rect.getWidth());
height = llmax(height, scroll_rect.getHeight());
// restrict width with scroll container's width
if (mUseEllipses)
@ -1905,21 +1906,15 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
std::string& tooltip_msg)
{
mDragAndDropThisFrame = TRUE;
// have children handle it first
BOOL handled = LLView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
accept, tooltip_msg);
// When there are no visible children drag and drop is handled
// when drop is not handled by child, it should be handled
// by the folder which is the hierarchy root.
if (!handled && !hasVisibleChildren())
if (!handled && getListener()->getUUID().notNull())
{
if (mFolders.empty())
{
handled = handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg);
}
else
{
handled = mFolders.front()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg);
}
LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
}
if (handled)