Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Add inset_t parameter to layer options, allows putting header graphics in top texture

Browse source
This commit is contained in:
kaetemi 2014-10-04 01:43:27 +02:00
parent 96ea88ac07
commit cbe5cb66f7
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/include/nel/gui/interface_options.h
View file

@ -159,7 +159,8 @@ namespace NLGUI
sint32 TxId_B_HighLight; sint32 TxId_B_HighLight;
sint32 TxId_BR_HighLight; sint32 TxId_BR_HighLight;
sint32 HeaderH; sint32 HeaderH;
sint32 InsetT; // Offset height of top texture
}; };
// *************************************************************************** // ***************************************************************************

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

@ -2373,7 +2373,7 @@ namespace NLGUI
{ {
setMaxH(_PopupMaxH); setMaxH(_PopupMaxH);
// _W is given by scripter-man // _W is given by scripter-man
newH = pLayer->H_T; newH = (pLayer->H_T - pLayer->InsetT);
} }
else else
{ {
@ -2382,7 +2382,7 @@ namespace NLGUI
_W = _Parent->getW(); _W = _Parent->getW();
} }
setMaxH (16384); // No scrollbar for container of layer > 0 setMaxH (16384); // No scrollbar for container of layer > 0
newH = pLayer->H_T; newH = (pLayer->H_T - pLayer->InsetT);
} }
if (_Opened) if (_Opened)
@ -2396,11 +2396,11 @@ namespace NLGUI
_HeaderOpened->setY (- newH); _HeaderOpened->setY (- newH);
_HeaderOpened->setW (_W-(pLayer->W_L+pLayer->W_R)); _HeaderOpened->setW (_W-(pLayer->W_L+pLayer->W_R));
_HeaderOpened->updateCoords(); _HeaderOpened->updateCoords();
newH += max (_HeaderOpened->getHReal(), pLayer->getValSInt32 ("header_h")); newH += max (_HeaderOpened->getHReal(), pLayer->HeaderH);
} }
else else
{ {
newH += pLayer->getValSInt32 ("header_h"); newH += pLayer->HeaderH;
} }
newH -= (sint32) _ContentYOffset; newH -= (sint32) _ContentYOffset;
@ -2448,12 +2448,12 @@ namespace NLGUI
if (_LayerSetup == 0) if (_LayerSetup == 0)
{ {
// zeH is the height to substract to total height of the container to obtain height of the list // zeH is the height to substract to total height of the container to obtain height of the list
sint32 zeH = pLayer->H_T + pLayer->H_B_Open + pLayer->H_EM_Open; sint32 zeH = (pLayer->H_T - pLayer->InsetT) + pLayer->H_B_Open + pLayer->H_EM_Open;
if (_HeaderOpened != NULL) if (_HeaderOpened != NULL)
zeH += max (_HeaderOpened->getHReal(), pLayer->getValSInt32 ("header_h")); zeH += max (_HeaderOpened->getHReal(), pLayer->HeaderH);
else else
zeH += pLayer->getValSInt32 ("header_h"); zeH += pLayer->HeaderH;
if (_Content != NULL) if (_Content != NULL)
zeH += _Content->getHReal(); zeH += _Content->getHReal();
@ -2513,11 +2513,11 @@ namespace NLGUI
_HeaderClosed->setY (-newH); _HeaderClosed->setY (-newH);
_HeaderClosed->setW (_W-(pLayer->W_L+pLayer->W_R)); _HeaderClosed->setW (_W-(pLayer->W_L+pLayer->W_R));
_HeaderClosed->updateCoords(); _HeaderClosed->updateCoords();
newH += max (_HeaderClosed->getHReal(), pLayer->getValSInt32 ("header_h")); newH += max (_HeaderClosed->getHReal(), pLayer->HeaderH);
} }
else else
{ {
newH += pLayer->getValSInt32 ("header_h"); newH += pLayer->HeaderH;
} }
newH += pLayer->H_B; newH += pLayer->H_B;
@ -2731,7 +2731,7 @@ namespace NLGUI
// h is the size of what is on top of the child list // h is the size of what is on top of the child list
sint32 x, y, w, h; sint32 x, y, w, h;
h = pLayer->H_T + pLayer->H_B_Open; h = (pLayer->H_T - pLayer->InsetT) + pLayer->H_B_Open;
if (_Opened) if (_Opened)
{ {

1
code/nel/src/gui/interface_options.cpp
View file

@ -281,6 +281,7 @@ namespace NLGUI
// //
HeaderH = getValSInt32("header_h"); HeaderH = getValSInt32("header_h");
InsetT = getValSInt32("inset_t");
return true; return true;
} }