summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2018-10-19 19:12:08 +0300
committerruslantproductengine <ruslantproductengine@lindenlab.com>2018-10-19 19:12:08 +0300
commit6ce18422de822a195813e5daa890000e1556ac03 (patch)
tree8056dd832a80821f264556acca8d1d4a2e728c7f
parent2823b0639e6b020cee138563d34c74ad769b0bae (diff)
SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functions
-rw-r--r--indra/llwindow/llwindowmacosx.cpp10
-rw-r--r--indra/newview/llviewerwindow.cpp7
2 files changed, 8 insertions, 9 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 7f6b30bd37..b02b77ffbd 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1317,9 +1317,8 @@ BOOL LLWindowMacOSX::convertCoords(LLCoordScreen from, LLCoordWindow* to)
convertScreenToWindow(mWindow, mouse_point);
- float scale_factor = getDeviceScaleFactor();
- to->mX = mouse_point[0] * scale_factor;
- to->mY = mouse_point[1] * scale_factor;
+ to->mX = mouse_point[0];
+ to->mY = mouse_point[1];
return TRUE;
}
@@ -1337,9 +1336,8 @@ BOOL LLWindowMacOSX::convertCoords(LLCoordWindow from, LLCoordScreen *to)
convertWindowToScreen(mWindow, mouse_point);
- float scale_factor = getDeviceScaleFactor();
- to->mX = mouse_point[0] / scale_factor;
- to->mY = mouse_point[1] / scale_factor;
+ to->mX = mouse_point[0];
+ to->mY = mouse_point[1];
return TRUE;
}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 36fbd12e92..024d965c6d 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3016,12 +3016,13 @@ void LLViewerWindow::moveCursorToCenter()
S32 x = getWorldViewWidthScaled() / 2;
S32 y = getWorldViewHeightScaled() / 2;
+ F32 scale_factor = mWindow->getDeviceScaleFactor();
+ LLUI::setMousePositionScreen(x/scale_factor, y/scale_factor);
+
//on a forced move, all deltas get zeroed out to prevent jumping
mCurrentMousePoint.set(x,y);
mLastMousePoint.set(x,y);
- mCurrentMouseDelta.set(0,0);
-
- LLUI::setMousePositionScreen(x, y);
+ mCurrentMouseDelta.set(0,0);
}
}