From 0ee1536340fee47d60b823b226f5e681a96cdcfc Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 4 Jan 2022 00:49:34 +0800 Subject: [PATCH] Use getHardText where more appropriate --- nel/src/gui/ctrl_text_button.cpp | 4 ++-- nel/src/gui/widget_manager.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nel/src/gui/ctrl_text_button.cpp b/nel/src/gui/ctrl_text_button.cpp index a986a5cb3..7ec58e666 100644 --- a/nel/src/gui/ctrl_text_button.cpp +++ b/nel/src/gui/ctrl_text_button.cpp @@ -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() ); diff --git a/nel/src/gui/widget_manager.cpp b/nel/src/gui/widget_manager.cpp index 9ffe8d328..d3fbf39f7 100644 --- a/nel/src/gui/widget_manager.cpp +++ b/nel/src/gui/widget_manager.cpp @@ -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());