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

Save the correct render window size. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5354 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-04-13 04:00:41 +00:00
parent a2fb7540b6
commit 9592da1a9b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -692,16 +692,18 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
event.Skip(); event.Skip();
if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE) if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
{ {
int x, y, width, height; int width, height;
m_RenderParent->GetSize(&width, &height);
m_RenderParent->GetPosition(&x, &y);
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
!RendererIsFullscreen() && !m_RenderFrame->IsMaximized()) !RendererIsFullscreen() && !m_RenderFrame->IsMaximized())
{ {
m_RenderFrame->GetSize(&width, &height);
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width; SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width;
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight = height; SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight = height;
} }
#if defined(HAVE_X11) && HAVE_X11 #if defined(HAVE_X11) && HAVE_X11
int x, y;
m_RenderParent->GetSize(&width, &height);
m_RenderParent->GetPosition(&x, &y);
X11_SendClientEvent("RESIZE", x, y, width, height); X11_SendClientEvent("RESIZE", x, y, width, height);
#endif #endif
} }
@ -847,7 +849,7 @@ void CFrame::DoStop()
{ {
#ifdef _WIN32 #ifdef _WIN32
if (!RendererIsFullscreen() && !m_RenderFrame->IsMaximized()) if (!RendererIsFullscreen() && !m_RenderFrame->IsMaximized())
m_RenderParent->GetSize(&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth, m_RenderFrame->GetSize(&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); &SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
#endif #endif
m_RenderFrame->Destroy(); m_RenderFrame->Destroy();