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

anchordocking: do not draw disabled splitters

Browse Source 
anchordockingdsgn: disable and make MainIDEBar splitter smaller if AdjustHeight is enabled

git-svn-id: trunk@51121 -
This commit is contained in:
ondrej 2016-01-02 13:35:36 +00:00
parent 8005aedc44
commit dd5a0c7dd9
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/anchordocking/anchordocking.pas
View File

@ -169,6 +169,7 @@ type
TAnchorDockSplitter = class(TCustomSplitter) TAnchorDockSplitter = class(TCustomSplitter)
private private
FCustomWidth: Boolean;
FDockBounds: TRect; FDockBounds: TRect;
FDockParentClientSize: TSize; FDockParentClientSize: TSize;
FDockRestoreBounds: TRect; FDockRestoreBounds: TRect;
@ -178,6 +179,7 @@ type
protected protected
procedure SetResizeAnchor(const AValue: TAnchorKind); override; procedure SetResizeAnchor(const AValue: TAnchorKind); override;
procedure PopupMenuPopup(Sender: TObject); virtual; procedure PopupMenuPopup(Sender: TObject); virtual;
procedure Paint; override;
public public
procedure MoveSplitter(Offset: integer); override; procedure MoveSplitter(Offset: integer); override;
public public
@ -193,6 +195,7 @@ type
procedure SaveLayout(LayoutNode: TAnchorDockLayoutTreeNode); procedure SaveLayout(LayoutNode: TAnchorDockLayoutTreeNode);
function HasOnlyOneSibling(Side: TAnchorKind; MinPos, MaxPos: integer): TControl; function HasOnlyOneSibling(Side: TAnchorKind; MinPos, MaxPos: integer): TControl;
property DockRestoreBounds: TRect read FDockRestoreBounds write FDockRestoreBounds; property DockRestoreBounds: TRect read FDockRestoreBounds write FDockRestoreBounds;
property CustomWidth: Boolean read FCustomWidth write FCustomWidth;
end; end;
TAnchorDockSplitterClass = class of TAnchorDockSplitter; TAnchorDockSplitterClass = class of TAnchorDockSplitter;
@ -2188,10 +2191,13 @@ begin
for i:=0 to ComponentCount-1 do begin for i:=0 to ComponentCount-1 do begin
Splitter:=TAnchorDockSplitter(Components[i]); Splitter:=TAnchorDockSplitter(Components[i]);
if not (Splitter is TAnchorDockSplitter) then continue; if not (Splitter is TAnchorDockSplitter) then continue;
if Splitter.ResizeAnchor in [akLeft,akRight] then if not Splitter.CustomWidth then
Splitter.Width:=SplitterWidth begin
else if Splitter.ResizeAnchor in [akLeft,akRight] then
Splitter.Height:=SplitterWidth; Splitter.Width:=SplitterWidth
else
Splitter.Height:=SplitterWidth;
end;
end; end;
OptionsChanged; OptionsChanged;
end; end;
@ -6199,6 +6205,17 @@ begin
UpdatePercentPosition; UpdatePercentPosition;
end; end;
procedure TAnchorDockSplitter.Paint;
begin
if Enabled then
inherited Paint
else
begin
Canvas.Brush.Color := clDefault;
Canvas.FillRect(ClientRect);
end;
end;
constructor TAnchorDockSplitter.Create(TheOwner: TComponent); constructor TAnchorDockSplitter.Create(TheOwner: TComponent);
begin begin
inherited Create(TheOwner); inherited Create(TheOwner);

8
components/anchordocking/design/registeranchordocking.pas
View File

@ -270,6 +270,14 @@ begin
Exit; Exit;
Site.BoundSplitter.Enabled := not AAdjustHeight; Site.BoundSplitter.Enabled := not AAdjustHeight;
Site.BoundSplitter.CustomWidth := not Site.BoundSplitter.Enabled;
if Site.BoundSplitter.Enabled then
Site.BoundSplitter.Height := DockMaster.SplitterWidth
else
begin
Site.BoundSplitter.Constraints.MinHeight := 2;
Site.BoundSplitter.Height := Site.BoundSplitter.Constraints.MinHeight;
end;
SiteNewHeight := Site.Parent.ClientHeight - ANewHeight - Site.BoundSplitter.Height; SiteNewHeight := Site.Parent.ClientHeight - ANewHeight - Site.BoundSplitter.Height;
if AAdjustHeight and (Site.Height <> SiteNewHeight) then if AAdjustHeight and (Site.Height <> SiteNewHeight) then
Site.Height := SiteNewHeight; Site.Height := SiteNewHeight;