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

EXP-1718 FIX -- Drag and drop within the outbox can result in folders being out of order 

* Outbox updates now result in a resort to keep drag and drop items and folders properly sorted
* New icon for merchant outbox
* New behavior to accept drag and drop files over the entire merchant outbox floater
master
Leslie Linden 2011-12-13 16:42:14 -08:00
parent d7fabfee19
commit bb39e3fa3c
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
indra/newview/llfloateroutbox.cpp
View File

@ -158,14 +158,6 @@ void LLFloaterOutbox::onClose(bool app_quitting)
void LLFloaterOutbox::onOpen(const LLSD& key)
{
//
// Initialize the marketplace import API
//
LLMarketplaceInventoryImporter::getInstance()->initialize();
LLMarketplaceInventoryImporter::getInstance()->setStatusChangedCallback(boost::bind(&LLFloaterOutbox::importStatusChanged, this, _1));
LLMarketplaceInventoryImporter::getInstance()->setStatusReportCallback(boost::bind(&LLFloaterOutbox::importReportResults, this, _1, _2));
//
// Look for an outbox and set up the inventory API
//
@ -224,6 +216,7 @@ void LLFloaterOutbox::setupOutbox(const LLUUID& outboxId)
{
gInventory.removeObserver(mCategoryAddedObserver);
delete mCategoryAddedObserver;
mCategoryAddedObserver = NULL;
}
// Create observer for outbox modifications
@ -252,6 +245,14 @@ void LLFloaterOutbox::setupOutbox(const LLUUID& outboxId)
mOutboxInventoryPanel->getFilter()->markDefault();
fetchOutboxContents();
//
// Initialize the marketplace import API
//
LLMarketplaceInventoryImporter::getInstance()->initialize();
LLMarketplaceInventoryImporter::getInstance()->setStatusChangedCallback(boost::bind(&LLFloaterOutbox::importStatusChanged, this, _1));
LLMarketplaceInventoryImporter::getInstance()->setStatusReportCallback(boost::bind(&LLFloaterOutbox::importReportResults, this, _1, _2));
}
void LLFloaterOutbox::updateItemCount()
@ -350,12 +351,20 @@ BOOL LLFloaterOutbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
BOOL handled = (childrenHandleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg) != NULL);
// Pass drag and drop to this floater to the outbox inventory control if no other children handle it
if (!handled)
if (!handled || (*accept == ACCEPT_NO))
{
S32 local_x = x - mOutboxInventoryPanel->getRect().mLeft;
S32 local_y = y - mOutboxInventoryPanel->getRect().mBottom;
S32 local_x;
S32 local_y;
handled = mOutboxInventoryPanel->handleDragAndDrop(local_x, local_y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
LLFolderView * outbox_root_folder = mOutboxInventoryPanel->getRootFolder();
localPointToOtherView(x, y, &local_x, &local_y, outbox_root_folder);
const LLRect& outbox_rect = outbox_root_folder->getRect();
local_x = llclamp(local_x, outbox_rect.mLeft + 1, outbox_rect.mRight - 1);
local_y = llclamp(local_y, outbox_rect.mBottom + 1, outbox_rect.mTop - 1);
handled = outbox_root_folder->LLFolderViewFolder::handleDragAndDrop(local_x, local_y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
}
return handled;
@ -371,6 +380,11 @@ void LLFloaterOutbox::onImportButtonClicked()
void LLFloaterOutbox::onOutboxChanged()
{
llassert(!mOutboxId.isNull());
if (mOutboxInventoryPanel)
{
mOutboxInventoryPanel->requestSort();
}
fetchOutboxContents();
updateView();

6
indra/newview/llfolderview.cpp
View File

@ -1945,9 +1945,9 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
if (!handled)
{
if (getListener()->getUUID().notNull())
{
handled = LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
}
{
handled = LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
}
else
{
if (!mFolders.empty())

BIN
indra/newview/skins/default/textures/toolbar_icons/outbox.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB