blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix #109886: Win32 AutoFocus Between Main Windows #109946

Merged
Harley Acheson merged 1 commits from Harley/blender:AutoFocusMain into main 2023-07-11 21:13:57 +02:00
Conversation 3 Commits 1 Files Changed 1 +8 -2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/ghost/intern/GHOST_SystemWin32.cc
View File

@ -1890,8 +1890,14 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, uint msg, WPARAM wParam,
else if (!new_parent && !old_parent) {
/* Between main windows that don't overlap. */
RECT new_rect, old_rect, dest_rect;
::GetWindowRect(hwnd, &new_rect);
::GetWindowRect(old_hwnd, &old_rect);
/* The rects without the outside shadows and slightly inset. */
DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &new_rect, sizeof(RECT));
::InflateRect(&new_rect, -1, -1);
DwmGetWindowAttribute(
old_hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &old_rect, sizeof(RECT));
::InflateRect(&old_rect, -1, -1);
if (!IntersectRect(&dest_rect, &new_rect, &old_rect)) {
::SetFocus(hwnd);
}