SynEdit: Fixed eoNoCaret

git-svn-id: trunk@35689 -
This commit is contained in:
martin 2012-03-03 20:14:11 +00:00
parent 994179a76f
commit 6ade22b5c6

View File

@ -4456,7 +4456,7 @@ begin
DebugLn(['[TCustomSynEdit.WMSetFocus] A ',Name,':',ClassName, ' time=', dbgs(Now*86640)]); DebugLn(['[TCustomSynEdit.WMSetFocus] A ',Name,':',ClassName, ' time=', dbgs(Now*86640)]);
{$ENDIF} {$ENDIF}
FScreenCaret.DestroyCaret; // Ensure recreation. On Windows only one caret exists, and it must be moved to the focused editor FScreenCaret.DestroyCaret; // Ensure recreation. On Windows only one caret exists, and it must be moved to the focused editor
FScreenCaret.Visible := True; FScreenCaret.Visible := not(eoNoCaret in FOptions);
//if FHideSelection and SelAvail then //if FHideSelection and SelAvail then
// Invalidate; // Invalidate;
inherited; inherited;
@ -7220,10 +7220,12 @@ begin
// (un)register HWND as drop target // (un)register HWND as drop target
if (eoDropFiles in ChangedOptions) and not (csDesigning in ComponentState) and HandleAllocated then if (eoDropFiles in ChangedOptions) and not (csDesigning in ComponentState) and HandleAllocated then
; // ToDo DragAcceptFiles ; // ToDo DragAcceptFiles
if (eoPersistentCaret in ChangedOptions) and HandleAllocated then begin if (ChangedOptions * [eoPersistentCaret, eoNoCaret] <> []) and HandleAllocated then begin
UpdateCaret; UpdateCaret;
if not Focused then if Focused then
FScreenCaret.Visible := (eoPersistentCaret in FOptions); FScreenCaret.Visible := not(eoNoCaret in FOptions)
else
FScreenCaret.Visible := (eoPersistentCaret in FOptions) and not(eoNoCaret in FOptions);
end; end;
if (eoShowSpecialChars in ChangedOptions) then begin if (eoShowSpecialChars in ChangedOptions) then begin
if eoShowSpecialChars in FOptions if eoShowSpecialChars in FOptions