Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/gui/ctrl_button.cpp

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

code/nel/src/gui/view_bitmap.cpp

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