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

Fix drag and drop for windows. Makes Win32 state machine behave more like Mac.

master
Callum Prentice 2010-01-07 14:21:57 -08:00
parent cbea2b235f
commit e57f6a5cee
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/lldragdropwin32.cpp
View File

@ -189,7 +189,7 @@ class LLDragDropWin32Target:
MASK mask = gKeyboard->currentMask(TRUE);
LLWindowCallbacks::DragNDropResult result = window_imp->completeDragNDropRequest( gl_coord, mask,
LLWindowCallbacks::DNDA_TRACK, std::string( "" ) );
LLWindowCallbacks::DNDA_TRACK, mDropUrl );
switch (result)
{

5
indra/newview/llviewerwindow.cpp
View File

@ -835,6 +835,7 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
// Much of the handling for these two cases is the same.
case LLWindowCallbacks::DNDA_TRACK:
case LLWindowCallbacks::DNDA_DROPPED:
case LLWindowCallbacks::DNDA_START_TRACKING:
{
bool drop = (LLWindowCallbacks::DNDA_DROPPED == action);
@ -925,10 +926,6 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
}
break;
case LLWindowCallbacks::DNDA_START_TRACKING:
// No special handling here yet -- we'll actually start tracking on the first DNDA_TRACK event.
break;
case LLWindowCallbacks::DNDA_STOP_TRACKING:
// The cleanup case below will make sure things are unhilighted if necessary.
break;