paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 22:38:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

lcl: control: apply constraints to new size in DoAutoAdjustLayout and update top/left if bottom/right aligned. Fixes issue #31772

Browse Source 
git-svn-id: trunk@54927 -
This commit is contained in:
ondrej 2017-05-14 14:28:08 +00:00
parent 2d7967420e
commit 043c32411e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/include/control.inc
View File

@ -3003,7 +3003,8 @@ procedure TControl.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double);
var
AAWidth, AAHeight: Boolean;
NewLeft, NewTop, NewWidth, NewHeight, NewRight, NewBottom, OldWidth, OldHeight: Integer;
NewLeft, NewTop, NewWidth, NewHeight, NewRight, NewBottom, OldWidth, OldHeight,
BeforeConstraintsWidth, BeforeConstraintsHeight: Integer;
begin
// Apply the changes
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
@ -3066,20 +3067,25 @@ begin
if AAHeight then
NewHeight := Round(Height * AYProportion);
if AAWidth then
BorderSpacing.AutoAdjustLayout(AXProportion, AYProportion);
Constraints.AutoAdjustLayout(AXProportion, AYProportion);
BeforeConstraintsWidth := NewWidth;
NewWidth := Constraints.MinMaxWidth(NewWidth);
BeforeConstraintsHeight := NewHeight;
NewHeight := Constraints.MinMaxHeight(NewHeight);
if AAWidth or (BeforeConstraintsWidth<>NewWidth) then
begin
if akRight in Anchors then
NewLeft := NewLeft-NewWidth+OldWidth;
end;
if AAHeight then
if AAHeight or (BeforeConstraintsHeight<>NewHeight) then
begin
if akBottom in Anchors then
NewTop := NewTop-NewHeight+OldHeight;
end;
BorderSpacing.AutoAdjustLayout(AXProportion, AYProportion);
Constraints.AutoAdjustLayout(AXProportion, AYProportion);
SetBounds(NewLeft, NewTop, NewWidth, NewHeight);
finally
EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TControl.DoAutoAdjustLayout'){$ENDIF};