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

IDE, SynEdit: fix configuring column count for gutter-marks

Browse Source
This commit is contained in:
Martin 2024-03-13 22:47:38 +01:00
parent 46516b161f
commit 7400dc43b0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/synedit/synguttermarks.pp
View File

@ -32,7 +32,7 @@ type
function PaintMarks(aScreenLine: Integer; Canvas : TCanvas; AClip : TRect; function PaintMarks(aScreenLine: Integer; Canvas : TCanvas; AClip : TRect;
var aFirstCustomColumnIdx: integer): Boolean; var aFirstCustomColumnIdx: integer): Boolean;
Procedure PaintLine(aScreenLine: Integer; Canvas : TCanvas; AClip : TRect); virtual; Procedure PaintLine(aScreenLine: Integer; Canvas : TCanvas; AClip : TRect); virtual;
property WantedColumns: integer read FWantedColumns;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;

5
ide/sourcesyneditor.pas
View File

@ -2356,12 +2356,15 @@ end;
function TIDESynGutterMarks.PreferedWidthAtCurrentPPI: Integer; function TIDESynGutterMarks.PreferedWidthAtCurrentPPI: Integer;
var var
img: TScaledImageListResolution; img: TScaledImageListResolution;
c: Integer;
begin begin
if Assigned(SourceEditorMarks) and Assigned(SourceEditorMarks.ImgList) then if Assigned(SourceEditorMarks) and Assigned(SourceEditorMarks.ImgList) then
begin begin
c := WantedColumns;
if c <= 0 then c := 2;
img := GetImgListRes(nil, SourceEditorMarks.ImgList); img := GetImgListRes(nil, SourceEditorMarks.ImgList);
// + 1 => right margin // + 1 => right margin
Result := img.Width * 2 + LeftMarginAtCurrentPPI + Scale96ToFont(1); Result := img.Width * c + LeftMarginAtCurrentPPI + Scale96ToFont(1);
end else end else
Result := inherited PreferedWidthAtCurrentPPI; Result := inherited PreferedWidthAtCurrentPPI;
end; end;