libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GUI: Fix browsing in presence of files with \1 in names

Browse Source 
Currently file containing \1 in its name causes erroring out
with "Wrong string format".

Hades Challenge Mac partiton has such files in the root. So if they are
copied then it's impossible to select folder with Hades Challenge. Many tools
skip (as they are hidden) or rename them while saving original name in
AppleDouble or MacBinary. dumper-companion also renames them but scummvm
transparently decodes punycode back.
This commit is contained in:
Vladimir Serbinenko 2022-11-06 02:06:59 +01:00 committed by Eugene Sandulenko
parent cc130f9987
commit f9d0da86e3
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/browser.cpp
View File

@ -242,9 +242,9 @@ void BrowserDialog::updateListing() {
}
if (i->isDirectory())
list.push_back(color + Common::U32String(i->getName() + "/"));
list.push_back(color + ListWidget::escapeString(Common::U32String(i->getName()) + "/"));
else
list.push_back(color + Common::U32String(i->getName()));
list.push_back(color + ListWidget::escapeString(Common::U32String(i->getName())));
}
_fileList->setList(list);

13
gui/widgets/list.cpp
View File

@ -860,6 +860,19 @@ Common::U32String ListWidget::stripGUIformatting(const Common::U32String &str) {
return stripped;
}
Common::U32String ListWidget::escapeString(const Common::U32String &str) {
Common::U32String escaped;
const uint32 *s = str.u32_str();
while (*s) {
if (*s == '\001')
escaped += '\001';
escaped += *s++;
}
return escaped;
}
void ListWidget::drawFormattedText(const Common::Rect &r, const Common::U32String &str, ThemeEngine::WidgetStateInfo state,
Graphics::TextAlign align, ThemeEngine::TextInversionState inverted, int deltax, bool useEllipsis,
ThemeEngine::FontColor color) {

1
gui/widgets/list.h
View File

@ -154,6 +154,7 @@ public:
static Common::U32String getThemeColor(ThemeEngine::FontColor color);
static ThemeEngine::FontColor getThemeColor(const Common::U32String &color);
static Common::U32String stripGUIformatting(const Common::U32String &str);
static Common::U32String escapeString(const Common::U32String &str);
protected:
void drawWidget() override;