Merge with develop
This commit is contained in:
parent
1a5ac4b839
commit
a26d4063f7
1 changed files with 1 additions and 1 deletions
|
@ -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…
Reference in a new issue