|
|
@ -1455,6 +1455,7 @@ namespace NLGUI
|
|
|
|
_LastRefreshTime = 0.0;
|
|
|
|
_LastRefreshTime = 0.0;
|
|
|
|
_RenderNextTime = false;
|
|
|
|
_RenderNextTime = false;
|
|
|
|
_WaitingForStylesheet = false;
|
|
|
|
_WaitingForStylesheet = false;
|
|
|
|
|
|
|
|
_AutoIdSeq = 0;
|
|
|
|
|
|
|
|
|
|
|
|
// Register
|
|
|
|
// Register
|
|
|
|
CWidgetManager::getInstance()->registerClockMsgTarget(this);
|
|
|
|
CWidgetManager::getInstance()->registerClockMsgTarget(this);
|
|
|
@ -2543,6 +2544,7 @@ namespace NLGUI
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Add a new paragraph
|
|
|
|
// Add a new paragraph
|
|
|
|
CGroupParagraph *newParagraph = new CGroupParagraph(CViewBase::TCtorParam());
|
|
|
|
CGroupParagraph *newParagraph = new CGroupParagraph(CViewBase::TCtorParam());
|
|
|
|
|
|
|
|
newParagraph->setId(getCurrentGroup()->getId() + ":PARAGRAPH" + toString(getNextAutoIdSeq()));
|
|
|
|
newParagraph->setResizeFromChildH(true);
|
|
|
|
newParagraph->setResizeFromChildH(true);
|
|
|
|
|
|
|
|
|
|
|
|
newParagraph->setMarginLeft(getIndent());
|
|
|
|
newParagraph->setMarginLeft(getIndent());
|
|
|
@ -3285,6 +3287,7 @@ namespace NLGUI
|
|
|
|
_ReadingHeadTag = false;
|
|
|
|
_ReadingHeadTag = false;
|
|
|
|
_IgnoreHeadTag = false;
|
|
|
|
_IgnoreHeadTag = false;
|
|
|
|
_IgnoreBaseUrlTag = false;
|
|
|
|
_IgnoreBaseUrlTag = false;
|
|
|
|
|
|
|
|
_AutoIdSeq = 0;
|
|
|
|
|
|
|
|
|
|
|
|
paragraphChange ();
|
|
|
|
paragraphChange ();
|
|
|
|
|
|
|
|
|
|
|
@ -4361,6 +4364,7 @@ namespace NLGUI
|
|
|
|
if (!_GroupListAdaptor)
|
|
|
|
if (!_GroupListAdaptor)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_GroupListAdaptor = new CGroupListAdaptor(CViewBase::TCtorParam()); // deleted by the list
|
|
|
|
_GroupListAdaptor = new CGroupListAdaptor(CViewBase::TCtorParam()); // deleted by the list
|
|
|
|
|
|
|
|
_GroupListAdaptor->setId(getList()->getId() + ":GLA");
|
|
|
|
_GroupListAdaptor->setResizeFromChildH(true);
|
|
|
|
_GroupListAdaptor->setResizeFromChildH(true);
|
|
|
|
getList()->addChild (_GroupListAdaptor, true);
|
|
|
|
getList()->addChild (_GroupListAdaptor, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -5677,6 +5681,8 @@ namespace NLGUI
|
|
|
|
{
|
|
|
|
{
|
|
|
|
string style = elm.getAttribute("style");
|
|
|
|
string style = elm.getAttribute("style");
|
|
|
|
string id = elm.getAttribute("id");
|
|
|
|
string id = elm.getAttribute("id");
|
|
|
|
|
|
|
|
if (id.empty())
|
|
|
|
|
|
|
|
id = "DIV" + toString(getNextAutoIdSeq());
|
|
|
|
|
|
|
|
|
|
|
|
typedef pair<string, string> TTmplParam;
|
|
|
|
typedef pair<string, string> TTmplParam;
|
|
|
|
vector<TTmplParam> tmplParams;
|
|
|
|
vector<TTmplParam> tmplParams;
|
|
|
@ -5709,10 +5715,10 @@ namespace NLGUI
|
|
|
|
parentId = _Paragraph->getId();
|
|
|
|
parentId = _Paragraph->getId();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CInterfaceGroup *inst = CWidgetManager::getInstance()->getParser()->createGroupInstance(templateName, this->_Id+":"+id, tmplParams);
|
|
|
|
CInterfaceGroup *inst = CWidgetManager::getInstance()->getParser()->createGroupInstance(templateName, parentId, tmplParams);
|
|
|
|
if (inst)
|
|
|
|
if (inst)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
inst->setId(this->_Id+":"+id);
|
|
|
|
inst->setId(parentId+":"+id);
|
|
|
|
inst->updateCoords();
|
|
|
|
inst->updateCoords();
|
|
|
|
if (haveParentDiv)
|
|
|
|
if (haveParentDiv)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -6641,6 +6647,10 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
CGroupTable *table = new CGroupTable(TCtorParam());
|
|
|
|
CGroupTable *table = new CGroupTable(TCtorParam());
|
|
|
|
table->BgColor = _CellParams.back().BgColor;
|
|
|
|
table->BgColor = _CellParams.back().BgColor;
|
|
|
|
|
|
|
|
if (elm.hasNonEmptyAttribute("id"))
|
|
|
|
|
|
|
|
table->setId(getCurrentGroup()->getId() + ":" + elm.getAttribute("id"));
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
table->setId(getCurrentGroup()->getId() + ":TABLE" + toString(getNextAutoIdSeq()));
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: border-spacing: 2em;
|
|
|
|
// TODO: border-spacing: 2em;
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -6801,6 +6811,10 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
_Cells.back() = new CGroupCell(CViewBase::TCtorParam());
|
|
|
|
_Cells.back() = new CGroupCell(CViewBase::TCtorParam());
|
|
|
|
|
|
|
|
if (elm.hasNonEmptyAttribute("id"))
|
|
|
|
|
|
|
|
_Cells.back()->setId(getCurrentGroup()->getId() + ":TD" + elm.getAttribute("id"));
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
_Cells.back()->setId(getCurrentGroup()->getId() + ":TD" + toString(getNextAutoIdSeq()));
|
|
|
|
|
|
|
|
|
|
|
|
if (_Style.checkStyle("background-repeat", "repeat"))
|
|
|
|
if (_Style.checkStyle("background-repeat", "repeat"))
|
|
|
|
_Cells.back()->setTextureTile(true);
|
|
|
|
_Cells.back()->setTextureTile(true);
|
|
|
|