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

Added: html TH element

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2015-12-18 14:29:40 +02:00
parent 2eb56b6460
commit fe476d4872
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/nel/src/gui/group_html.cpp
View file

@ -1783,11 +1783,21 @@ namespace NLGUI
_TR.push_back(false); _TR.push_back(false);
} }
break; break;
case HTML_TH:
// TH is similar to TD, just different font style
case HTML_TD: case HTML_TD:
{ {
// Get cells parameters // Get cells parameters
getCellsParameters (MY_HTML_TD, true); getCellsParameters (MY_HTML_TD, true);
if (element_number == HTML_TH)
{
_FontWeight.push_back(FONT_WEIGHT_BOLD);
// center if not specified otherwise. TD/TH present/value arrays have same indices
if (!(present[MY_HTML_TD_ALIGN] && value[MY_HTML_TD_ALIGN]))
_CellParams.back().Align = CGroupCell::Center;
}
CGroupTable *table = getTable(); CGroupTable *table = getTable();
if (table) if (table)
{ {
@ -2124,6 +2134,9 @@ namespace NLGUI
endParagraph(); endParagraph();
// Add a cell // Add a cell
break; break;
case HTML_TH:
popIfNotEmpty (_FontWeight);
// no break;
case HTML_TD: case HTML_TD:
popIfNotEmpty (_CellParams); popIfNotEmpty (_CellParams);
if (!_Cells.empty()) if (!_Cells.empty())

2
code/nel/src/gui/libwww.cpp
View file

@ -481,6 +481,8 @@ namespace NLGUI
HTML_DTD->tags[HTML_TR].number_of_attributes = sizeof(tr_attr) / sizeof(HTAttr) - 1; HTML_DTD->tags[HTML_TR].number_of_attributes = sizeof(tr_attr) / sizeof(HTAttr) - 1;
HTML_DTD->tags[HTML_TD].attributes = td_attr; HTML_DTD->tags[HTML_TD].attributes = td_attr;
HTML_DTD->tags[HTML_TD].number_of_attributes = sizeof(td_attr) / sizeof(HTAttr) - 1; HTML_DTD->tags[HTML_TD].number_of_attributes = sizeof(td_attr) / sizeof(HTAttr) - 1;
HTML_DTD->tags[HTML_TH].attributes = td_attr;
HTML_DTD->tags[HTML_TH].number_of_attributes = sizeof(td_attr) / sizeof(HTAttr) - 1;
HTML_DTD->tags[HTML_IMG].attributes = img_attr; HTML_DTD->tags[HTML_IMG].attributes = img_attr;
HTML_DTD->tags[HTML_IMG].number_of_attributes = sizeof(img_attr) / sizeof(HTAttr) - 1; HTML_DTD->tags[HTML_IMG].number_of_attributes = sizeof(img_attr) / sizeof(HTAttr) - 1;
HTML_DTD->tags[HTML_INPUT].attributes = input_attr; HTML_DTD->tags[HTML_INPUT].attributes = input_attr;