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

Merge pull request #5291 from Starsam80/fix-10221 

WX: Don't specify a parent frame for the render frame
This commit is contained in:
Tilka 2017-04-23 23:40:32 +01:00 committed by GitHub
parent a8dfb32576 a41c0d3caa
commit c6bc474c29
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -665,7 +665,8 @@ void CFrame::StartGame(const std::string& filename)
// Set window size in framebuffer pixels since the 3D rendering will be operating at // Set window size in framebuffer pixels since the 3D rendering will be operating at
// that level. // that level.
wxSize default_size{wxSize(640, 480) * (1.0 / GetContentScaleFactor())}; wxSize default_size{wxSize(640, 480) * (1.0 / GetContentScaleFactor())};
m_RenderFrame = new CRenderFrame(this, wxID_ANY, _("Dolphin"), wxDefaultPosition, default_size); m_RenderFrame =
new CRenderFrame(nullptr, wxID_ANY, _("Dolphin"), wxDefaultPosition, default_size);
// Convert ClientSize coordinates to frame sizes. // Convert ClientSize coordinates to frame sizes.
wxSize decoration_fudge = m_RenderFrame->GetSize() - m_RenderFrame->GetClientSize(); wxSize decoration_fudge = m_RenderFrame->GetSize() - m_RenderFrame->GetClientSize();