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

Cosmetics.

This commit is contained in:
Jules Blok 2016-11-13 22:16:29 +01:00
parent aa0e4472c0
commit 7e35a47b51
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1180,12 +1180,12 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
void CFrame::DoExclusiveFullscreen(bool enable_fullscreen)
{
if (g_renderer && g_renderer->IsFullscreen() != enable_fullscreen)
{
bool was_unpaused = Core::PauseAndLock(true);
g_renderer->SetFullscreen(enable_fullscreen);
Core::PauseAndLock(false, was_unpaused);
}
if (!g_renderer || g_renderer->IsFullscreen() == enable_fullscreen)
return;
bool was_unpaused = Core::PauseAndLock(true);
g_renderer->SetFullscreen(enable_fullscreen);
Core::PauseAndLock(false, was_unpaused);
}
const CGameListCtrl* CFrame::GetGameListCtrl() const

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

@ -105,8 +105,8 @@ public:
void OnRenderParentMove(wxMoveEvent& event);
bool RendererHasFocus();
bool RendererIsFullscreen();
void DoFullscreen(bool bF);
void DoExclusiveFullscreen(bool bF);
void DoFullscreen(bool enable_fullscreen);
void DoExclusiveFullscreen(bool enable_fullscreen);
void ToggleDisplayMode(bool bFullscreen);
static void ConnectWiimote(int wm_idx, bool connect);
void UpdateTitle(const std::string& str);

2
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -1255,7 +1255,7 @@ void Renderer::SetFullscreen(bool enable_fullscreen)
D3D::SetFullscreenState(enable_fullscreen);
}
bool Renderer::IsFullscreen()
bool Renderer::IsFullscreen() const
{
return D3D::GetFullscreenState();
}

2
Source/Core/VideoBackends/D3D/Render.h
View File

@ -26,7 +26,7 @@ public:
void SetInterlacingMode() override;
void SetViewport() override;
void SetFullscreen(bool enable_fullscreen) override;
bool IsFullscreen() override;
bool IsFullscreen() const override;
// TODO: Fix confusing names (see ResetAPIState and RestoreAPIState)
void ApplyState(bool bUseDstAlpha) override;

2
Source/Core/VideoCommon/RenderBase.h
View File

@ -73,7 +73,7 @@ public:
virtual void SetInterlacingMode() {}
virtual void SetViewport() {}
virtual void SetFullscreen(bool enable_fullscreen) {}
virtual bool IsFullscreen() { return false; }
virtual bool IsFullscreen() const { return false; }
virtual void ApplyState(bool bUseDstAlpha) {}
virtual void RestoreState() {}
virtual void ResetAPIState() {}