Merge with develop

--HG--
branch : experimental-ui-scaling

code/nel/src/gui/group_container.cpp

@@ -2473,7 +2473,7 @@ namespace NLGUI
 
 			if (_LayerSetup == 0)
 			{
-				_List->forceSizeW(_W - pLayer->W_M_Open);
+				_List->forceSizeW(_W - (pLayer->W_M_Open + pLayer->W_R) );
 			}
 			else
 			{
@@ -2748,6 +2748,9 @@ namespace NLGUI
 			if (_Content != NULL)
 				h += _Content->getHReal();
 
+			if (_List != NULL)
+				h += _List->getHReal();
+
 			h -= _ContentYOffset;
 		}
 		else

code/nel/src/gui/view_text.cpp

@@ -925,7 +925,8 @@ namespace NLGUI
 			return maxw;
 		else
 		{
-			return std::min(_Parent->getInnerWidth(), (sint)_LineMaxW);
+			sint offset = (sint)_XReal - (sint)_Parent->getXReal();
+			return std::min(_Parent->getInnerWidth() - offset, (sint)_LineMaxW);
 		}
 	}