mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Remove all tab/space mismatches from the DolphinWX project (at least 99%. I promise!)
Also fix up the dangling else's. Shit just looks incredibly ugly in terms of actual structure in the code. I took the liberty of adding comments in FifoPlayerDlg.cpp, LogConfigWindow.cpp, LogWindow.cpp, and FrameAui.cpp to better explain some things. If any comments are wrong, don't hesitate to complain.
This commit is contained in:
@ -468,10 +468,13 @@ void CFrame::OnClose(wxCloseEvent& event)
|
||||
event.Skip();
|
||||
|
||||
// Save GUI settings
|
||||
if (g_pCodeWindow) SaveIniPerspectives();
|
||||
// Close the log window now so that its settings are saved
|
||||
if (g_pCodeWindow)
|
||||
{
|
||||
SaveIniPerspectives();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Close the log window now so that its settings are saved
|
||||
m_LogWindow->Close();
|
||||
m_LogWindow = NULL;
|
||||
}
|
||||
@ -494,7 +497,9 @@ void CFrame::PostEvent(wxCommandEvent& event)
|
||||
g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
|
||||
}
|
||||
else
|
||||
{
|
||||
event.Skip();
|
||||
}
|
||||
}
|
||||
|
||||
void CFrame::OnMove(wxMoveEvent& event)
|
||||
@ -706,16 +711,20 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
|
||||
m_GameListCtrl->Update();
|
||||
}
|
||||
else if (!m_GameListCtrl->GetISO(0))
|
||||
{
|
||||
m_GameListCtrl->BrowseForDirectory();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Game started by double click
|
||||
BootGame(std::string(""));
|
||||
}
|
||||
}
|
||||
|
||||
bool IsHotkey(wxKeyEvent &event, int Id)
|
||||
{
|
||||
return (event.GetKeyCode() != WXK_NONE &&
|
||||
event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
|
||||
event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
|
||||
event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
|
||||
}
|
||||
|
||||
@ -853,7 +862,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
DoFullscreen(!RendererIsFullscreen());
|
||||
// Send Debugger keys to CodeWindow
|
||||
else if (g_pCodeWindow && (event.GetKeyCode() >= WXK_F9 && event.GetKeyCode() <= WXK_F11))
|
||||
event.Skip();
|
||||
event.Skip();
|
||||
// Pause and Unpause
|
||||
else if (IsHotkey(event, HK_PLAY_PAUSE))
|
||||
DoPause();
|
||||
@ -964,7 +973,9 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
event.Skip();
|
||||
}
|
||||
}
|
||||
|
||||
void CFrame::OnKeyUp(wxKeyEvent& event)
|
||||
@ -1019,7 +1030,9 @@ void CFrame::DoFullscreen(bool bF)
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_RenderFrame->Raise();
|
||||
}
|
||||
}
|
||||
|
||||
const CGameListCtrl *CFrame::GetGameListCtrl() const
|
||||
|
Reference in New Issue
Block a user