paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 09:40:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: fixed/improved error handling for caret. Might fix some caret-not-shown issues (observed with carbon)

Browse Source 
git-svn-id: trunk@37688 -
This commit is contained in:
martin 2012-06-18 22:38:52 +00:00
parent b9f87c66e6
commit 29485dc359
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/synedit/syneditpointclasses.pas
View File

@ -1664,7 +1664,7 @@ procedure TSynEditScreenCaret.DestroyCaret(SkipHide: boolean = False);
begin
if FCurrentCreated and HandleAllocated then begin
{$IFDeF SynCaretDebug}
debugln(['SynEditCaret DestroyCaret for HandleOwner=',FHandleOwner, ' DebugShowCount=', FDebugShowCount]);
debugln(['SynEditCaret DestroyCaret for HandleOwner=',FHandleOwner, ' DebugShowCount=', FDebugShowCount, ' FVisible=', FVisible, ' FCurrentVisible=', FCurrentVisible]);
{$ENDIF}
LCLIntf.DestroyCaret(Handle);
end;
@ -1914,11 +1914,17 @@ begin
end;
if (not FCurrentVisible) then begin
{$IFDeF SynCaretDebug}
debugln(['SynEditCaret ShowCaret for HandleOwner=',FHandleOwner, ' FDebugShowCount=',FDebugShowCount]);
debugln(['SynEditCaret ShowCaret for HandleOwner=',FHandleOwner, ' FDebugShowCount=',FDebugShowCount, ' FVisible=', FVisible, ' FCurrentVisible=', FCurrentVisible]);
inc(FDebugShowCount);
{$ENDIF}
if LCLIntf.ShowCaret(Handle) then
FCurrentVisible := True;
FCurrentVisible := True
else begin
{$IFDeF SynCaretDebug}
debugln(['SynEditCaret ShowCaret FAILED for HandleOwner=',FHandleOwner, ' FDebugShowCount=',FDebugShowCount]);
{$ENDIF}
DestroyCaret(True);
end;
end;
end;
@ -1929,11 +1935,17 @@ begin
if not FCurrentCreated then exit;
if FCurrentVisible then begin
{$IFDeF SynCaretDebug}
debugln(['SynEditCaret HideCaret for HandleOwner=',FHandleOwner, ' FDebugShowCount=',FDebugShowCount]);
debugln(['SynEditCaret HideCaret for HandleOwner=',FHandleOwner, ' FDebugShowCount=',FDebugShowCount, ' FVisible=', FVisible, ' FCurrentVisible=', FCurrentVisible]);
dec(FDebugShowCount);
{$ENDIF}
if LCLIntf.HideCaret(Handle) then
FCurrentVisible := False;
FCurrentVisible := False
else begin
{$IFDeF SynCaretDebug}
debugln(['SynEditCaret HideCaret FAILED for HandleOwner=',FHandleOwner, ' FDebugShowCount=',FDebugShowCount]);
{$ENDIF}
DestroyCaret(True);
end;
end;
end;