Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

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

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

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

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

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