diff options
| author | Thomas Dinges <blender@dingto.org> | 2009-05-17 19:09:03 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2009-05-17 19:09:03 +0400 |
| commit | 65796e2c0712798606497dfb3f36ccbd6e7ab725 (patch) | |
| tree | 136baf0f04e0c9fdfa398122b512c09a448eaa57 /intern | |
| parent | 3ea1c1b4b640b18e651de7eacb40bb7cc7a2f55f (diff) | |
Patch #18758 for bug #17423 by Matt D. (foom) Thanks!
"Mouse wheel zoom lost after rendering."
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index feb0fe39040..b265353144d 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -41,7 +41,7 @@ #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning #include "GHOST_SystemWin32.h" - +//#include <stdio.h> //for printf() // win64 doesn't define GWL_USERDATA #ifdef WIN32 #ifndef GWL_USERDATA @@ -747,6 +747,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * the message is sent asynchronously, so the window is activated immediately. */ event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window); + /* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL + will not be dispatched to OUR active window if we minimize one of OUR windows. */ + lResult = ::DefWindowProc(hwnd, msg, wParam, lParam); break; case WM_PAINT: /* An application sends the WM_PAINT message when the system or another application @@ -766,6 +769,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * message without calling DefWindowProc. */ event = processWindowEvent(GHOST_kEventWindowSize, window); + break; case WM_CAPTURECHANGED: window->lostMouseCapture(); break; @@ -904,7 +908,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, if (event) { system->pushEvent(event); - lResult = 0; + if(!lResult) //WM_ACTIVATE might have returned something. + lResult = 0; } else { lResult = ::DefWindowProc(hwnd, msg, wParam, lParam); |