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

Merge branch 'main' into 'main'

Browse Source 
fix for TControl.GetDefaultColor never recursing up to parent

See merge request freepascal.org/lazarus/lazarus!452
This commit is contained in:
robert rozee 2025-04-03 21:29:44 +00:00
commit 02d434a788
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/include/control.inc
View File

@ -1434,11 +1434,10 @@ const
);
begin
Result := TWSControlClass(WidgetSetClass).GetDefaultColor(Self, DefaultColorType);
if (Result = clDefault) then
if ParentColor and Assigned(Parent) then
Result := Parent.GetDefaultColor(DefaultColorType)
if (Self.Color = clDefault) and ParentColor and Assigned(Parent) then
Result := Parent.GetDefaultColor(DefaultColorType) // recursion
else
Result := DefColors[DefaultColorType];
if Result = clDefault then Result := DefColors[DefaultColorType]; // backstop
end;
function TControl.GetColorResolvingParent: TColor;

1
lcl/include/inputdialog.inc
View File

@ -81,6 +81,7 @@ begin
Parent := Form;
ShowBevel := False;
ShowButtons := [pbOK, pbCancel];
Color:=Parent.GetDefaultColor(dctBrush); // fix for wrong background colour
Align := alTop;
end;