ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix window title on non-english locales (probably, but not tested) 

fixes #496 addendum
This commit is contained in:
zeromus 2022-01-11 20:29:05 -05:00
parent 81573818a9
commit af06cc4aca
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
desmume/src/frontend/windows/main.cpp
View File

@ -2989,25 +2989,33 @@ void WavEnd()
NDS_UnPause();
}
void UpdateTitle(const char* currTitle)
void UpdateTitle()
{
const wchar_t* currTitle = nullptr;
wchar_t boffo[256];
const char* emu_desmume_name_and_version = EMU_DESMUME_NAME_AND_VERSION();
size_t len = strlen(emu_desmume_name_and_version);
for(int i=0;i<len;i++)
boffo[i] = emu_desmume_name_and_version[i];
boffo[len] = 0;
if (gameInfo.hasRomBanner())
{
if (currTitle == nullptr) {
currTitle = EMU_DESMUME_NAME_AND_VERSION();
currTitle = boffo;
}
char newTitle[512];
char gameTitle[128];
wchar_t newTitle[512];
wchar_t gameTitle[128];
strcpy(newTitle, currTitle);
wcscpy(newTitle, currTitle);
int newLength = strlen(newTitle);
int newLength = wcslen(newTitle);
const RomBanner& banner = gameInfo.getRomBanner();
sprintf(gameTitle, " | %ws", banner.titles[CommonSettings.fwConfig.language]);
swprintf(gameTitle, L" | %s", (const wchar_t*)banner.titles[CommonSettings.fwConfig.language]);
int index = 0, gameLength = strlen(gameTitle);
int index = 0, gameLength = wcslen(gameTitle);
for (int i = 0; i < gameLength; i++)
{
if (gameTitle[i] == '\n')
@ -3020,12 +3028,12 @@ void UpdateTitle(const char* currTitle)
if (index != 0)
{
gameTitle[index] = '\0';
if (newLength + gameLength < 512) strcat(newTitle + newLength, gameTitle);
if (newLength + gameLength < 512) wcscat(newTitle + newLength, gameTitle);
}
newTitle[511] = '\0'; // Stay safe
SetWindowText(MainWindow->getHWnd(), newTitle);
SetWindowTextW(MainWindow->getHWnd(), newTitle);
}
}

2
desmume/src/frontend/windows/main.h
View File

@ -45,7 +45,7 @@ void AviRecordTo();
void AviEnd();
void WavRecordTo(int wavmode);
void WavEnd();
void UpdateTitle(const char* currTitle = nullptr);
void UpdateTitle();
void UpdateToolWindows();
bool DemandLua();
void SetRotate(HWND hwnd, int rot, bool user = true);