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

SynEdit: some refactor for the gutter separator line

Browse Source 
git-svn-id: trunk@18057 -
This commit is contained in:
martin 2009-01-02 17:17:18 +00:00
parent aa53788f4b
commit 50dff3b38e
1 changed files with 78 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
components/synedit/syngutter.pp
View File

@ -121,6 +121,7 @@ type
FCodeFoldGutter: TSynGutterPartBase;
FMarkGutter: TSynGutterPartBase;
FChangesGutter: TSynGutterPartBase;
FSeparatorGutter: TSynGutterPartBase;
FEdit: TSynEditBase;
// FFoldView: TSynEditFoldedView;
@ -144,8 +145,11 @@ type
function GetPartGutter(Index : Integer) : TSynGutterPartBase;
property GutterPart[Index: Integer]: TSynGutterPartBase read GetPartGutter;
private
function GetGutterPartCount: integer;
function GetSeparatorIndex: integer;
procedure SetAllowSkipGutterSeparatorDraw(const AValue: Boolean);
procedure SetLeftOffset(Value: integer);
procedure SetSeparatorIndex(const AValue: integer);
// Forward to Code Folding
procedure SetShowCodeFolding(const Value: boolean);
procedure SetCodeFoldingWidth(const AValue: integer);
@ -171,7 +175,6 @@ type
protected
procedure DoDefaultGutterClick(Sender: TObject; X, Y, Line: integer;
mark: TSynEditMark);
function NeedSeparatorLine: Boolean;
public
constructor Create(AOwner : TSynEditBase; AFoldView : TSynEditFoldedView;
ABookMarkOpt: TSynBookMarkOpt; ATextDrawer: TheTextDrawer);
@ -181,6 +184,8 @@ type
function RealGutterWidth(CharWidth: integer): integer;
procedure DoOnGutterClick(X, Y: integer);
procedure AutoSizeDigitCount(LinesCount: integer); // Forward to Line Number
property GutterPartCount: integer read GetGutterPartCount;
property SeparatorIndex: integer read GetSeparatorIndex write SetSeparatorIndex;
property OnGutterClick: TGutterClickEvent
read FOnGutterClick write FOnGutterClick;
property OnChange: TNotifyEvent read FOnChange write FOnChange;
@ -219,6 +224,16 @@ type
default 2;
end;
{ TSynGutterSeparator }
TSynGutterSeparator = class(TSynGutterPartBase)
public
constructor Create(AOwner: TSynEditBase; AFoldView: TSynEditFoldedView);
procedure Paint(Canvas: TCanvas; AClip: TRect; FirstLine, LastLine: integer); override;
function RealGutterWidth(CharWidth: integer): integer; override;
end;
implementation
uses
SynEdit, SynGutterLineNumber, SynGutterCodeFolding, SynGutterMarks, SynGutterChanges;
@ -419,6 +434,9 @@ begin
FChangesGutter := TSynGutterChanges.Create(AOwner, AFoldView);
FGutterPartList.Add(FChangesGutter);
FSeparatorGutter := TSynGutterSeparator.Create(AOwner, AFoldView);
FGutterPartList.Add(FSeparatorGutter);
FCodeFoldGutter := TSynGutterCodeFolding.Create(AOwner, AFoldView);
FGutterPartList.Add(FCodeFoldGutter);
@ -477,8 +495,6 @@ begin
end;
Result := FLeftOffset + FRightOffset;
if NeedSeparatorLine then
Inc(Result, 2); // 2 for the separator line
for i := FGutterPartList.Count-1 downto 0 do
Result := Result + GutterPart[i].RealGutterWidth(CharWidth);
@ -489,6 +505,19 @@ begin
Result := TSynGutterPartBase(FGutterPartList[Index]);
end;
function TSynGutter.GetGutterPartCount: integer;
begin
result := FGutterPartList.Count;
end;
function TSynGutter.GetSeparatorIndex: integer;
begin
if FSeparatorGutter.Visible then
Result := FGutterPartList.IndexOf(FSeparatorGutter)
else
Result := -1;
end;
function TSynGutter.GetMarkupInfoCodeFoldingTree: TSynSelectedColor;
begin
Result := TSynGutterCodeFolding(FCodeFoldGutter).MarkupInfoCodeFoldingTree;
@ -513,6 +542,15 @@ begin
end;
end;
procedure TSynGutter.SetSeparatorIndex(const AValue: integer);
begin
if AValue < 0 then
FSeparatorGutter.Visible := False
else
FGutterPartList.Move(FGutterPartList.IndexOf(FSeparatorGutter), AValue);
DoChange(Self);
end;
function TSynGutter.GetShowChanges: Boolean;
begin
Result := TSynGutterChanges(FChangesGutter).Visible;
@ -628,15 +666,6 @@ begin
GutterPart[i].DoOnGutterClick(X, Y);
end;
function TSynGutter.NeedSeparatorLine: Boolean;
begin
Result :=
not AllowSkipGutterSeparatorDraw or
(FCodeFoldGutter = nil) or
not FCodeFoldGutter.Visible or
(FGutterPartList.IndexOf(FCodeFoldGutter) <> FGutterPartList.Count - 1);
end;
procedure TSynGutter.Paint(Canvas: TCanvas; AClip: TRect; FirstLine, LastLine: integer);
var
i: integer;
@ -672,23 +701,6 @@ begin
GutterPart[i].Paint(Canvas, rcLine, FirstLine, LastLine);
end;
end;
// draw gutter separator if visible and last visible part is not a fold tree
if NeedSeparatorLine and (AClip.Right >= TSynEdit(FEdit).GutterWidth - 2) then
with Canvas do
begin
Pen.Color := {$IFDEF SYN_LAZARUS}clWhite{$ELSE}clBtnHighlight{$ENDIF};
Pen.Width := 1;
with AClip do
begin
MoveTo(TSynEdit(FEdit).GutterWidth - 2, Top);
LineTo(TSynEdit(FEdit).GutterWidth - 2, Bottom);
Pen.Color := {$IFDEF SYN_LAZARUS}clDkGray{$ELSE}clBtnShadow{$ENDIF};
MoveTo(TSynEdit(FEdit).GutterWidth - 1, Top);
LineTo(TSynEdit(FEdit).GutterWidth - 1, Bottom);
end;
end;
end;
{ TSynGutterPartBase }
@ -846,5 +858,42 @@ begin
end;
{ TSynGutterSeparator }
constructor TSynGutterSeparator.Create(AOwner: TSynEditBase; AFoldView: TSynEditFoldedView);
begin
Inherited Create;
Width := 2;
end;
procedure TSynGutterSeparator.Paint(Canvas: TCanvas; AClip: TRect; FirstLine, LastLine: integer);
var
i: integer;
rcLine: TRect;
dc: HDC;
begin
with Canvas do
begin
Pen.Color := {$IFDEF SYN_LAZARUS}clWhite{$ELSE}clBtnHighlight{$ENDIF};
Pen.Width := 1;
with AClip do
begin
MoveTo(AClip.Left, AClip.Top);
LineTo(AClip.Left, AClip.Bottom);
Pen.Color := {$IFDEF SYN_LAZARUS}clDkGray{$ELSE}clBtnShadow{$ENDIF};
MoveTo(AClip.Left+1, AClip.Top);
LineTo(AClip.Left+1, AClip.Bottom);
end;
end;
end;
function TSynGutterSeparator.RealGutterWidth(CharWidth: integer): integer;
begin
If Visible then
Result := Width
else
Result := 0;
end;
end.