mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-10-07 15:53:34 +00:00
Merge pull request #710 from Armada651/d3dfullscreen_fixes
CFrame: Only re-assign focus when "Render to main" is enabled.
This commit is contained in:
commit
1515262be9
@ -479,11 +479,14 @@ void CFrame::OnActive(wxActivateEvent& event)
|
|||||||
{
|
{
|
||||||
if (event.GetActive() && event.GetEventObject() == m_RenderFrame)
|
if (event.GetActive() && event.GetEventObject() == m_RenderFrame)
|
||||||
{
|
{
|
||||||
|
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
|
||||||
|
{
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
::SetFocus((HWND)m_RenderParent->GetHandle());
|
::SetFocus((HWND)m_RenderParent->GetHandle());
|
||||||
#else
|
#else
|
||||||
m_RenderParent->SetFocus();
|
m_RenderParent->SetFocus();
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
|
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
|
||||||
Core::GetState() == Core::CORE_RUN)
|
Core::GetState() == Core::CORE_RUN)
|
||||||
|
Loading…
Reference in New Issue
Block a user