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

Merge pull request #1616 from oddMLan/tweak-statusbar 

Tweak statusbar
This commit is contained in:
zilmar 2019-04-23 06:45:37 +09:30 committed by GitHub
parent cad17b23a0 cfbc2ee75e
commit b629c0eb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Project64-core/N64System/N64Class.cpp
View File

@ -658,7 +658,7 @@ void CN64System::StartEmulation2(bool NewThread)
else
{
//mark the emulation as starting and fix up menus
g_Notify->DisplayMessage(5, MSG_EMULATION_STARTED);
g_Notify->DisplayMessage(2, MSG_EMULATION_STARTED);
WriteTrace(TraceN64System, TraceDebug, "Start Executing CPU");
ExecuteCPU();
}
@ -704,7 +704,7 @@ void CN64System::Pause()
g_Settings->SaveBool(GameRunning_CPU_Paused, (uint32_t)false);
if (pause_type == PauseType_FromMenu)
{
g_Notify->DisplayMessage(5, MSG_CPU_RESUMED);
g_Notify->DisplayMessage(2, MSG_CPU_RESUMED);
}
}
@ -1088,7 +1088,7 @@ void CN64System::ExecuteCPU()
//reset code
g_Settings->SaveBool(GameRunning_CPU_Paused, false);
g_Settings->SaveBool(GameRunning_CPU_Running, true);
g_Notify->DisplayMessage(5, MSG_EMULATION_STARTED);
g_Notify->DisplayMessage(2, MSG_EMULATION_STARTED);
m_EndEmulation = false;
@ -1751,7 +1751,7 @@ bool CN64System::SaveState()
{
SaveFile = ZipFile;
}
g_Notify->DisplayMessage(5, stdstr_f("%s %s", g_Lang->GetString(MSG_SAVED_STATE).c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str());
g_Notify->DisplayMessage(3, stdstr_f("%s %s", g_Lang->GetString(MSG_SAVED_STATE).c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str());
WriteTrace(TraceN64System, TraceDebug, "Done");
return true;
}
@ -1934,7 +1934,7 @@ bool CN64System::LoadState(const char * FileName)
CFile hSaveFile(SaveFile, CFileBase::modeRead);
if (!hSaveFile.IsOpen())
{
g_Notify->DisplayMessage(5, stdstr_f("%s %s", GS(MSG_UNABLED_LOAD_STATE), FileName).c_str());
g_Notify->DisplayMessage(3, stdstr_f("%s %s", GS(MSG_UNABLED_LOAD_STATE), FileName).c_str());
return false;
}
hSaveFile.SeekToBegin();
@ -2061,7 +2061,7 @@ bool CN64System::LoadState(const char * FileName)
}
}
std::string LoadMsg = g_Lang->GetString(MSG_LOADED_STATE);
g_Notify->DisplayMessage(5, stdstr_f("%s %s", LoadMsg.c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str());
g_Notify->DisplayMessage(3, stdstr_f("%s %s", LoadMsg.c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str());
WriteTrace(TraceN64System, TraceDebug, "Done");
return true;
}

2
Source/Project64-core/N64System/ProfilingClass.cpp
View File

@ -80,7 +80,7 @@ void CProfiling::ShowCPU_Usage()
uint32_t Idel = (uint32_t)(m_Timers[Timer_Idel] * 10000 / TotalTime);
m_CurrentDisplayCount = MAX_FRAMES;
g_Notify->DisplayMessage(0, stdstr_f("r4300i: %d.%02d%% GFX: %d.%02d%% Alist: %d.%02d%% Idle: %d.%02d%%",
g_Notify->DisplayMessage(0, stdstr_f("r4300i: %d.%02d%% GFX: %d.%02d%% Alist: %d.%02d%% Idle: %d.%02d%%",
R4300 / 100, R4300 % 100, RSP_Dlist / 100, RSP_Dlist % 100, RSP_Alist / 100, RSP_Alist % 100, Idel / 100, Idel % 100).c_str());
ResetTimers();

2
Source/Project64/UserInterface/MainWindow.cpp
View File

@ -526,7 +526,7 @@ void CMainGui::Resize(DWORD /*fwSizeType*/, WORD nWidth, WORD nHeight)
GetClientRect((HWND)m_hStatusWnd, &swrect);
int Parts[2];
Parts[0] = (int) (nWidth - 140 * DPIScale(m_hStatusWnd));
Parts[0] = (int) (nWidth - 135 * DPIScale(m_hStatusWnd));
Parts[1] = nWidth;
SendMessage((HWND)m_hStatusWnd, SB_SETPARTS, 2, (LPARAM)&Parts[0]);