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 : experimental-ui-scaling
This commit is contained in:
Nimetu 2018-09-27 12:37:59 +03:00
commit 31ad00a241
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

3
code/nel/src/gui/view_text.cpp
View file

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