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

LCL: Allow changing ToolBar separator's width. Issue #25291, patch from Vojtech Cihak.

Browse Source 
git-svn-id: trunk@46741 -
This commit is contained in:
juha 2014-11-01 21:44:44 +00:00
parent bccb960c29
commit 263412374c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/include/toolbar.inc
View File

@ -730,6 +730,7 @@ var
AdjustClientFrame: TRect;
i: Integer;
GrowSide: TAnchorKind; // when a line is full, grow the TToolBar in this direction
SeparatorWidthChange: Boolean;
begin
//DebugLn(['WrapButtons ',DbgSName(Self),' Wrapable=',Wrapable,' ',dbgs(BoundsRect),' Vertical=',IsVertical,' RTL=',UseRightToLeftAlignment,' Simulate=',Simulate]);
Result := True;
@ -828,6 +829,12 @@ begin
w := CurControl.Constraints.MinMaxWidth(w);
h := CurControl.Constraints.MinMaxHeight(h);
SeparatorWidthChange := (CurControl is TToolButton) and
(TToolButton(CurControl).Style in [tbsSeparator, tbsDivider]);
if SeparatorWidthChange then begin
SeparatorWidthChange := (w <> CurControl.Width);
w := CurControl.Width;
end;
if (CurControl.Left <> x) or (CurControl.Top <> y) or
(CurControl.Width <> w) or (CurControl.Height <> h) then
begin
@ -835,7 +842,10 @@ begin
if not Simulate then
begin
//DebugLn(['TToolBar.WrapButtons moving child: ',DbgSName(CurControl),' Old=',dbgs(CurControl.BoundsRect),' New=',dbgs(Bounds(x,y,w,h))]);
CurControl.SetBounds(x,y,w,h); // Note: do not use SetBoundsKeepBase
if SeparatorWidthChange then
CurControl.SetBoundsKeepBase(x,y,w,h)
else
CurControl.SetBounds(x,y,w,h);
//DebugLn(['TToolBar.WrapButtons moved child: ',DbgSName(CurControl),' ',dbgs(CurControl.BoundsRect)]);
end;
end;