libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: fix calculating the pure text size in mactext

Browse Source
This commit is contained in:
ysj1173886760 2021-06-05 10:43:55 +08:00 committed by Eugene Sandulenko
parent bdf81ad565
commit 12232c992a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/macgui/macwindowmanager.cpp
View File

@ -448,6 +448,18 @@ void MacWindowManager::setTextInClipboard(const Common::U32String &str) {
g_system->setTextInClipboard(stripFormat(str));
}
// get the text size ignoring \n
int getPureTextSize(const Common::U32String &str) {
const Common::U32String::value_type *l = str.c_str();
int res = 0;
while (*l) {
if (*l != '\n')
res++;
l++;
}
return res;
}
Common::U32String MacWindowManager::getTextFromClipboard(const Common::U32String &format, int *size) {
Common::U32String global_str = g_system->getTextFromClipboard();
// str is what we need
@ -456,19 +468,19 @@ Common::U32String MacWindowManager::getTextFromClipboard(const Common::U32String
// if wm clipboard is empty, then we use the global clipboard, which won't contain the format
str = format + global_str;
if (size)
*size = str.size();
*size = getPureTextSize(global_str);
} else {
Common::U32String tmp = stripFormat(_clipboard);
if (tmp == global_str) {
// if the text is equal, then we use wm one which contains the format
str = _clipboard;
if (size)
*size = tmp.size();
*size = getPureTextSize(tmp);
} else {
// otherwise, we prefer the global one
str = format + global_str;
if (size)
*size = str.size();
*size = getPureTextSize(global_str);
}
}
return str;