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

Don't store Render window size when the window is minimized (Fixes Issue 2940) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6286 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
j4ck.fr0st 2010-10-17 12:42:04 +00:00
parent f444dd551b
commit 8b49d5ccca
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,6 +589,7 @@ void CFrame::OnMove(wxMoveEvent& event)
void CFrame::OnResize(wxSizeEvent& event) void CFrame::OnResize(wxSizeEvent& event)
{ {
event.Skip(); event.Skip();
if (!IsMaximized() && if (!IsMaximized() &&
!(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && RendererIsFullscreen())) !(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && RendererIsFullscreen()))
{ {

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

@ -703,7 +703,7 @@ void CFrame::OnRenderParentClose(wxCloseEvent& event)
void CFrame::OnRenderParentMove(wxMoveEvent& event) void CFrame::OnRenderParentMove(wxMoveEvent& event)
{ {
if (Core::GetState() != Core::CORE_UNINITIALIZED && if (Core::GetState() != Core::CORE_UNINITIALIZED &&
!RendererIsFullscreen() && !m_RenderFrame->IsMaximized()) !RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
{ {
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos = m_RenderFrame->GetPosition().x; SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos = m_RenderFrame->GetPosition().x;
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos = m_RenderFrame->GetPosition().y; SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos = m_RenderFrame->GetPosition().y;
@ -717,7 +717,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
{ {
int width, height; int width, height;
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
!RendererIsFullscreen() && !m_RenderFrame->IsMaximized()) !RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
{ {
m_RenderFrame->GetSize(&width, &height); m_RenderFrame->GetSize(&width, &height);
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width; SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width;
@ -736,7 +736,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
event.Skip(); event.Skip();
} }
void CFrame::ToggleDisplayMode (bool bFullscreen) void CFrame::ToggleDisplayMode(bool bFullscreen)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (bFullscreen) if (bFullscreen)