Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
Nimetu 9 years ago
commit edd16d9a82

@ -1258,7 +1258,7 @@ namespace NLGUI
getWindowForActiveMasterGroup(newCtrl->getContextHelpWindowName()); getWindowForActiveMasterGroup(newCtrl->getContextHelpWindowName());
uint32 _ScreenH, _ScreenW; uint32 _ScreenH, _ScreenW;
CViewRenderer::getInstance()->getScreenSize( _ScreenH, _ScreenW ); CViewRenderer::getInstance()->getScreenSize( _ScreenW, _ScreenH );
if(ttPosRef==Hotspot_TTAuto || ttParentRef==Hotspot_TTAuto) if(ttPosRef==Hotspot_TTAuto || ttParentRef==Hotspot_TTAuto)
{ {

Loading…
Cancel
Save