Merge revisions r5503 through r5514 from trunk to ogl-es

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5515 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2017-08-07 17:30:46 +00:00
parent 237111814f
commit 53a1d9f724
1 changed files with 2 additions and 0 deletions

View File

@ -1444,8 +1444,10 @@ void CIrrDeviceLinux::restoreWindow()
core::position2di CIrrDeviceLinux::getWindowPosition()
{
int wx = 0, wy = 0;
#ifdef _IRR_COMPILE_WITH_X11_
Window child;
XTranslateCoordinates(XDisplay, XWindow, DefaultRootWindow(XDisplay), 0, 0, &wx, &wy, &child);
#endif
return core::position2di(wx, wy);
}