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

- changed : removed the custom LLTabContainer drag-and-hold code in LLPanelMainInventory 

-> note: this code will change the auto-scroll rectangle for the active inventory panel as a side-effect
meow-7.2.2
Kitty Barnett 2011-06-17 00:31:57 +02:00
parent ef59beb300
commit 3b7c0d52d9
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/lltabcontainer.h
View File

@ -208,7 +208,7 @@ public:
S32 getMinTabWidth() const { return mMinTabWidth; }
S32 getMaxTabWidth() const { return mMaxTabWidth; }
void startDragAndDropDelayTimer() { mDragAndDropDelayTimer.start(); }
// void startDragAndDropDelayTimer() { mDragAndDropDelayTimer.start(); }
void onTabBtn( const LLSD& data, LLPanel* panel );
void onNextBtn(const LLSD& data);

23
indra/newview/llpanelmaininventory.cpp
View File

@ -543,16 +543,23 @@ BOOL LLPanelMainInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
std::string& tooltip_msg)
{
// Check to see if we are auto scrolling from the last frame
LLInventoryPanel* panel = (LLInventoryPanel*)this->getActivePanel();
BOOL needsToScroll = panel->getScrollableContainer()->autoScroll(x, y);
if(mFilterTabs)
// LLInventoryPanel* panel = (LLInventoryPanel*)this->getActivePanel();
// BOOL needsToScroll = panel->getScrollableContainer()->autoScroll(x, y);
// if(mFilterTabs)
// {
// if(needsToScroll)
// {
// mFilterTabs->startDragAndDropDelayTimer();
// }
// }
// [SL:KB] - Checked: UI-TabDndButtonCommit | Checked: 2011-06-16 (Catznip-2.6.0c) | Added: Catznip-2.6.0c
LLInventoryPanel* pInvPanel = getActivePanel();
if ( (pInvPanel) && (pInvPanel->pointInView(x - pInvPanel->getRect().mLeft, y - pInvPanel->getRect().mBottom)) )
{
if(needsToScroll)
{
mFilterTabs->startDragAndDropDelayTimer();
}
pInvPanel->getScrollableContainer()->autoScroll(x, y);
}
// [/SL:KB]
BOOL handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
return handled;