paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 05:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Clean-up CtrlMouseLink Code

Browse Source 
git-svn-id: trunk@20497 -
This commit is contained in:
martin 2009-06-07 16:24:00 +00:00
parent 9b4e327536
commit bcedde9431
2 changed files with 90 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
components/synedit/synedit.pp
View File

@ -342,11 +342,6 @@ type
fInserting: Boolean;
{$IFDEF SYN_LAZARUS}
fLastMouseCaret: TPoint; // physical (screen)
fLastControlIsPressed: boolean;
fLastCtrlMouseLinkY: integer;
{TODO: MFR move to markup}
fLastCtrlMouseLinkX1: integer; // logical (byte)
fLastCtrlMouseLinkX2: integer; // logical (byte)
fHighlighterNeedsUpdateStartLine: integer; // 1 based, 0 means invalid
fHighlighterNeedsUpdateEndLine: integer; // 1 based, 0 means invalid
FBeautifier: TSynCustomBeautifier;
@ -579,8 +574,6 @@ type
procedure UndoRedoAdded(Sender: TObject);
procedure UnlockUndo;
procedure UpdateCaret;
procedure UpdateCtrlMouse;
function IsCtrlMouseShiftState(AShift: TShiftState): Boolean;
procedure UpdateScrollBars;
protected
procedure CreateHandle; override;
@ -1674,8 +1667,6 @@ begin
fFontDummy.Pitch := SynDefaultFontPitch;
fFontDummy.Quality := SynDefaultFontQuality;
fLastMouseCaret := Point(-1,-1);
fLastCtrlMouseLinkY := -1;
fLastControlIsPressed := false;
fBlockIndent := 2;
{$ELSE}
Color := clWindow;
@ -2258,8 +2249,8 @@ begin
{$ENDIF}
inherited;
{$IFDEF SYN_LAZARUS}
if fLastControlIsPressed <> IsCtrlMouseShiftState(GetKeyShiftState) then
UpdateCtrlMouse;
if assigned(fMarkupCtrlMouse) then
fMarkupCtrlMouse.UpdateCtrlState;
{$ENDIF}
Data := nil;
C := #0;
@ -2296,8 +2287,8 @@ begin
,' Shift=',ssShift in Shift,' Ctrl=',ssCtrl in Shift,' Alt=',ssAlt in Shift]);
{$ENDIF}
inherited KeyUp(Key, Shift);
if fLastControlIsPressed<>IsCtrlMouseShiftState(GetKeyShiftState) then
UpdateCtrlMouse;
if assigned(fMarkupCtrlMouse) then
fMarkupCtrlMouse.UpdateCtrlState;
end;
{$ENDIF}
@ -2634,7 +2625,9 @@ begin
if (X >= fGutterWidth) and (X < ClientWidth - ScrollBarWidth)
and (Y >= 0) and (Y < ClientHeight - ScrollBarWidth)
then begin
if (Cursor <> crHandPoint) or not IsCtrlMouseShiftState(Shift) then
if (Cursor <> crHandPoint) or
not(assigned(fMarkupCtrlMouse) and fMarkupCtrlMouse.IsCtrlMouseShiftState(GetKeyShiftState))
then
Cursor := crIBeam;
end
else
@ -3578,28 +3571,6 @@ var
CurLine:=-1;
end;
procedure CalculateCtrlMouseLink;
begin
fLastCtrlMouseLinkY:=-1;
fMarkupCtrlMouse.CtrlMouseLine:=-1;
if (fLastMouseCaret.X<1) or (fLastMouseCaret.Y<1)
or (not fLastControlIsPressed) then
exit;
GetWordBoundsAtRowCol(PhysicalToLogicalPos(fLastMouseCaret),
fLastCtrlMouseLinkX1,fLastCtrlMouseLinkX2);
if
not IsLinkable(
fLastMouseCaret.Y, fLastCtrlMouseLinkX1, fLastCtrlMouseLinkX2)
then
exit;
fLastCtrlMouseLinkY:=fLastMouseCaret.Y;
with fMarkupCtrlMouse do begin
CtrlMouseLine := fLastCtrlMouseLinkY;
CtrlMouseX1 := fLastCtrlMouseLinkX1;
CtrlMouseX2 := fLastCtrlMouseLinkX2;
end;
end;
{ end local procedures }
var
@ -3645,7 +3616,6 @@ begin
DrawLeft := AClip.Left;
if (LastLine >= FirstLine) then begin
CalculateCtrlMouseLink;
// Paint the visible text lines. To make this easier, compute first the
// necessary information about the selected area: is there any visible
// selected area, and what are its lines / columns?
@ -5104,55 +5074,6 @@ begin
InvalidateGutter;
end;
procedure TCustomSynEdit.UpdateCtrlMouse;
procedure doNotShowLink;
begin
if fLastCtrlMouseLinkY>0 then begin
Invalidate;
Cursor := crIBeam;
end;
end;
var
NewY, NewX1, NewX2: Integer;
begin
fLastControlIsPressed:=IsCtrlMouseShiftState(GetKeyShiftState);
if fLastControlIsPressed and (fLastMouseCaret.X>0) and (fLastMouseCaret.Y>0) then begin
// show link
NewY:=fLastMouseCaret.Y;
GetWordBoundsAtRowCol(PhysicalToLogicalPos(fLastMouseCaret),NewX1,NewX2);
if IsLinkable(NewY, NewX1, NewX2) then begin
// there is a word to underline as link
if (NewY<>fLastCtrlMouseLinkY)
or (NewX1<>fLastCtrlMouseLinkX1)
or (NewX2<>fLastCtrlMouseLinkX2)
then begin
Invalidate;
Cursor := crHandPoint;
end;
end else
doNotShowLink // there is no link
end else
doNotShowLink;
end;
function TCustomSynEdit.IsCtrlMouseShiftState(AShift: TShiftState): Boolean;
var
act: TSynEditMouseAction;
i: Integer;
begin
Result := False;
// todo: check FMouseSelActions if over selection?
for i := 0 to FMouseActions.Count - 1 do begin
act := FMouseActions.Items[i];
if (act.Command = emcMouseLink) and (act.Option = emcoMouseLinkShow) and
act.IsMatchingShiftState(AShift)
then
exit(True);
end;
end;
procedure TCustomSynEdit.ClearBookMark(BookMark: Integer);
begin
if (BookMark in [0..9]) and assigned(fBookMarks[BookMark]) then begin
@ -5672,7 +5593,8 @@ procedure TCustomSynEdit.SetLastMouseCaret(const AValue: TPoint);
begin
if (FLastMouseCaret.X=AValue.X) and (FLastMouseCaret.Y=AValue.Y) then exit;
FLastMouseCaret:=AValue;
UpdateCtrlMouse;
if assigned(fMarkupCtrlMouse) then
fMarkupCtrlMouse.LastMouseCaret := AValue;
end;
{$ENDIF}
@ -7324,7 +7246,8 @@ begin
if FMouseActions[i].Command = emcMouseLink then
FMouseActions.Delete(i);
end;
UpdateCtrlMouse;
if assigned(fMarkupCtrlMouse) then
fMarkupCtrlMouse.UpdateCtrlMouse;
end;
// eoDragDropEditing
if (eoDragDropEditing in ChangedOptions) then begin

