mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-18 18:19:08 +02:00
Editor hints disappear now when a key is pressed.
Shane git-svn-id: trunk@467 -
This commit is contained in:
parent
55200255c1
commit
a80be48fd8
@ -94,9 +94,11 @@ type
|
|||||||
FVisible : Boolean;
|
FVisible : Boolean;
|
||||||
FOnMouseMove: TMouseMoveEvent;
|
FOnMouseMove: TMouseMoveEvent;
|
||||||
FOnMouseDown: TMouseEvent;
|
FOnMouseDown: TMouseEvent;
|
||||||
|
FOnKeyDown: TKeyEvent;
|
||||||
|
|
||||||
Procedure EditorMouseMoved(Sender : TObject;Shift : TShiftState; X,Y : Integer);
|
Procedure EditorMouseMoved(Sender : TObject;Shift : TShiftState; X,Y : Integer);
|
||||||
Procedure EditorMouseDown(Sender : TObject; Button : TMouseButton; Shift : TShiftState; X,Y : Integer);
|
Procedure EditorMouseDown(Sender : TObject; Button : TMouseButton; Shift : TShiftState; X,Y : Integer);
|
||||||
|
Procedure EditorKeyDown(Sender : TObject; var Key : Word; Shift : TShiftState);
|
||||||
Function FindFile(const Value : String) : String;
|
Function FindFile(const Value : String) : String;
|
||||||
|
|
||||||
procedure SetCodeBuffer(NewCodeBuffer: TCodeBuffer);
|
procedure SetCodeBuffer(NewCodeBuffer: TCodeBuffer);
|
||||||
@ -204,6 +206,7 @@ type
|
|||||||
read FOnDeleteBreakPoint write FOnDeleteBreakPoint;
|
read FOnDeleteBreakPoint write FOnDeleteBreakPoint;
|
||||||
property OnMouseMove : TMouseMoveEvent read FOnMouseMove write FOnMouseMove;
|
property OnMouseMove : TMouseMoveEvent read FOnMouseMove write FOnMouseMove;
|
||||||
property OnMouseDown : TMouseEvent read FOnMouseDown write FOnMouseDown;
|
property OnMouseDown : TMouseEvent read FOnMouseDown write FOnMouseDown;
|
||||||
|
property OnKeyDown : TKeyEvent read FOnKeyDown write FOnKeyDown;
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -263,8 +266,9 @@ type
|
|||||||
FHintWIndow : THintWindow;
|
FHintWIndow : THintWindow;
|
||||||
FHintTimer : TTimer;
|
FHintTimer : TTimer;
|
||||||
Procedure HintTimer(sender : TObject);
|
Procedure HintTimer(sender : TObject);
|
||||||
Procedure MouseMove(Sender : TObject; Shift: TShiftstate; X,Y : Integer);
|
Procedure EditorMouseMove(Sender : TObject; Shift: TShiftstate; X,Y : Integer);
|
||||||
Procedure MouseDown(Sender : TObject; Button : TMouseButton; Shift: TShiftstate; X,Y : Integer);
|
Procedure EditorMouseDown(Sender : TObject; Button : TMouseButton; Shift: TShiftstate; X,Y : Integer);
|
||||||
|
// Procedure KeyDown(Sender : TObject; var Key : Word; Shift: TShiftstate);
|
||||||
|
|
||||||
Procedure NextEditor;
|
Procedure NextEditor;
|
||||||
Procedure PrevEditor;
|
Procedure PrevEditor;
|
||||||
@ -1098,6 +1102,7 @@ writeln('TSourceEditor.CreateEditor A ');
|
|||||||
OnSpecialLineColors:=@OnEditorSpecialLineColor;
|
OnSpecialLineColors:=@OnEditorSpecialLineColor;
|
||||||
OnMouseMove := @EditorMouseMoved;
|
OnMouseMove := @EditorMouseMoved;
|
||||||
OnMouseDown := @EditorMouseDown;
|
OnMouseDown := @EditorMouseDown;
|
||||||
|
OnKeyDown := @EditorKeyDown;
|
||||||
Show;
|
Show;
|
||||||
end;
|
end;
|
||||||
if FCodeTemplates<>nil then
|
if FCodeTemplates<>nil then
|
||||||
@ -1451,6 +1456,14 @@ begin
|
|||||||
OnMouseDown(Sender, Button, Shift, X,Y);
|
OnMouseDown(Sender, Button, Shift, X,Y);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Procedure TSourceEditor.EditorKeyDown(Sender : TObject; var Key : Word; Shift :
|
||||||
|
TShiftState);
|
||||||
|
begin
|
||||||
|
if Assigned(ONKeyDown) then
|
||||||
|
OnKeyDown(Sender, Key, Shift);
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------}
|
{------------------------------------------------------------------------}
|
||||||
{ TSourceNotebook }
|
{ TSourceNotebook }
|
||||||
|
|
||||||
@ -2184,9 +2197,8 @@ writeln('TSourceNotebook.NewSE C ');
|
|||||||
Result.EditorComponent.BookMarkOptions.BookmarkImages := MarksImgList;
|
Result.EditorComponent.BookMarkOptions.BookmarkImages := MarksImgList;
|
||||||
Result.PopupMenu:=SrcPopupMenu;
|
Result.PopupMenu:=SrcPopupMenu;
|
||||||
Result.OnEditorChange := @EditorChanged;
|
Result.OnEditorChange := @EditorChanged;
|
||||||
Result.OnMouseMove := @MouseMove;
|
Result.OnMouseMove := @EditorMouseMove;
|
||||||
Result.OnMouseDown := @MouseDown;
|
Result.OnMouseDown := @EditorMouseDown;
|
||||||
|
|
||||||
{$IFDEF IDE_DEBUG}
|
{$IFDEF IDE_DEBUG}
|
||||||
writeln('TSourceNotebook.NewSE end ');
|
writeln('TSourceNotebook.NewSE end ');
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
@ -2858,6 +2870,12 @@ procedure TSourceNotebook.KeyDown(var Key : Word; Shift : TShiftState);
|
|||||||
var i, Command: integer;
|
var i, Command: integer;
|
||||||
Begin
|
Begin
|
||||||
inherited KeyDown(Key,Shift);
|
inherited KeyDown(Key,Shift);
|
||||||
|
|
||||||
|
if FHIntWindow.Visible then
|
||||||
|
FHintWindow.Visible := False;
|
||||||
|
|
||||||
|
FHintTimer.Enabled := False;
|
||||||
|
|
||||||
i := FKeyStrokes.FindKeycode(Key, Shift);
|
i := FKeyStrokes.FindKeycode(Key, Shift);
|
||||||
if i>=0 then begin
|
if i>=0 then begin
|
||||||
Command:=FKeyStrokes[i].Command;
|
Command:=FKeyStrokes[i].Command;
|
||||||
@ -2871,7 +2889,7 @@ Begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
Procedure TSourceNotebook.MouseMove(Sender : TObject; Shift: TShiftstate; X,Y : Integer);
|
Procedure TSourceNotebook.EditorMouseMove(Sender : TObject; Shift: TShiftstate; X,Y : Integer);
|
||||||
begin
|
begin
|
||||||
//writeln('MOUSEMOVE');
|
//writeln('MOUSEMOVE');
|
||||||
if FHintWIndow.Visible then
|
if FHintWIndow.Visible then
|
||||||
@ -2890,6 +2908,7 @@ var
|
|||||||
SE : TSourceEditor;
|
SE : TSourceEditor;
|
||||||
begin
|
begin
|
||||||
FHintTimer.Enabled := False;
|
FHintTimer.Enabled := False;
|
||||||
|
|
||||||
cPosition := Mouse.CursorPos;
|
cPosition := Mouse.CursorPos;
|
||||||
|
|
||||||
cPosition := ScreenToClient(cPosition);
|
cPosition := ScreenToClient(cPosition);
|
||||||
@ -2932,11 +2951,13 @@ begin
|
|||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
Procedure TSourceNotebook.MouseDown(Sender : TObject; Button : TMouseButton; Shift: TShiftstate; X, Y
|
Procedure TSourceNotebook.EditorMouseDown(Sender : TObject; Button : TMouseButton; Shift: TShiftstate; X, Y
|
||||||
: Integer);
|
: Integer);
|
||||||
begin
|
begin
|
||||||
if FHIntWindow.Visible then
|
if FHIntWindow.Visible then
|
||||||
FHintWindow.Visible := False;
|
FHintWindow.Visible := False;
|
||||||
|
|
||||||
|
FHintTimer.Enabled := False;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user