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

LCL: Docked-Designer, FakeMenu-Toolbar, layout

Browse Source
This commit is contained in:
Martin 2024-12-28 17:21:32 +01:00
parent ce20675a1b
commit afe87b6e8c
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/dockedformeditor/source/dockedgrip.pas
View File

@ -40,7 +40,7 @@ uses
// RTL, FCL // RTL, FCL
Classes, SysUtils, math, Classes, SysUtils, math,
// LCL // LCL
Controls, ComCtrls, ExtCtrls, Graphics, Menus; Controls, ComCtrls, ExtCtrls, Graphics, Menus, Toolwin;
type type
@ -606,9 +606,15 @@ begin
FResizeBars.Parent := Parent; FResizeBars.Parent := Parent;
FFakeMenu := TToolBar.Create(Parent); FFakeMenu := TToolBar.Create(Parent);
FFakeMenu.ParentFont := False;
FFakeMenu.Orientation := tboHorizontal;
FFakeMenu.EdgeBorders := [];
FFakeMenu.EdgeInner := esNone;
FFakeMenu.EdgeOuter := esNone;
FFakeMenu.Height := 0; FFakeMenu.Height := 0;
FFakeMenu.Parent := Parent; FFakeMenu.Parent := Parent;
FFakeMenu.Align := alNone; FFakeMenu.Align := alNone;
FFakeMenu.AutoSize := True;
FFakeMenu.Indent := 0; FFakeMenu.Indent := 0;
FFormClient := TWinControl.Create(Parent); FFormClient := TWinControl.Create(Parent);
@ -647,11 +653,18 @@ begin
end; end;
procedure TResizeContainer.SetBounds(ALeft, ATop, AWidth, AHeight: Integer); procedure TResizeContainer.SetBounds(ALeft, ATop, AWidth, AHeight: Integer);
var
w: Integer;
begin begin
FBoundsRect := Rect(ALeft, ATop, ALeft + AWidth, ATop + AHeight); FBoundsRect := Rect(ALeft, ATop, ALeft + AWidth, ATop + AHeight);
FResizeGrips.SetBounds(FBoundsRect); FResizeGrips.SetBounds(FBoundsRect);
FResizeBars.SetBounds(FBoundsRect); FResizeBars.SetBounds(FBoundsRect);
FFakeMenu.SetBounds(ALeft + FResizeBars.BarSize, ATop + FResizeBars.BarSize, AWidth - FResizeBars.BarSize * 2, FFakeMenu.Height); w := Max(0, AWidth - FResizeBars.BarSize * 2);
FFakeMenu.Visible := w > 0;
FFakeMenu.Constraints.MinWidth := w;
FFakeMenu.Constraints.MaxWidth := w;
FFakeMenu.Top := ATop + FResizeBars.BarSize;
FFakeMenu.Left := ALeft + FResizeBars.BarSize;
FFormClient.SetBounds(ALeft + FResizeBars.BarSize, ATop + FResizeBars.BarSize + FFakeMenu.Height, AWidth - FResizeBars.BarSize * 2, AHeight - FResizeBars.BarSize * 2 - FFakeMenu.Height); FFormClient.SetBounds(ALeft + FResizeBars.BarSize, ATop + FResizeBars.BarSize + FFakeMenu.Height, AWidth - FResizeBars.BarSize * 2, AHeight - FResizeBars.BarSize * 2 - FFakeMenu.Height);
FAnchorContainer.SetBounds(ALeft + FResizeBars.BarSize, ATop + FResizeBars.BarSize + FFakeMenu.Height, AWidth - FResizeBars.BarSize * 2, AHeight - FResizeBars.BarSize * 2 - FFakeMenu.Height); FAnchorContainer.SetBounds(ALeft + FResizeBars.BarSize, ATop + FResizeBars.BarSize + FFakeMenu.Height, AWidth - FResizeBars.BarSize * 2, AHeight - FResizeBars.BarSize * 2 - FFakeMenu.Height);
end; end;

16
components/dockedformeditor/source/dockedresizecontrol.pas
View File

@ -344,19 +344,13 @@ end;
procedure TResizeControl.TryBoundDesignForm; procedure TResizeControl.TryBoundDesignForm;
var var
i, t: Integer; f: Boolean;
begin begin
if DesignForm = nil then Exit; if DesignForm = nil then Exit;
if FakeMenuNeeded then f := FakeMenuNeeded;
begin FakeMenu.AutoSize := f;
FakeMenu.ButtonHeight := DesignForm.MainMenuHeight; if not f then
t := 0; FakeMenu.Height := 0;
for i := 0 to FakeMenu.ComponentCount - 1 do //For multi-line MainMenu
if FakeMenu.Components[i] is TSpeedButton then
if t < TSpeedButton(FakeMenu.Components[i]).Top then t := TSpeedButton(FakeMenu.Components[i]).Top;
FakeMenu.Height := t + FakeMenu.ButtonHeight;
FakeMenu.Update;
end else FakeMenu.Height := 0;
end; end;
constructor TResizeControl.Create(TheOwner: TComponent); constructor TResizeControl.Create(TheOwner: TComponent);