Permalink
Browse files

Merge branch 'pan/werl_caret/OTP-10181' into maint

* pan/werl_caret/OTP-10181:
  Teach caret to appear correctly after focus loss
  • Loading branch information...
2 parents e75feb0 + d75a3a8 commit 4e8f6f2e2cdec0e94f5b4e1a1a878190e4d01704 @bufflig bufflig committed Aug 20, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 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:

0 comments on commit 4e8f6f2

Please sign in to comment.