80
components/synedit/syneditmarkupctrlmouselink.pp
View File

@ -26,7 +26,8 @@ unit SynEditMarkupCtrlMouseLink;
interface
uses
Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, Controls, LCLProc;
Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses,
SynEditMouseCmds, Controls, LCLProc;
type
@ -38,6 +39,16 @@ type
FCtrlMouseX1: Integer;
FCtrlMouseX2: Integer;
FCurX1, FCurX2: Integer;
FLastControlIsPressed: boolean;
FLastMouseCaret: TPoint;
procedure SetLastMouseCaret(const AValue: TPoint);
public
procedure UpdateCtrlState;
procedure UpdateCtrlMouse;
function IsCtrlMouseShiftState(AShift: TShiftState): Boolean;
property LastMouseCaret: TPoint read FLastMouseCaret write SetLastMouseCaret;
public
constructor Create(ASynEdit: TCustomControl);
@ -56,9 +67,76 @@ uses SynEdit;
{ TSynEditMarkupCtrlMouseLink }
procedure TSynEditMarkupCtrlMouseLink.SetLastMouseCaret(const AValue: TPoint);
begin
if (FLastMouseCaret.X = AValue.X) and (FLastMouseCaret.Y = AValue.Y) then exit;
FLastMouseCaret := AValue;
UpdateCtrlMouse;
end;
procedure TSynEditMarkupCtrlMouseLink.UpdateCtrlState;
begin
if FLastControlIsPressed <> IsCtrlMouseShiftState(GetKeyShiftState) then
UpdateCtrlMouse;
end;
procedure TSynEditMarkupCtrlMouseLink.UpdateCtrlMouse;
procedure doNotShowLink;
begin
if CtrlMouseLine > 0 then
TSynEdit(SynEdit).Invalidate;
TSynEdit(SynEdit).Cursor := crIBeam;
CtrlMouseLine:=-1;
end;
var
NewY, NewX1, NewX2: Integer;
begin
FLastControlIsPressed := IsCtrlMouseShiftState(GetKeyShiftState);
if FLastControlIsPressed and (LastMouseCaret.X>0) and (LastMouseCaret.Y>0) then begin
// show link
NewY := LastMouseCaret.Y;
TSynEdit(SynEdit).GetWordBoundsAtRowCol(TSynEdit(SynEdit).PhysicalToLogicalPos(LastMouseCaret),NewX1,NewX2);
if TSynEdit(SynEdit).IsLinkable(NewY, NewX1, NewX2) then begin
// there is a word to underline as link
if (NewY <> CtrlMouseLine)
or (NewX1 <> CtrlMouseX1)
or (NewX2 <> CtrlMouseX2)
then begin
CtrlMouseLine := fLastMouseCaret.Y;
CtrlMouseX1 := NewX1;
CtrlMouseX2 := NewX2;
TSynEdit(SynEdit).Invalidate;
TSynEdit(SynEdit).Cursor := crHandPoint;
end;
end
else
doNotShowLink // there is no link
end else
doNotShowLink;
end;
function TSynEditMarkupCtrlMouseLink.IsCtrlMouseShiftState(AShift: TShiftState): Boolean;
var
act: TSynEditMouseAction;
i: Integer;
begin
Result := False;
// todo: check FMouseSelActions if over selection?
for i := 0 to TSynEdit(SynEdit).MouseActions.Count - 1 do begin
act := TSynEdit(SynEdit).MouseActions.Items[i];
if (act.Command = emcMouseLink) and (act.Option = emcoMouseLinkShow) and
act.IsMatchingShiftState(AShift)
then
exit(True);
end;
end;
constructor TSynEditMarkupCtrlMouseLink.Create(ASynEdit: TCustomControl);
begin
inherited Create(ASynEdit);
FLastControlIsPressed := false;
FCtrlMouseLine:=-1;
MarkupInfo.Style := [];
MarkupInfo.StyleMask := [];