diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-14 15:02:56 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-14 15:02:56 +0300 |
| commit | be7713cab26032d6f5f6a739122d955df0955092 (patch) | |
| tree | 87b6ea50f3e47b3033fd46be79d4e451133995ef /indra/llui | |
| parent | bc5d79e06e1664abd33fbe41e5ec3655f33b7e32 (diff) | |
| parent | e9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 5d4ec3a54d..656b69d3ed 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -218,14 +218,14 @@ void LLUI::dirtyRect(LLRect rect) void LLUI::setMousePositionScreen(S32 x, S32 y) { - S32 screen_x, screen_y; #if defined(LL_DARWIN) - screen_x = ll_round((F32)x); - screen_y = ll_round((F32)y); + S32 screen_x = ll_round(((F32)x * getScaleFactor().mV[VX]) / LLView::getWindow()->getSystemUISize()); + S32 screen_y = ll_round(((F32)y * getScaleFactor().mV[VY]) / LLView::getWindow()->getSystemUISize()); #else - screen_x = ll_round((F32)x * getScaleFactor().mV[VX]); - screen_y = ll_round((F32)y * getScaleFactor().mV[VY]); + S32 screen_x = ll_round((F32)x * getScaleFactor().mV[VX]); + S32 screen_y = ll_round((F32)y * getScaleFactor().mV[VY]); #endif + LLView::getWindow()->setCursorPosition(LLCoordGL(screen_x, screen_y).convert()); } |