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

win32: don't fill bitbtn content with Brush since other button area cannot be painted with color different from system (fixes #0010910)

Browse Source 
git-svn-id: trunk@14928 -
This commit is contained in:
paul 2008-04-22 08:40:24 +00:00
parent 0758b382e2
commit 8a7e588df6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/win32/win32wsbuttons.pp
View File

@ -166,7 +166,11 @@ var
// fill with background color
OldBitmapHandle := SelectObject(hdcNewBitmap, NewBitmap);
Windows.FillRect(hdcNewBitmap, BitmapRect, BitBtn.Brush.Reference.Handle);
// dont use BitBtn.Brush.Reference.Handle - since button is painted with BtnFact color and
// only glyph will have that bg - this will look very ugly
Windows.FillRect(hdcNewBitmap, BitmapRect, GetSysColorBrush(COLOR_BTNFACE));
if AState <> bsDisabled then
begin
if (srcWidth <> 0) and (srcHeight <> 0) then
@ -193,7 +197,7 @@ var
begin
// non-themed winapi wants white/other as background/picture-disabled colors
// themed winapi draws bitmap-as, with transparency defined by bitbtn.brush color
SetBkColor(hdcNewBitmap, ColorToRGB(BitBtn.Brush.Color));
SetBkColor(hdcNewBitmap, GetSysColor(COLOR_BTNFACE));
SetTextColor(hdcNewBitmap, GetSysColor(COLOR_BTNSHADOW));
end
else
@ -354,7 +358,7 @@ begin
for I := 1 to 6 do
begin
DrawBitmap(XPBitBtn_ImageIndexToState[I]);
ImageList_AddMasked(ButtonImageList.himl, NewBitmap, ColorToRGB(BitBtn.Brush.Color));
ImageList_AddMasked(ButtonImageList.himl, NewBitmap, GetSysColor(COLOR_BTNFACE));
end;
end
else