aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 01:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2016-12-21 23:16:48 +02:00
commit b95fed61f2
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/src/gui/ctrl_button.cpp
View file

@ -446,10 +446,7 @@ namespace NLGUI
// ***************************************************************************
sint32 CCtrlButton::getMaxUsedW() const
{
sint32 txw, txh;
CViewRenderer &rVR = *CViewRenderer::getInstance();
rVR.getTextureSizeFromId (_TextureIdNormal, txw, txh);
return txw;
return _W;
}
// ***************************************************************************

5
code/nel/src/gui/view_bitmap.cpp
View file

@ -511,10 +511,7 @@ namespace NLGUI
// ***************************************************************************
sint32 CViewBitmap::getMaxUsedW() const
{
sint32 txw, txh;
CViewRenderer &rVR = *CViewRenderer::getInstance();
rVR.getTextureSizeFromId (_TextureId, txw, txh);
return txw;
return _W;
}
// ***************************************************************************