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

Renames GetRGBBackgroundColor to GetRGBColorResolvingParent because the previous name was wrong. It has not necessarily to be a background color, it is really just the Color.

Browse Source 
git-svn-id: trunk@33280 -
This commit is contained in:
sekelsenmat 2011-11-04 08:54:55 +00:00
parent 66cff6df33
commit 943326f458
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/customdrawn/customdrawncontrols.pas
View File

@ -885,11 +885,11 @@ end;
procedure TCDControl.PrepareControlStateEx;
begin
if Parent <> nil then FStateEx.ParentRGBColor := Parent.GetRGBBackgroundColor
if Parent <> nil then FStateEx.ParentRGBColor := Parent.GetRGBColorResolvingParent
else FStateEx.ParentRGBColor := clSilver;
if Color = clDefault then FStateEx.RGBColor := FDrawer.GetControlColor(GetControlId())
else FStateEx.RGBColor := GetRGBBackgroundColor;
else FStateEx.RGBColor := GetRGBColorResolvingParent;
FStateEx.Caption := Caption;
FStateEx.Font := Font;

2
lcl/controls.pp
View File

@ -1329,7 +1329,7 @@ type
function GetDefaultColor(const DefaultColorType: TDefaultColorType): TColor; virtual;
// These two are helper routines to help obtain the background color of a control
function GetColorResolvingParent: TColor;
function GetRGBBackgroundColor: TColor;
function GetRGBColorResolvingParent: TColor;
//
function GetSidePosition(Side: TAnchorKind): integer;
procedure CNPreferredSizeChanged;

2
lcl/include/control.inc
View File

@ -992,7 +992,7 @@ begin
Result := Color;
end;
function TControl.GetRGBBackgroundColor: TColor;
function TControl.GetRGBColorResolvingParent: TColor;
begin
Result := ColorToRGB(GetColorResolvingParent());
end;