Merge remote-tracking branch 'origin/webig-fixes' into yubo

fix_opengl_on_mac
Ulukyn 5 years ago
commit a7d2175f93

@ -6793,9 +6793,11 @@ namespace NLGUI
_Cells.back() = new CGroupCell(CViewBase::TCtorParam()); _Cells.back() = new CGroupCell(CViewBase::TCtorParam());
if (elm.hasNonEmptyAttribute("id")) if (elm.hasNonEmptyAttribute("id"))
_Cells.back()->setId(getCurrentGroup()->getId() + ":TD" + elm.getAttribute("id")); _Cells.back()->setId(table->getId() + ":" + elm.getAttribute("id"));
else else
_Cells.back()->setId(getCurrentGroup()->getId() + ":TD" + toString(getNextAutoIdSeq())); _Cells.back()->setId(table->getId() + ":TD" + toString(getNextAutoIdSeq()));
// inner cell content
_Cells.back()->Group->setId(_Cells.back()->getId() + ":CELL");
if (_Style.checkStyle("background-repeat", "repeat")) if (_Style.checkStyle("background-repeat", "repeat"))
_Cells.back()->setTextureTile(true); _Cells.back()->setTextureTile(true);

Loading…
Cancel
Save