diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-20 17:52:40 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-20 17:52:40 +0200 |
| commit | 4e8f6f2e2cdec0e94f5b4e1a1a878190e4d01704 (patch) | |
| tree | 1248200c4e1ce0f1f393708ba2f8feacb2ba8aa5 /erts/emulator | |
| parent | e75feb093a37d3b0dfce18c501380ef1b696eedd (diff) | |
| parent | d75a3a80c8c27410fb5182117cca44481bac487f (diff) | |
| download | otp-4e8f6f2e2cdec0e94f5b4e1a1a878190e4d01704.tar.gz otp-4e8f6f2e2cdec0e94f5b4e1a1a878190e4d01704.tar.bz2 otp-4e8f6f2e2cdec0e94f5b4e1a1a878190e4d01704.zip | |
Merge branch 'pan/werl_caret/OTP-10181' into maint
* pan/werl_caret/OTP-10181:
Teach caret to appear correctly after focus loss
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/drivers/win32/win_con.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/drivers/win32/win_con.c b/erts/emulator/drivers/win32/win_con.c index 6b45b92cbe..5df399aa5d 100644 --- a/erts/emulator/drivers/win32/win_con.c +++ b/erts/emulator/drivers/win32/win_con.c @@ -569,7 +569,7 @@ FrameWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) return 1; case WM_SETFOCUS : CreateCaret(hClientWnd, NULL, cxChar, cyChar); - SetCaretPos(GetXFromCurrentY(GetDC(hwnd),0,cur_x), (cur_y-iVscrollPos)*cyChar); + SetCaretPos(GetXFromCurrentY(GetDC(hClientWnd),iHscrollPos,cur_x), (cur_y-iVscrollPos)*cyChar); ShowCaret(hClientWnd); return 0; case WM_KILLFOCUS: |