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

Merge with develop

Browse source
This commit is contained in:
Nimetu 2016-12-21 23:16:48 +02:00
parent 63b7d0f8fd
commit d994a29d79
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 CCtrlButton::getMaxUsedW() const
{ {
sint32 txw, txh; return _W;
CViewRenderer &rVR = *CViewRenderer::getInstance();
rVR.getTextureSizeFromId (_TextureIdNormal, txw, txh);
return txw;
} }
// *************************************************************************** // ***************************************************************************

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

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