Fixes Issue 1910
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4886 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
5c27050cd8
commit
f60c3e8445
|
@ -329,7 +329,11 @@ bool IsKey(int Key)
|
|||
if ((Key == EWM_SHAKE && GetAsyncKeyState(VK_MBUTTON))
|
||||
|| (Key == EWM_A && GetAsyncKeyState(VK_LBUTTON))
|
||||
|| (Key == EWM_B && GetAsyncKeyState(VK_RBUTTON)))
|
||||
Ret = 1;
|
||||
{
|
||||
float x, y;
|
||||
GetMousePos(x, y);
|
||||
Ret = !(x < 0 || x > 1 || y < 0 || y > 1);
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
|
|
@ -426,12 +426,8 @@ bool IsFocus()
|
|||
HWND RenderingWindow = g_WiimoteInitialize.hWnd;
|
||||
HWND Parent = GetParent(RenderingWindow);
|
||||
HWND TopLevel = GetParent(Parent);
|
||||
// Allow updates when the config window is in focus to
|
||||
HWND Config = NULL;
|
||||
if (m_BasicConfigFrame)
|
||||
Config = (HWND)m_BasicConfigFrame->GetHWND();
|
||||
// Support both rendering to main window and not
|
||||
if (GetForegroundWindow() == TopLevel || GetForegroundWindow() == RenderingWindow || GetForegroundWindow() == Config)
|
||||
if (GetForegroundWindow() == TopLevel || GetForegroundWindow() == RenderingWindow)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue