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

added history to identifier completion

Browse Source 
git-svn-id: trunk@2428 -
This commit is contained in:
mattias 2002-08-17 23:41:22 +00:00
parent 66963daa58
commit 389e58ef1e
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
components/synedit/synedit.pp
View File

@ -1532,10 +1532,10 @@ end;
procedure TCustomSynEdit.HideCaret;
begin
//writeln('[TCustomSynEdit.HideCaret]');
//writeln('[TCustomSynEdit.HideCaret] ',Name,' ',sfCaretVisible in fStateFlags,' ',eoPersistentCaret in Options);
if sfCaretVisible in fStateFlags then begin
{$IFDEF SYN_LAZARUS}LCLLinux{$ELSE}Windows{$ENDIF}.HideCaret(Handle);
Exclude(fStateFlags, sfCaretVisible);
if {$IFDEF SYN_LAZARUS}LCLLinux{$ELSE}Windows{$ENDIF}.HideCaret(Handle) then
Exclude(fStateFlags, sfCaretVisible);
end;
end;
@ -3889,7 +3889,7 @@ end;
procedure TCustomSynEdit.ShowCaret;
begin
//writeln(' [TCustomSynEdit.ShowCaret] ShowCaret ',Name,' ',sfCaretVisible in fStateFlags);
//writeln(' [TCustomSynEdit.ShowCaret] ShowCaret ',Name,' ',sfCaretVisible in fStateFlags,' ',eoPersistentCaret in fOptions);
if not (eoNoCaret in Options) and not (sfCaretVisible in fStateFlags) then
begin
{$IFDEF SYN_LAZARUS}
@ -3897,7 +3897,7 @@ begin
{$ENDIF}
if {$IFDEF SYN_LAZARUS}LCLLinux{$ELSE}Windows{$ENDIF}.ShowCaret(Handle) then
begin
//writeln('[TCustomSynEdit.ShowCaret] A ',Name);
//writeln('[TCustomSynEdit.ShowCaret] A ',Name);
Include(fStateFlags, sfCaretVisible);
end;
end;
@ -3910,7 +3910,13 @@ var
cf: TCompositionForm;
{$ENDIF}
begin
if (PaintLock <> 0) {or not Focused} then
if (PaintLock <> 0)
{$IFDEF SYN_LAZARUS}
{or ((not Focused) and (not (eoPersistentCaret in fOptions)))}
{$ELSE}
or not Focused
{$ENDIF}
then
Include(fStateFlags, sfCaretChanged)
else begin
Exclude(fStateFlags, sfCaretChanged);
@ -3926,10 +3932,10 @@ begin
{$ELSE}
SetCaretPos(CX, CY);
{$ENDIF}
//writeln(' [TCustomSynEdit.UpdateCaret] ShowCaret ',Name);
//writeln(' [TCustomSynEdit.UpdateCaret] ShowCaret ',Name);
ShowCaret;
end else begin
//writeln(' [TCustomSynEdit.UpdateCaret] HideCaret ',Name);
//writeln(' [TCustomSynEdit.UpdateCaret] HideCaret ',Name);
HideCaret;
{$IFDEF SYN_LAZARUS}
SetCaretPosEx(Handle,CX, CY);
@ -3938,9 +3944,11 @@ begin
{$ENDIF}
end;
{$IFDEF SYN_MBCSSUPPORT}
cf.dwStyle := CFS_POINT;
cf.ptCurrentPos := Point(CX, CY);
ImmSetCompositionWindow(ImmGetContext(Handle), @cf);
if HandleAllocated then begin
cf.dwStyle := CFS_POINT;
cf.ptCurrentPos := Point(CX, CY);
ImmSetCompositionWindow(ImmGetContext(Handle), @cf);
end;
{$ENDIF}
end;
end;
@ -4095,9 +4103,10 @@ begin
{$ENDIF}
{$IFDEF SYN_LAZARUS}
LastMouseCaret:=Point(-1,-1);
if not (eoPersistentCaret in fOptions) then
if not (eoPersistentCaret in fOptions) then begin
HideCaret;
LCLLinux.DestroyCaret(Handle);
LCLLinux.DestroyCaret(Handle);
end;
{$ELSE}
HideCaret;
Windows.DestroyCaret;
@ -6748,8 +6757,10 @@ begin
{$ENDIF}
{$IFDEF SYN_LAZARUS}
if ((eoPersistentCaret in fOptions) xor (eoPersistentCaret in OldOptions))
and HandleAllocated then
and HandleAllocated then begin
SetCaretRespondToFocus(Handle,not (eoPersistentCaret in fOptions));
UpdateCaret;
end;
if ((eoShowCtrlMouseLinks in fOptions)
xor (eoShowCtrlMouseLinks in OldOptions))
and HandleAllocated then

9
lcl/include/winapi.inc
View File

@ -304,6 +304,12 @@ begin
Result := InterfaceObject.GetCaretPos(lpPoint);
end;
function GetCaretRespondToFocus(handle: HWND;
var ShowHideOnFocus: boolean): Boolean;
begin
Result := InterfaceObject.GetCaretRespondToFocus(handle,ShowHideOnFocus);
end;
{------------------------------------------------------------------------------
Function: GetClientBounds
Params: handle:
@ -1515,6 +1521,9 @@ end;
{ =============================================================================
$Log$
Revision 1.69 2002/12/30 17:24:08 mattias
added history to identifier completion
Revision 1.68 2002/12/27 17:12:38 mattias
added more Delphi win32 compatibility functions

4
lcl/include/winapih.inc
View File

@ -108,6 +108,7 @@ Function GetActiveWindow : HWND; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetBitmapBits(Bitmap: HBITMAP; Count: Longint; Bits: Pointer): Longint; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetCapture : HWND; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetCaretPos(var lpPoint: TPoint): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetCaretRespondToFocus(handle: HWND; var ShowHideOnFocus: boolean): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
Function GetClientBounds(handle : HWND; var Rect: TRect) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
Function GetClientRect(handle : HWND; var Rect: TRect) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
Function GetClipBox(DC : hDC; lpRect : PRect) : Longint; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
@ -362,6 +363,9 @@ Function RGB(R, G, B : Byte) : TColorRef;
{ =============================================================================
$Log$
Revision 1.62 2002/12/30 17:24:08 mattias
added history to identifier completion
Revision 1.61 2002/12/27 17:12:38 mattias
added more Delphi win32 compatibility functions