piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1196 from RachelBryk/framecount

Browse Source 
Add on screen frame counter.
This commit is contained in:
skidau
2014-10-03 13:31:52 +10:00
parent 6333f41837 f6c6f03cce
commit 16d3604211
8 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinWX/Frame.cpp
View File

@ -230,6 +230,7 @@ EVT_MENU(IDM_RECORDREADONLY, CFrame::OnRecordReadOnly)
EVT_MENU(IDM_TASINPUT, CFrame::OnTASInput)
EVT_MENU(IDM_TOGGLE_PAUSEMOVIE, CFrame::OnTogglePauseMovie)
EVT_MENU(IDM_SHOWLAG, CFrame::OnShowLag)
EVT_MENU(IDM_SHOWFRAMECOUNT, CFrame::OnShowFrameCount)
EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep)
EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot)
EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain)

1
Source/Core/DolphinWX/Frame.h
View File

@ -270,6 +270,7 @@ private:
void OnTASInput(wxCommandEvent& event);
void OnTogglePauseMovie(wxCommandEvent& event);
void OnShowLag(wxCommandEvent& event);
void OnShowFrameCount(wxCommandEvent& event);
void OnChangeDisc(wxCommandEvent& event);
void OnScreenshot(wxCommandEvent& event);
void OnActive(wxActivateEvent& event);

8
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -213,6 +213,8 @@ wxMenuBar* CFrame::CreateMenu()
movieMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie);
movieMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter"));
movieMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag);
movieMenu->AppendCheckItem(IDM_SHOWFRAMECOUNT, _("Show frame counter"));
movieMenu->Check(IDM_SHOWFRAMECOUNT, SConfig::GetInstance().m_ShowFrameCount);
movieMenu->Check(IDM_RECORDREADONLY, true);
menubar->Append(movieMenu, _("&Movie"));
@ -717,6 +719,12 @@ void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event))
SConfig::GetInstance().SaveSettings();
}
void CFrame::OnShowFrameCount(wxCommandEvent& WXUNUSED (event))
{
SConfig::GetInstance().m_ShowFrameCount = !SConfig::GetInstance().m_ShowFrameCount;
SConfig::GetInstance().SaveSettings();
}
void CFrame::OnFrameStep(wxCommandEvent& event)
{
bool wasPaused = (Core::GetState() == Core::CORE_PAUSE);

1
Source/Core/DolphinWX/Globals.h
View File

@ -91,6 +91,7 @@ enum
IDM_TASINPUT,
IDM_TOGGLE_PAUSEMOVIE,
IDM_SHOWLAG,
IDM_SHOWFRAMECOUNT,
IDM_FRAMESTEP,
IDM_SCREENSHOT,
IDM_BROWSE,