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

Made LLViewerMediaFocus::handleScrollWheel() grab the current keyboard modifiers.

meow-7.2.2
Monroe Linden 2009-10-29 17:14:03 -07:00
parent 3a4f906037
commit 96b1f821c0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewermediafocus.cpp
View File

@ -48,6 +48,8 @@
#include "llviewerparcelmgr.h"
#include "llweb.h"
#include "llmediaentry.h"
#include "llkeyboard.h"
//
// LLViewerMediaFocus
//
@ -298,8 +300,9 @@ BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks)
// the scrollEvent() API's x and y are not the same as handleScrollWheel's x and y.
// The latter is the position of the mouse at the time of the event
// The former is the 'scroll amount' in x and y, respectively.
// All we have for 'scroll amount' here is 'clicks', and no mask.
media_impl->getMediaPlugin()->scrollEvent(0, clicks, /*mask*/0);
// All we have for 'scroll amount' here is 'clicks'.
// We're also not passed the keyboard modifier mask, but we can get that from gKeyboard.
media_impl->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE));
retval = TRUE;
}
return retval;