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

[Project64] Move SetWindowCaption from Notification Class to Gui Class

This commit is contained in:
zilmar 2015-11-12 22:38:20 +11:00
parent e25fedcae2
commit e4bd5eae74
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Project64/User Interface/Gui Class.cpp
View File

@ -138,6 +138,16 @@ void CMainGui::AddRecentRom(const char * ImagePath)
} }
} }
void CMainGui::SetWindowCaption(const wchar_t * title)
{
static const size_t TITLE_SIZE = 256;
wchar_t WinTitle[TITLE_SIZE];
_snwprintf(WinTitle, TITLE_SIZE, L"%s - %s", title, g_Settings->LoadStringVal(Setting_ApplicationName).ToUTF16().c_str());
WinTitle[TITLE_SIZE - 1] = 0;
Caption(WinTitle);
}
void RomBowserEnabledChanged(CMainGui * Gui) void RomBowserEnabledChanged(CMainGui * Gui)
{ {
if (Gui && g_Settings->LoadBool(RomBrowser_Enabled)) if (Gui && g_Settings->LoadBool(RomBrowser_Enabled))
@ -168,7 +178,7 @@ void CMainGui::GameLoaded(CMainGui * Gui)
{ {
WriteTrace(TraceDebug, __FUNCTION__ ": Add Recent Rom"); WriteTrace(TraceDebug, __FUNCTION__ ": Add Recent Rom");
Gui->AddRecentRom(FileLoc.c_str()); Gui->AddRecentRom(FileLoc.c_str());
Notify().SetWindowCaption(g_Settings->LoadStringVal(Game_GoodName).ToUTF16().c_str()); Gui->SetWindowCaption(g_Settings->LoadStringVal(Game_GoodName).ToUTF16().c_str());
Gui->HideRomList(); Gui->HideRomList();
} }

1
Source/Project64/User Interface/Gui Class.h
View File

@ -104,6 +104,7 @@ private:
void CreateStatusBar(void); void CreateStatusBar(void);
void Resize(DWORD fwSizeType, WORD nWidth, WORD nHeight); //responding to WM_SIZE void Resize(DWORD fwSizeType, WORD nWidth, WORD nHeight); //responding to WM_SIZE
void AddRecentRom(const char * ImagePath); void AddRecentRom(const char * ImagePath);
void SetWindowCaption(const wchar_t * Caption);
friend DWORD CALLBACK AboutBoxProc(HWND, DWORD, DWORD, DWORD); friend DWORD CALLBACK AboutBoxProc(HWND, DWORD, DWORD, DWORD);
friend DWORD CALLBACK AboutIniBoxProc(HWND, DWORD, DWORD, DWORD); friend DWORD CALLBACK AboutIniBoxProc(HWND, DWORD, DWORD, DWORD);

14
Source/Project64/User Interface/Notification Class.cpp
View File

@ -125,20 +125,6 @@ void CNotification::SetGfxPlugin(CGfxPlugin * Plugin)
m_gfxPlugin = Plugin; m_gfxPlugin = Plugin;
} }
void CNotification::SetWindowCaption(const wchar_t * Caption)
{
static const size_t TITLE_SIZE = 256;
wchar_t WinTitle[TITLE_SIZE];
_snwprintf(WinTitle, TITLE_SIZE, L"%s - %s", Caption, g_Settings->LoadStringVal(Setting_ApplicationName).ToUTF16().c_str());
WinTitle[TITLE_SIZE - 1] = 0;
#if defined(WINDOWS_UI)
m_hWnd->Caption(WinTitle);
#else
g_Notify->BreakPoint(__FILEW__, __LINE__);
#endif
}
void CNotification::FatalError(LanguageStringID StringID) const void CNotification::FatalError(LanguageStringID StringID) const
{ {
FatalError(g_Lang->GetString(StringID).c_str()); FatalError(g_Lang->GetString(StringID).c_str());