Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15461 from ricardoquesada/issue_15423 

fix: fix crash in win for rich text
This commit is contained in:
minggo 2016-04-20 13:41:07 +08:00
parent 08b000bacf 4bb35f2219
commit 0a609e9176
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/ui/UIRichText.cpp
View File

@ -25,6 +25,7 @@
#include "ui/UIRichText.h"
#include <vector>
#include <locale>
#include "tinyxml2/tinyxml2.h"
#include "platform/CCFileUtils.h"
@ -705,7 +706,7 @@ static int getPrevWord(const std::string& text, int idx)
// start from idx-1
for (int i=idx-1; i>=0; --i)
{
if (!std::isalnum(text[i]))
if (!std::isalnum(text[i], std::locale()))
return i;
}
return -1;
@ -715,7 +716,7 @@ static bool isWrappable(const std::string& text)
{
for (int i=0; i<text.length(); ++i)
{
if (!std::isalnum(text[i]))
if (!std::isalnum(text[i], std::locale()))
return true;
}
return false;
@ -848,7 +849,7 @@ void RichText::handleTextRenderer(const std::string& text, const std::string& fo
// if (0 == leftLength) leftLength = 1;
std::string leftWords = Helper::getSubStringOfUTF8String(text, 0, leftLength);
int rightStart = leftLength;
if (std::isspace(text[rightStart]))
if (std::isspace(text[rightStart], std::locale()))
rightStart++;
std::string cutWords = Helper::getSubStringOfUTF8String(text, rightStart, text.length() - leftLength);
if (leftLength > 0)