paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-02 10:59:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

synedit: renamed OnCtrlLeftMouseUp to OnClickLink, fixed Ctrl+MouseLeft jump

Browse Source 
git-svn-id: trunk@15769 -
This commit is contained in:
mattias 2008-07-13 20:16:15 +00:00
parent eb3a29e663
commit 5972f2bf98
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/synedit/synedit.pp
View File

@ -457,7 +457,7 @@ type
fOnSpecialLineColors: TSpecialLineColorsEvent;
fOnStatusChange: TStatusChangeEvent;
{$IFDEF SYN_LAZARUS}
FOnCtrlLeftMouseUp: TMouseEvent;
FOnClickLink: TMouseEvent;
{$ENDIF}
{$IFDEF SYN_LAZARUS}
@ -991,7 +991,7 @@ protected
property OnMouseMove;
property OnMouseUp;
{$IFDEF SYN_LAZARUS}
property OnCtrlLeftMouseUp : TMouseEvent read FOnCtrlLeftMouseUp write FOnCtrlLeftMouseUp;
property OnClickLink : TMouseEvent read FOnClickLink write FOnClickLink;
property OnMouseEnter;
property OnMouseLeave;
{$ENDIF}
@ -2637,9 +2637,11 @@ begin
{$IFDEF SYN_LAZARUS}
if (eoShowCtrlMouseLinks in Options)
and not(wasDragging)
and (Button=mbLeft) and (Shift=[ssCtrl])
and assigned(FOnCtrlLeftMouseUp)
then FOnCtrlLeftMouseUp(Self, Button, Shift, X,Y);;
and (Button=mbLeft) and (Shift=[ssLeft,ssCtrl])
and assigned(FOnClickLink)
then begin
FOnClickLink(Self, Button, Shift, X,Y);;
end;
{$ENDIF}
//DebugLn('TCustomSynEdit.MouseUp END Mouse=',X,',',Y,' Caret=',CaretX,',',CaretY,', BlockBegin=',BlockBegin.X,',',BlockBegin.Y,' BlockEnd=',BlockEnd.X,',',BlockEnd.Y);
end;

6
ide/main.pp
View File

