Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More correct wrap_rows implementation

master
figec 2015-06-19 19:04:11 +03:00 committed by est31
parent dd91b3d6fb
commit d7190df07e
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/string.h
View File

@ -426,18 +426,12 @@ inline std::string wrap_rows(const std::string &from,
{ {
std::string to; std::string to;
bool need_to_wrap = false;
size_t character_idx = 0; size_t character_idx = 0;
for (size_t i = 0; i < from.size(); i++) { for (size_t i = 0; i < from.size(); i++) {
if (character_idx > 0 && character_idx % row_len == 0)
need_to_wrap = true;
if (!IS_UTF8_MULTB_INNER(from[i])) { if (!IS_UTF8_MULTB_INNER(from[i])) {
// Wrap string if needed before next char started // Wrap string after last inner byte of char
if (need_to_wrap) { if (character_idx > 0 && character_idx % row_len == 0)
to += '\n'; to += '\n';
need_to_wrap = false;
}
character_idx++; character_idx++;
} }
to += from[i]; to += from[i];