|
|
|
@ -592,14 +592,11 @@ namespace NLGUI
|
|
|
|
|
{
|
|
|
|
|
// compute max height of widgets on the left of text
|
|
|
|
|
sint32 widgetMaxH = 0;
|
|
|
|
|
if (_Lines[k].ViewText->getActive())
|
|
|
|
|
{
|
|
|
|
|
if (_Lines[k].UserGroupRight) widgetMaxH = _Lines[k].UserGroupRight->getHReal();
|
|
|
|
|
if (_Lines[k].UserGroupLeft) widgetMaxH = std::max(widgetMaxH, _Lines[k].UserGroupLeft->getHReal());
|
|
|
|
|
if (_Lines[k].CheckBox) widgetMaxH = std::max(widgetMaxH, _Lines[k].CheckBox->getHReal());
|
|
|
|
|
if (_Lines[k].RightArrow) widgetMaxH = std::max(widgetMaxH, _Lines[k].RightArrow->getHReal());
|
|
|
|
|
widgetMaxH = std::max(widgetMaxH, _Lines[k].ViewText->getHReal());
|
|
|
|
|
}
|
|
|
|
|
_GroupList->setMaxH(widgetMaxH*_MaxVisibleLine+_GroupList->getSpace()*(_MaxVisibleLine-1));
|
|
|
|
|
if (_ScrollBar == NULL)
|
|
|
|
|
{
|
|
|
|
@ -642,17 +639,12 @@ namespace NLGUI
|
|
|
|
|
{
|
|
|
|
|
// compute max height of widgets on the left of text
|
|
|
|
|
sint32 widgetMaxH = 0;
|
|
|
|
|
sint32 textHReal = 0;
|
|
|
|
|
if (_Lines[k].ViewText->getActive())
|
|
|
|
|
{
|
|
|
|
|
if (_Lines[k].UserGroupRight) widgetMaxH = _Lines[k].UserGroupRight->getHReal();
|
|
|
|
|
if (_Lines[k].UserGroupLeft) widgetMaxH = std::max(widgetMaxH, _Lines[k].UserGroupLeft->getHReal());
|
|
|
|
|
if (_Lines[k].CheckBox) widgetMaxH = std::max(widgetMaxH, _Lines[k].CheckBox->getHReal());
|
|
|
|
|
if (_Lines[k].RightArrow) widgetMaxH = std::max(widgetMaxH, _Lines[k].RightArrow->getHReal());
|
|
|
|
|
|
|
|
|
|
textHReal = _Lines[k].ViewText->getHReal();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sint32 textHReal= _Lines[k].ViewText->getHReal();
|
|
|
|
|
_Lines[k].HReal= max(widgetMaxH, textHReal);
|
|
|
|
|
_Lines[k].TextDY= textDYPos;
|
|
|
|
|
if(widgetMaxH>textHReal)
|
|
|
|
@ -1307,9 +1299,9 @@ namespace NLGUI
|
|
|
|
|
uint lineIndex = _Lines.size()-1;
|
|
|
|
|
vparams.push_back(TTmplParams("id", toString("icon%d", lineIndex)));
|
|
|
|
|
vparams.push_back(TTmplParams("sizeref", ""));
|
|
|
|
|
vparams.push_back(TTmplParams("icon_texture", texture));
|
|
|
|
|
vparams.push_back(TTmplParams("icon_texture", texture.c_str()));
|
|
|
|
|
//vparams.push_back(TTmplParams("icon_color", options.ColorNormal.toString()));
|
|
|
|
|
string lineId = toString("%s:icon", pV->getId().c_str());
|
|
|
|
|
string lineId = toString("%s:icon%d", _GroupMenu->getId().c_str(), lineIndex);
|
|
|
|
|
|
|
|
|
|
CInterfaceGroup *pUGLeft = CWidgetManager::getInstance()->getParser()->createGroupInstance("menu_row_icon", lineId, vparams);
|
|
|
|
|
if (pUGLeft)
|
|
|
|
|