@ -359,7 +359,7 @@ type
procedure OnSrcNoteBookActivated(Sender: TObject);
procedure OnSrcNoteBookAddJumpPoint(ACaretXY: TPoint; ATopLine: integer;
APageIndex: integer; DeleteForwardHistory: boolean);
procedure OnSrcNoteBookCtrlMouseUp(Sender: TObject;
procedure OnSrcNoteBookClickLink(Sender: TObject;
Button: TMouseButton; Shift: TShiftstate; X, Y: Integer);
procedure OnSrcNotebookDeleteLastJumPoint(Sender: TObject);
procedure OnSrcNotebookEditorVisibleChanged(Sender: TObject);
@ -1669,7 +1669,7 @@ begin
SourceNotebook.OnActivate := @OnSrcNoteBookActivated;
SourceNotebook.OnAddJumpPoint := @OnSrcNoteBookAddJumpPoint;
SourceNotebook.OnCloseClicked := @OnSrcNotebookFileClose;
SourceNotebook.OnCtrlLeftMouseUp := @OnSrcNoteBookCtrlMouseUp;
SourceNotebook.OnClickLink := @OnSrcNoteBookClickLink;
SourceNotebook.OnCurrentCodeBufferChanged:=@OnSrcNotebookCurCodeBufferChanged;
SourceNotebook.OnDeleteLastJumpPoint := @OnSrcNotebookDeleteLastJumPoint;
SourceNotebook.OnEditorVisibleChanged := @OnSrcNotebookEditorVisibleChanged;
@ -2832,7 +2832,7 @@ begin
Key := VK_UNKNOWN;
end;
procedure TMainIDE.OnSrcNoteBookCtrlMouseUp(Sender: TObject;
procedure TMainIDE.OnSrcNoteBookClickLink(Sender: TObject;
Button: TMouseButton; Shift: TShiftstate; X, Y: Integer);
var
ActiveSrcEdit: TSourceEditor;

34
ide/sourceeditor.pp
View File

@ -136,7 +136,7 @@ type
FVisible: Boolean;
FOnMouseMove: TMouseMoveEvent;
FOnMouseDown: TMouseEvent;
FOnCtrlLeftMouseUp: TMouseEvent;
FOnClickLink: TMouseEvent;
FOnMouseWheel : tMouseWheelEvent;
FOnKeyDown: TKeyEvent;
@ -145,7 +145,7 @@ type
Procedure EditorMouseMoved(Sender: TObject; Shift: TShiftState; X,Y:Integer);
Procedure EditorMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X,Y: Integer);
Procedure EditorCtrlLeftMouseUp(Sender: TObject; Button: TMouseButton;
Procedure EditorClickLink(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X,Y: Integer);
procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
@ -361,7 +361,7 @@ type
write FOnEditorChange;
property OnMouseMove: TMouseMoveEvent read FOnMouseMove write FOnMouseMove;
property OnMouseDown: TMouseEvent read FOnMouseDown write FOnMouseDown;
property OnCtrlLeftMouseUp: TMouseEvent read FOnCtrlLeftMouseUp write FOnCtrlLeftMouseUp;
property OnClickLink: TMouseEvent read FOnClickLink write FOnClickLink;
property OnMouseWheel: TMouseWheelEvent read FOnMouseWheel write FOnMouseWheel;
property OnKeyDown: TKeyEvent read FOnKeyDown write FOnKeyDown;
property Owner: TComponent read FAOwner;
@ -476,7 +476,7 @@ type
FOnAddJumpPoint: TOnAddJumpPoint;
FOnAddWatchAtCursor: TOnAddWatch;
FOnCloseClicked: TOnCloseSrcEditor;
FOnCtrlLeftMouseUp: TMouseEvent;
FOnClickLink: TMouseEvent;
FOnCurrentCodeBufferChanged: TNotifyEvent;
FOnDeleteLastJumpPoint: TNotifyEvent;
FOnEditorChanged: TNotifyEvent;
@ -576,7 +576,7 @@ type
X,Y: Integer);
procedure EditorMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftstate; X,Y: Integer);
procedure EditorCtrlLeftMouseUp(Sender: TObject; Button: TMouseButton;
procedure EditorClickLink(Sender: TObject; Button: TMouseButton;
Shift: TShiftstate; X,Y: Integer);
procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState;
@ -755,8 +755,8 @@ type
read FOnAddJumpPoint write FOnAddJumpPoint;
property OnCloseClicked: TOnCloseSrcEditor
read FOnCloseClicked write FOnCloseClicked;
property OnCtrlLeftMouseUp: TMouseEvent
read FOnCtrlLeftMouseUp write FOnCtrlLeftMouseUp;
property OnClickLink: TMouseEvent
read FOnClickLink write FOnClickLink;
property OnDeleteLastJumpPoint: TNotifyEvent
read FOnDeleteLastJumpPoint write FOnDeleteLastJumpPoint;
property OnEditorVisibleChanged: TNotifyEvent
@ -2260,7 +2260,7 @@ Begin
OnMouseMove := @EditorMouseMoved;
OnMouseWheel := @EditorMouseWheel;
OnMouseDown := @EditorMouseDown;
OnCtrlLeftMouseUp := @EditorCtrlLeftMouseUp;
OnClickLink := @EditorClickLink;
OnKeyDown := @EditorKeyDown;
end;
if FCodeTemplates<>nil then
@ -2665,11 +2665,12 @@ begin
OnMouseDown(Sender, Button, Shift, X,Y);
end;
procedure TSourceEditor.EditorCtrlLeftMouseUp(Sender: TObject; Button: TMouseButton;
procedure TSourceEditor.EditorClickLink(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
if Assigned(OnCtrlLeftMouseUp) then
OnCtrlLeftMouseUp(Sender, Button, Shift, X,Y);
DebugLn(['TSourceEditor.EditorClickLink ']);
if Assigned(OnClickLink) then
OnClickLink(Sender, Button, Shift, X,Y);
end;
Procedure TSourceEditor.EditorKeyDown(Sender: TObject; var Key: Word; Shift :
@ -4388,7 +4389,7 @@ Begin
Result.OnMouseMove := @EditorMouseMove;
Result.OnMouseDown := @EditorMouseDown;
Result.OnMouseWheel := @EditorMouseWheel;
Result.OnCtrlLeftMouseUp := @EditorCtrlLeftMouseUp;
Result.OnClickLink := @EditorClickLink;
Result.OnKeyDown :=@EditorKeyDown;
Result.EditorComponent.EndUpdate;
@ -6231,13 +6232,12 @@ begin
HideHint;
end;
procedure TSourceNotebook.EditorCtrlLeftMouseUp(Sender: TObject; Button: TMouseButton;
procedure TSourceNotebook.EditorClickLink(Sender: TObject; Button: TMouseButton;
Shift: TShiftstate; X, Y: Integer);
begin
// CtrlLeftMouseUp = Find Declaration
if Assigned(FOnCtrlLeftMouseUp) then begin
FOnCtrlLeftMouseUp(Sender,Button,Shift,X,Y);
end;
// click link = Find Declaration
if Assigned(FOnClickLink) then
FOnClickLink(Sender,Button,Shift,X,Y);
end;
procedure TSourceNotebook.EditorKeyDown(Sender: TObject; var Key: Word;