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

LCL: AnchorDocking: Fixed sites can be overlapped after minimize\unminimize. Issue #34614 Patch by Andrey Zubarev

Browse Source 
git-svn-id: trunk@59809 -
This commit is contained in:
michl 2018-12-12 21:25:39 +00:00
parent c3ed9b08a8
commit 1d60ab91f1
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/anchordocking/anchordocking.pas
View File

@ -1080,6 +1080,28 @@ begin
result:=Nil; result:=Nil;
end; end;
function ReturnAnchoredControlsSize(Control: TControl; Side: TAnchorKind): integer;
var
i: Integer;
Neighbour: TControl;
begin
result:=high(integer);
for i:=0 to Control.AnchoredControlCount-1 do begin
Neighbour:=Control.AnchoredControls[i];
if Neighbour.Visible then
if Neighbour is TAnchorDockHostSite then
if (OppositeAnchor[Side] in Neighbour.Anchors)
and (Neighbour.AnchorSide[OppositeAnchor[Side]].Control=Control) then begin
case Side of
akTop,akBottom: if Neighbour.ClientHeight<result then
result:=Neighbour.ClientHeight;
akLeft,akRight: if Neighbour.ClientWidth<result then
result:=Neighbour.ClientWidth;
end;
end;
end;
end;
function NeighbourCanBeShrinked(EnlargeControl, Neighbour: TControl; function NeighbourCanBeShrinked(EnlargeControl, Neighbour: TControl;
Side: TAnchorKind): boolean; Side: TAnchorKind): boolean;
{ returns true if Neighbour can be shrinked on the opposite side of Side { returns true if Neighbour can be shrinked on the opposite side of Side
@ -5499,10 +5521,9 @@ end;
procedure TAnchorDockHostSite.AsyncMinimizeSite(Data: PtrInt); procedure TAnchorDockHostSite.AsyncMinimizeSite(Data: PtrInt);
var var
AControl: TControl; AControl: TControl;
//OpositeDockHostSite:TAnchorDockHostSite;
Splitter: TAnchorDockSplitter; Splitter: TAnchorDockSplitter;
SplitterAnchorKind:TAnchorKind; SplitterAnchorKind:TAnchorKind;
//SpliterPercentPosition:Single; MaxSize:integer;
begin begin
fMinimization:=true; fMinimization:=true;
debugln(['TAnchorDockHostSite.MinimizeSite ',DbgSName(Self),' SiteType=',dbgs(SiteType)]); debugln(['TAnchorDockHostSite.MinimizeSite ',DbgSName(Self),' SiteType=',dbgs(SiteType)]);
@ -5516,8 +5537,18 @@ begin
FMinimizedControl:=AControl; FMinimizedControl:=AControl;
AControl.Visible:=False; AControl.Visible:=False;
AControl.Parent:=nil; AControl.Parent:=nil;
//self.DoDockOver(); OnDockOver;
end else begin end else begin
MaxSize:=ReturnAnchoredControlsSize(Splitter,SplitterAnchorKind);
case SplitterAnchorKind of
akTop: if AControl.Height>=MaxSize+Height then
Splitter.FPercentPosition:=1-(MaxSize+Height)/(Splitter.Parent.ClientHeight*2);
akBottom: if AControl.Height>=MaxSize+Height then
Splitter.FPercentPosition:=(MaxSize+Height)/(Splitter.Parent.ClientHeight*2);
akLeft: if AControl.Width>=MaxSize+Width then
Splitter.FPercentPosition:=1-(MaxSize+Width)/(Splitter.Parent.ClientWidth*2);
akRight: if AControl.Width>=MaxSize+Width then
Splitter.FPercentPosition:=(MaxSize+Width)/(Splitter.Parent.ClientWidth*2);
end;
AControl.Parent:=self; AControl.Parent:=self;
AControl.Visible:=True; AControl.Visible:=True;
FMinimizedControl:=nil; FMinimizedControl:=nil;