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

Adds minimum height for ProgressBar under win32. Fixes #10626

Browse Source 
git-svn-id: trunk@14926 -
This commit is contained in:
sekelsenmat 2008-04-22 00:16:26 +00:00
parent 4e1373d30e
commit cfe715b953
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/interfaces/gtk/gtklclintf.inc
View File

@ -622,20 +622,21 @@ end;
------------------------------------------------------------------------------}
function TGtkWidgetSet.GetControlConstraints(Constraints: TObject): boolean;
var
SizeConstraints: TSizeConstraints;
SizeConstraints: TSizeConstraints absolute Constraints;
Widget: PGtkWidget;
MinWidth: Integer;
MinHeight: Integer;
MaxWidth: Integer;
MaxHeight: Integer;
begin
Result:=true;
if Constraints is TSizeConstraints then begin
MinWidth:=1;
MinHeight:=1;
MaxWidth:=0;
MaxHeight:=0;
SizeConstraints:=TSizeConstraints(Constraints);
Result := True;
if Constraints is TSizeConstraints then
begin
MinWidth := 1;
MinHeight := 1;
MaxWidth := 0;
MaxHeight := 0;
if (SizeConstraints.Control=nil) then exit;

30
lcl/interfaces/win32/win32lclintf.inc
View File

@ -338,35 +338,52 @@ end;
------------------------------------------------------------------------------}
function TWin32WidgetSet.GetControlConstraints(Constraints: TObject): boolean;
var
SizeConstraints: TSizeConstraints;
SizeConstraints: TSizeConstraints absolute Constraints;
SizeRect: TRect;
Height, Width: Integer;
FixedHeight, FixedWidth: boolean;
MinWidth, MinHeight, MaxWidth, MaxHeight: Integer;
begin
Result:=true;
if Constraints is TSizeConstraints then begin
SizeConstraints:=TSizeConstraints(Constraints);
Result := True;
if Constraints is TSizeConstraints then
begin
if (SizeConstraints.Control=nil) then exit;
FixedHeight := false;
FixedWidth := false;
MinWidth := 1;
MinHeight := 1;
MaxWidth := 0;
MaxHeight := 0;
if SizeConstraints.Control is TCustomCalendar then
begin
FixedHeight := true;
FixedWidth := true;
end
else
if SizeConstraints.Control is TCustomComboBox then
else if SizeConstraints.Control is TCustomComboBox then
begin
// win32 combo (but not csSimple) has fixed height
FixedHeight := TCustomComboBox(SizeConstraints.Control).Style <> csSimple;
end
// The ProgressBar needs a minimum Height of 10 when themed,
// as required by Windows, otherwise it's image is corrupted
// For consistency, we add the constrain even when not themed.
else if SizeConstraints.Control is TCustomProgressBar then
begin
MinHeight := 10;
SizeConstraints.SetInterfaceConstraints(
MinWidth, MinHeight, MaxWidth, MaxHeight);
end;
if (FixedHeight or FixedWidth)
and TWinControl(SizeConstraints.Control).HandleAllocated then
begin
Windows.GetWindowRect(TWinControl(SizeConstraints.Control).Handle, @SizeRect);
if FixedHeight then
Height := SizeRect.Bottom - SizeRect.Top
else
@ -375,6 +392,7 @@ begin
Width := SizeRect.Right - SizeRect.Left
else
Width := 0;
SizeConstraints.SetInterfaceConstraints(Width, Height, Width, Height);
end;
end;