Merge branch 'legonigel-focus_fix_gitscrubz'

This commit is contained in:
XinyuHou 2015-03-20 11:39:34 +00:00
commit 5aaaa784ab

View File

@ -435,8 +435,7 @@ MSWindowsDesks::destroyClass(ATOM windowClass) const
HWND HWND
MSWindowsDesks::createWindow(ATOM windowClass, const char* name) const MSWindowsDesks::createWindow(ATOM windowClass, const char* name) const
{ {
HWND window = CreateWindowEx(WS_EX_TOPMOST | HWND window = CreateWindowEx(WS_EX_TRANSPARENT |
WS_EX_TRANSPARENT |
WS_EX_TOOLWINDOW, WS_EX_TOOLWINDOW,
reinterpret_cast<LPCTSTR>(windowClass), reinterpret_cast<LPCTSTR>(windowClass),
name, name,
@ -596,7 +595,7 @@ MSWindowsDesks::deskLeave(Desk* desk, HKL keyLayout)
w = m_w; w = m_w;
h = m_h; h = m_h;
} }
SetWindowPos(desk->m_window, HWND_TOPMOST, x, y, w, h, SetWindowPos(desk->m_window, HWND_TOP, x, y, w, h,
SWP_NOACTIVATE | SWP_SHOWWINDOW); SWP_NOACTIVATE | SWP_SHOWWINDOW);
// if not using low-level hooks we have to also activate the // if not using low-level hooks we have to also activate the
@ -635,7 +634,7 @@ MSWindowsDesks::deskLeave(Desk* desk, HKL keyLayout)
} }
else { else {
// move hider window under the cursor center, raise, and show it // move hider window under the cursor center, raise, and show it
SetWindowPos(desk->m_window, HWND_TOPMOST, SetWindowPos(desk->m_window, HWND_TOP,
m_xCenter, m_yCenter, 1, 1, m_xCenter, m_yCenter, 1, 1,
SWP_NOACTIVATE | SWP_SHOWWINDOW); SWP_NOACTIVATE | SWP_SHOWWINDOW);