diff options
| author | Geenz <geenz@geenzo.com> | 2013-01-18 13:16:12 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-01-18 13:16:12 -0500 |
| commit | 1bbbaf8dd69a08a3e7c570e6ad14f57a4f6e91cb (patch) | |
| tree | 5aa61783bb0314aff74d9ef3fe6120ee0f13b6d2 /indra/llwindow | |
| parent | 9557a26c623f01f662b8d3dd5b933285b7bfaeb1 (diff) | |
Partial workaround for mouse delta issue.
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 93b9f4c484..95ad87d58f 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -285,8 +285,9 @@ void callMouseMoved(float *pos, MASK mask) gWindowImplementation->getMouseDeltas(deltas); outCoords.mX += deltas[0]; outCoords.mY += deltas[1]; + LL_INFOS("Mouse Movement") << "Moved coords: " << outCoords.mX << ", " << outCoords.mY << LL_ENDL; gWindowImplementation->getCallbacks()->handleMouseMove(gWindowImplementation, outCoords, gKeyboard->currentMask(TRUE)); - + gWindowImplementation->getCallbacks()->handleScrollWheel(gWindowImplementation, 0); } void callScrollMoved(float delta) @@ -343,7 +344,7 @@ void LLWindowMacOSX::updateMouseDeltas(float* deltas) if (mCursorDecoupled) { mCursorLastEventDeltaX = llround(deltas[0]); - mCursorLastEventDeltaY = llround(deltas[1]); + mCursorLastEventDeltaY = llround(-deltas[1]); if (mCursorIgnoreNextDelta) { @@ -351,7 +352,6 @@ void LLWindowMacOSX::updateMouseDeltas(float* deltas) mCursorLastEventDeltaY = 0; mCursorIgnoreNextDelta = FALSE; } - LL_INFOS("Delta Update") << "Last event delta: " << mCursorLastEventDeltaX << ", " << mCursorLastEventDeltaY << LL_ENDL; } else { mCursorLastEventDeltaX = 0; mCursorLastEventDeltaY = 0; @@ -738,7 +738,7 @@ void LLWindowMacOSX::swapBuffers() F32 LLWindowMacOSX::getGamma() { - F32 result = 1.8; // Default to something sane + F32 result = 2.2; // Default to something sane CGGammaValue redMin; CGGammaValue redMax; |