Use getHardText where more appropriate

core4
kaetemi 3 years ago
parent 6bc45e5bbd
commit 0ee1536340
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -137,7 +137,7 @@ namespace NLGUI
if( name == "hardtext" )
{
if( _ViewText != NULL )
return _ViewText->getText();
return _ViewText->getHardText();
else
return std::string( "" );
}
@ -488,7 +488,7 @@ namespace NLGUI
xmlNewProp( node, BAD_CAST "wmargin", BAD_CAST toString( _WMargin ).c_str() );
xmlNewProp( node, BAD_CAST "wmin", BAD_CAST toString( _WMin ).c_str() );
xmlNewProp( node, BAD_CAST "hmin", BAD_CAST toString( _HMin ).c_str() );
xmlNewProp( node, BAD_CAST "hardtext", BAD_CAST _ViewText->getText().c_str() );
xmlNewProp( node, BAD_CAST "hardtext", BAD_CAST _ViewText->getHardText().c_str() );
xmlNewProp( node, BAD_CAST "text_y", BAD_CAST toString( _TextY ).c_str() );
xmlNewProp( node, BAD_CAST "text_x", BAD_CAST toString( _TextX ).c_str() );
xmlNewProp( node, BAD_CAST "text_underlined", BAD_CAST toString( _ViewText->getUnderlined() ).c_str() );

@ -1211,7 +1211,7 @@ namespace NLGUI
// Copy all aspects to the view
vtDst->setLocalized (vtSrc->isLocalized());
vtDst->setText (vtSrc->getText());
vtDst->setText (vtSrc->getHardText());
vtDst->setFontSize (vtSrc->getFontSize());
vtDst->setColor (vtSrc->getColor());
vtDst->setModulateGlobalColor(vtSrc->getModulateGlobalColor());

Loading…
Cancel
Save