paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-09 09:38:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: re-added CalculateAutoRanges for custom controls

Browse Source 
git-svn-id: trunk@48626 -
This commit is contained in:
mattias 2015-04-04 21:49:29 +00:00
parent 35e6eea991
commit d51fa72c40
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/forms.pp
View File

@ -157,6 +157,7 @@ type
class procedure WSRegisterClass; override; class procedure WSRegisterClass; override;
procedure AlignControls(AControl: TControl; var ARect: TRect); override; procedure AlignControls(AControl: TControl; var ARect: TRect); override;
function AutoScrollEnabled: Boolean; virtual; function AutoScrollEnabled: Boolean; virtual;
procedure CalculateAutoRanges; virtual;
procedure CreateWnd; override; procedure CreateWnd; override;
function GetClientScrollOffset: TPoint; override; function GetClientScrollOffset: TPoint; override;
function GetLogicalClientRect: TRect; override;// logical size of client area function GetLogicalClientRect: TRect; override;// logical size of client area

36
lcl/include/scrollingwincontrol.inc
View File

@ -99,6 +99,26 @@ begin
Result := not (AutoSize or (DockSite and UseDockManager)); Result := not (AutoSize or (DockSite and UseDockManager));
end; end;
procedure TScrollingWinControl.CalculateAutoRanges;
var
NeededClientW: Integer;
NeededClientH: Integer;
FrameWidth: integer;
FrameHeight: integer;
begin
NeededClientW:=0;
NeededClientH:=0;
GetPreferredSize(NeededClientW,NeededClientH,true,false);
GetPreferredSizeClientFrame(FrameWidth,FrameHeight);
if NeededClientW>0 then
NeededClientW-=FrameWidth;
if NeededClientH>0 then
NeededClientH-=FrameHeight;
HorzScrollBar.InternalSetRange(NeededClientW);
VertScrollBar.InternalSetRange(NeededClientH);
end;
class function TScrollingWinControl.GetControlClassDefaultSize: TSize; class function TScrollingWinControl.GetControlClassDefaultSize: TSize;
begin begin
Result.CX := 150; Result.CX := 150;
@ -171,22 +191,8 @@ procedure TScrollingWinControl.ComputeScrollbars;
var var
ClientW: Integer; ClientW: Integer;
ClientH: Integer; ClientH: Integer;
NeededClientW: Integer;
NeededClientH: Integer;
FrameWidth: integer;
FrameHeight: integer;
begin begin
NeededClientW:=0; CalculateAutoRanges;
NeededClientH:=0;
GetPreferredSize(NeededClientW,NeededClientH,true,false);
GetPreferredSizeClientFrame(FrameWidth,FrameHeight);
if NeededClientW>0 then
NeededClientW-=FrameWidth;
if NeededClientH>0 then
NeededClientH-=FrameHeight;
HorzScrollBar.InternalSetRange(NeededClientW);
VertScrollBar.InternalSetRange(NeededClientH);
ClientW:=VertScrollBar.ClientSizeWithoutBar; ClientW:=VertScrollBar.ClientSizeWithoutBar;
ClientH:=HorzScrollBar.ClientSizeWithoutBar; ClientH:=HorzScrollBar.ClientSizeWithoutBar;