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

IDE: Add assertions to TMainIDEBar.CalcMainIDEHeight. Move to a better place. Trying to debug issue #34377.

Browse Source 
git-svn-id: trunk@62880 -
This commit is contained in:
juha 2020-04-04 09:06:24 +00:00
parent 78cf54924b
commit 8f74c1cd33
1 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
ide/mainbar.pas
View File

@ -56,6 +56,7 @@ type
procedure CreatePopupMenus(TheOwner: TComponent);
function CalcMainIDEHeight: Integer;
function CalcNonClientHeight: Integer;
function FindCompScrollBox: TScrollBox;
protected
procedure DoActive;
procedure WndProc(var Message: TLMessage); override;
@ -442,7 +443,7 @@ begin
begin
Constraints.MaxHeight := ANewHeight;
Constraints.MinHeight := ANewHeight;
ClientHeight := ANewHeight;
ClientHeight := ANewHeight; // <- Value is -28 when issue #34377 happens.
end else if ClientHeight <> ANewHeight then
ClientHeight := ANewHeight;
end else
@ -457,6 +458,55 @@ begin
end;
end;
function TMainIDEBar.CalcMainIDEHeight: Integer;
var
NewHeight: Integer;
I: Integer;
CompScrollBox: TScrollBox;
SBControl: TControl;
begin
Result := 0;
if (EnvironmentOptions=Nil) or (CoolBar=Nil) or (ComponentPageControl=Nil) then
Exit;
// IDE Coolbar height
if EnvironmentOptions.Desktop.IDECoolBarOptions.Visible then
begin
for I := 0 to CoolBar.Bands.Count-1 do
begin
NewHeight := CoolBar.Bands[I].Top + CoolBar.Bands[I].Height;
Assert(NewHeight >= 0, Format('TMainIDEBar.CalcMainIDEHeight, IDE Coolbar: '+
'NewHeight %d < 0. Band Top=%d, Band Height=%d.',
[NewHeight, CoolBar.Bands[I].Top, CoolBar.Bands[I].Height]) );
Result := Max(Result, NewHeight);
end;
end;
// Component palette height
if EnvironmentOptions.Desktop.ComponentPaletteOptions.Visible
and Assigned(ComponentPageControl.ActivePage) then
begin
CompScrollBox := FindCompScrollBox;
if CompScrollBox=Nil then Exit;
for I := 0 to CompScrollBox.ControlCount-1 do
begin
SBControl := CompScrollBox.Controls[I];
NewHeight := SBControl.Top + SBControl.Height + //button height
//page control non-client height (tabs, borders).
ComponentPageControl.Height - CompScrollBox.ClientHeight;
Assert(NewHeight >= 0, Format('TMainIDEBar.CalcMainIDEHeight, Component palette : '+
'NewHeight %d < 0. Cntrl.Top=%d, Cntrl.Height=%d, '+
'PageControl.Height=%d, ScrollBox.ClientHeight=%d.',
[NewHeight, SBControl.Top, SBControl.Height,
ComponentPageControl.Height, CompScrollBox.ClientHeight]) );
Result := Max(Result, NewHeight);
if not EnvironmentOptions.Desktop.AutoAdjustIDEHeightFullCompPal then
Break; //we need only one button (we calculate one line only)
end;
end;
end;
function TMainIDEBar.CalcNonClientHeight: Integer;
{$IF DEFINED(LCLWin32) OR DEFINED(LCLGtk2) OR DEFINED(LCLQt) OR DEFINED(LCLQt5)}
var
@ -513,6 +563,16 @@ begin
{$ENDIF}
end;
function TMainIDEBar.FindCompScrollBox: TScrollBox;
var
I: Integer;
begin
for I := 0 to ComponentPageControl.ActivePage.ControlCount-1 do
if (ComponentPageControl.ActivePage.Controls[I] is TScrollBox) then
Exit(TScrollBox(ComponentPageControl.ActivePage.Controls[I]));
Result := nil;
end;
procedure TMainIDEBar.SetMainIDEHeightEvent(Sender: TObject);
begin
SetMainIDEHeight;
@ -751,52 +811,6 @@ begin
SetMainIDEHeight;
end;
function TMainIDEBar.CalcMainIDEHeight: Integer;
var
NewHeight: Integer;
I: Integer;
ComponentScrollBox: TScrollBox;
SBControl: TControl;
begin
Result := 0;
if not (Assigned(EnvironmentOptions) and Assigned(CoolBar) and Assigned(ComponentPageControl)) then
Exit;
if EnvironmentOptions.Desktop.IDECoolBarOptions.Visible then
begin
for I := 0 to CoolBar.Bands.Count-1 do
begin
NewHeight := CoolBar.Bands[I].Top + CoolBar.Bands[I].Height;
Result := Max(Result, NewHeight);
end;
end;
if EnvironmentOptions.Desktop.ComponentPaletteOptions.Visible
and Assigned(ComponentPageControl.ActivePage) then
begin
ComponentScrollBox := nil;
for I := 0 to ComponentPageControl.ActivePage.ControlCount-1 do
if (ComponentPageControl.ActivePage.Controls[I] is TScrollBox) then
begin
ComponentScrollBox := TScrollBox(ComponentPageControl.ActivePage.Controls[I]);
Break;
end;
if Assigned(ComponentScrollBox) then
for I := 0 to ComponentScrollBox.ControlCount-1 do
begin
SBControl := ComponentScrollBox.Controls[I];
NewHeight :=
SBControl.Top + SBControl.Height + //button height
ComponentPageControl.Height - ComponentScrollBox.ClientHeight; //page control non-client height (tabs, borders).
Result := Max(Result, NewHeight);
if not EnvironmentOptions.Desktop.AutoAdjustIDEHeightFullCompPal then
Break; //we need only one button (we calculate one line only)
end;
end;
end;
procedure TMainIDEBar.CoolBarOnChange(Sender: TObject);
begin
IDECoolBar.CopyFromRealCoolbar(Coolbar);