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

Add bordercolor attribute to table tag

Browse source 
--HG--
branch : html-table-rendering
This commit is contained in:
Nimetu 2014-10-13 01:10:46 +03:00
parent 2de4315027
commit 283cbe8092
5 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/include/nel/gui/group_table.h
View file

@ -142,6 +142,7 @@ namespace NLGUI
// Table borders // Table borders
sint32 Border; sint32 Border;
NLMISC::CRGBA BorderColor;
sint32 CellPadding; sint32 CellPadding;
sint32 CellSpacing; sint32 CellSpacing;

1
code/nel/include/nel/gui/libwww.h
View file

@ -79,6 +79,7 @@ namespace NLGUI
HTML_ATTR(TABLE,ALIGN) = 0, HTML_ATTR(TABLE,ALIGN) = 0,
HTML_ATTR(TABLE,BGCOLOR), HTML_ATTR(TABLE,BGCOLOR),
HTML_ATTR(TABLE,BORDER), HTML_ATTR(TABLE,BORDER),
HTML_ATTR(TABLE,BORDERCOLOR),
HTML_ATTR(TABLE,CELLPADDING), HTML_ATTR(TABLE,CELLPADDING),
HTML_ATTR(TABLE,CELLSPACING), HTML_ATTR(TABLE,CELLSPACING),
HTML_ATTR(TABLE,CLASS), HTML_ATTR(TABLE,CLASS),

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

@ -1453,6 +1453,8 @@ namespace NLGUI
getPercentage (table->ForceWidthMin, table->TableRatio, value[MY_HTML_TABLE_WIDTH]); getPercentage (table->ForceWidthMin, table->TableRatio, value[MY_HTML_TABLE_WIDTH]);
if (present[MY_HTML_TABLE_BORDER] && value[MY_HTML_TABLE_BORDER]) if (present[MY_HTML_TABLE_BORDER] && value[MY_HTML_TABLE_BORDER])
fromString(value[MY_HTML_TABLE_BORDER], table->Border); fromString(value[MY_HTML_TABLE_BORDER], table->Border);
if (present[MY_HTML_TABLE_BORDERCOLOR] && value[MY_HTML_TABLE_BORDERCOLOR])
table->BorderColor = getColor (value[MY_HTML_TABLE_BORDERCOLOR]);
if (present[MY_HTML_TABLE_CELLSPACING] && value[MY_HTML_TABLE_CELLSPACING]) if (present[MY_HTML_TABLE_CELLSPACING] && value[MY_HTML_TABLE_CELLSPACING])
fromString(value[MY_HTML_TABLE_CELLSPACING], table->CellSpacing); fromString(value[MY_HTML_TABLE_CELLSPACING], table->CellSpacing);
if (present[MY_HTML_TABLE_CELLPADDING] && value[MY_HTML_TABLE_CELLPADDING]) if (present[MY_HTML_TABLE_CELLPADDING] && value[MY_HTML_TABLE_CELLPADDING])

21
code/nel/src/gui/group_table.cpp
View file

@ -559,6 +559,7 @@ namespace NLGUI
TableRatio = 0.f; TableRatio = 0.f;
ForceWidthMin = 0; ForceWidthMin = 0;
Border=0; Border=0;
BorderColor = CRGBA(127, 127, 127, 255);
CellPadding=0; CellPadding=0;
CellSpacing=0; CellSpacing=0;
ContinuousUpdate = false; ContinuousUpdate = false;
@ -1243,6 +1244,11 @@ namespace NLGUI
return toString( Border ); return toString( Border );
} }
else else
if( name == "bordercolor" )
{
return toString( BorderColor );
}
else
if( name == "cellpadding" ) if( name == "cellpadding" )
{ {
return toString( CellPadding ); return toString( CellPadding );
@ -1279,6 +1285,14 @@ namespace NLGUI
return; return;
} }
else else
if( name == "bordercolor" )
{
CRGBA c;
if( fromString( value, c ) )
BorderColor = c;
return;
}
else
if( name == "cellpadding" ) if( name == "cellpadding" )
{ {
sint32 i; sint32 i;
@ -1321,6 +1335,7 @@ namespace NLGUI
xmlSetProp( node, BAD_CAST "type", BAD_CAST "table" ); xmlSetProp( node, BAD_CAST "type", BAD_CAST "table" );
xmlSetProp( node, BAD_CAST "border", BAD_CAST toString( Border ).c_str() ); xmlSetProp( node, BAD_CAST "border", BAD_CAST toString( Border ).c_str() );
xmlSetProp( node, BAD_CAST "bordercolor", BAD_CAST toString( BorderColor ).c_str() );
xmlSetProp( node, BAD_CAST "cellpadding", BAD_CAST toString( CellPadding ).c_str() ); xmlSetProp( node, BAD_CAST "cellpadding", BAD_CAST toString( CellPadding ).c_str() );
xmlSetProp( node, BAD_CAST "cellspacing", BAD_CAST toString( CellSpacing ).c_str() ); xmlSetProp( node, BAD_CAST "cellspacing", BAD_CAST toString( CellSpacing ).c_str() );
xmlSetProp( node, BAD_CAST "bgcolor", BAD_CAST toString( BgColor ).c_str() ); xmlSetProp( node, BAD_CAST "bgcolor", BAD_CAST toString( BgColor ).c_str() );
@ -1345,6 +1360,12 @@ namespace NLGUI
fromString((const char*)ptr, Border); fromString((const char*)ptr, Border);
} }
// //
ptr = (char*) xmlGetProp( cur, (xmlChar*)"bordercolor" );
if (ptr)
{
BorderColor = convertColor((const char*)ptr);
}
//
ptr = (char*) xmlGetProp( cur, (xmlChar*)"cellpadding" ); ptr = (char*) xmlGetProp( cur, (xmlChar*)"cellpadding" );
if (ptr) if (ptr)
{ {

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

@ -86,6 +86,7 @@ namespace NLGUI
HTML_ATTR(TABLE,ALIGN), HTML_ATTR(TABLE,ALIGN),
HTML_ATTR(TABLE,BGCOLOR), HTML_ATTR(TABLE,BGCOLOR),
HTML_ATTR(TABLE,BORDER), HTML_ATTR(TABLE,BORDER),
HTML_ATTR(TABLE,BORDERCOLOR),
HTML_ATTR(TABLE,CELLPADDING), HTML_ATTR(TABLE,CELLPADDING),
HTML_ATTR(TABLE,CELLSPACING), HTML_ATTR(TABLE,CELLSPACING),
HTML_ATTR(TABLE,CLASS), HTML_ATTR(TABLE,CLASS),