TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-19 19:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #884 from GarageGames/development-3.6

Browse source 
Version 3.6.2
This commit is contained in:
Daniel Buckmaster 2014-11-05 20:28:01 +11:00
commit 3082bb3adc
28 changed files with 132 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/gui/core/guiCanvas.cpp
View file

@ -2225,7 +2225,10 @@ DefineEngineMethod( GuiCanvas, reset, void, (),,
}
DefineEngineMethod( GuiCanvas, getCursorPos, Point2I, (),,
"@brief Get the current position of the cursor.\n\n"
"@brief Get the current position of the cursor in screen-space. Note that this position"
" might be outside the Torque window. If you want to get the position within the Canvas,"
" call screenToClient on the result.\n\n"
"@see Canvas::screenToClient()\n\n"
"@param param Description\n\n"
"@tsexample\n"
"%cursorPos = Canvas.getCursorPos();\n"

1
Engine/source/gui/core/guiControl.cpp
View file

@ -1427,6 +1427,7 @@ bool GuiControl::cursorInControl()
if (! root) return false;
Point2I pt = root->getCursorPos();
pt = root->getPlatformWindow() ? root->getPlatformWindow()->screenToClient(pt) : pt;
Point2I extent = getExtent();
Point2I offset = localToGlobalCoord(Point2I(0, 0));
if (pt.x >= offset.x && pt.y >= offset.y &&