Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-09 05:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTUSER] Fix caret display mistake (#2180)

Browse source 
Take care of caret visibility. co_IntSetCaretPos function wrongly drawn the caret upon invisible caret. @Doug-Lyons did test this patch. CORE-15661
This commit is contained in:
Katayama Hirofumi MZ 2019-12-26 19:08:01 +09:00 • committed by GitHub
parent 3f9e695061
commit 22f883278b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
win32ss/user/ntuser/caret.c
View file

@ -217,10 +217,13 @@ co_IntSetCaretPos(int X, int Y)
if(ThreadQueue->CaretInfo.Pos.x != X || ThreadQueue->CaretInfo.Pos.y != Y) if(ThreadQueue->CaretInfo.Pos.x != X || ThreadQueue->CaretInfo.Pos.y != Y)
{ {
co_IntHideCaret(&ThreadQueue->CaretInfo); co_IntHideCaret(&ThreadQueue->CaretInfo);
ThreadQueue->CaretInfo.Showing = 1;
ThreadQueue->CaretInfo.Pos.x = X; ThreadQueue->CaretInfo.Pos.x = X;
ThreadQueue->CaretInfo.Pos.y = Y; ThreadQueue->CaretInfo.Pos.y = Y;
if (ThreadQueue->CaretInfo.Visible)
{
ThreadQueue->CaretInfo.Showing = 1;
co_IntDrawCaret(pWnd, &ThreadQueue->CaretInfo); co_IntDrawCaret(pWnd, &ThreadQueue->CaretInfo);
}
IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM); IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM);
IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_CARET, CHILDID_SELF, 0); IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_CARET, CHILDID_SELF, 0);