Merge with develop

This commit is contained in:
Nimetu 2015-11-08 05:16:07 +02:00
parent 151930e8cc
commit 2c6afe9bcc

View file

@ -42,6 +42,8 @@ namespace NLGUI
// *************************************************************************** // ***************************************************************************
void CViewText::setupDefault () void CViewText::setupDefault ()
{ {
_ParentElm = NULL;
_CaseMode = CaseNormal; _CaseMode = CaseNormal;
_Underlined = false; _Underlined = false;
_StrikeThrough = false; _StrikeThrough = false;
@ -2650,6 +2652,10 @@ namespace NLGUI
void CViewText::onInvalidateContent() void CViewText::onInvalidateContent()
{ {
_InvalidTextContext= true; _InvalidTextContext= true;
if (_ParentElm)
_ParentElm->invalidateCoords();
invalidateCoords(); invalidateCoords();
} }