From 4f7c082a4a6dd4746782833833727ed9910d660a Mon Sep 17 00:00:00 2001 From: Nimetu Date: Thu, 27 Sep 2018 08:30:33 +0300 Subject: [PATCH 1/2] Fixed: Wrong text width --HG-- branch : develop --- code/nel/src/gui/view_text.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/nel/src/gui/view_text.cpp b/code/nel/src/gui/view_text.cpp index 805143f32..cfc2c3b92 100644 --- a/code/nel/src/gui/view_text.cpp +++ b/code/nel/src/gui/view_text.cpp @@ -916,7 +916,8 @@ namespace NLGUI return _LineMaxW; else { - return std::min(_Parent->getInnerWidth(), (sint)_LineMaxW); + sint offset = (sint)_XReal - (sint)_Parent->getXReal(); + return std::min(_Parent->getInnerWidth() - offset, (sint)_LineMaxW); } } From c2ffa714d2efdfe686a92b755e1851df0a8e86f5 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Thu, 27 Sep 2018 12:36:09 +0300 Subject: [PATCH 2/2] Fixed: Wrong width for container list element --HG-- branch : develop --- code/nel/src/gui/group_container.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/nel/src/gui/group_container.cpp b/code/nel/src/gui/group_container.cpp index 1922db221..26a23fd9f 100644 --- a/code/nel/src/gui/group_container.cpp +++ b/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