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

TLvlGraph: De-duplicate call to MinimizeOverlappings. Incompatible change of OnMinimizeOverlappings:

Browse Source 
- added Handled param
- made all param into "var param", so the callback can adjust them

git-svn-id: trunk@60886 -
This commit is contained in:
martin 2019-04-07 19:52:03 +00:00
parent dfe4f1faa2
commit 4e2c794836
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/lazcontrols/lvlgraphctrl.pas
View File

@ -457,8 +457,9 @@ type
);
TLvlGraphControlFlags = set of TLvlGraphControlFlag;
TLvlGraphMinimizeOverlappingsEvent = procedure(MinPos: integer = 0;
NodeGapInFront: integer = 1; NodeGapBehind: integer = 1) of object;
TLvlGraphMinimizeOverlappingsEvent = procedure(var MinPos: integer;
var NodeGapInFront: integer; var NodeGapBehind: integer;
var Handled: Boolean) of object;
TLvlGraphDrawStep = (
lgdsBackground,
lgdsHeader,
@ -2728,10 +2729,13 @@ end;
procedure TCustomLvlGraphControl.DoMinimizeOverlappings(MinPos: integer;
NodeGapInFront: integer; NodeGapBehind: integer);
var
Handled: Boolean;
begin
Handled := False;
if Assigned(OnMinimizeOverlappings) then
OnMinimizeOverlappings(MinPos,NodeGapInFront,NodeGapBehind)
else
OnMinimizeOverlappings(MinPos,NodeGapInFront,NodeGapBehind,Handled);
if not Handled then
Graph.MinimizeOverlappings(MinPos,NodeGapInFront,NodeGapBehind);
end;
@ -3008,8 +3012,7 @@ begin
FPixelPerWeight);
// position nodes without overlapping
DoMinimizeOverlappings;
Graph.MinimizeOverlappings(HeaderHeight,GapInFront,GapBehind);
DoMinimizeOverlappings(HeaderHeight,GapInFront,GapBehind);
// node colors
if NodeStyle.Coloring=lgncRGB then