Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paint over larger part of MSW buttons with custom background

Browse Source 
Don't use ExtFloodFill() to extend the custom background colour to the
edges as this results in weird problems due to an apparent bug in nVidia
drivers, see #18387.

Instead, just extend the rectangle passed to FillRect(), which doesn't
look quite as good under Windows 10, but is pretty close, and shouldn't
suffer from the nVidia bug while also slightly improving appearance
under Windows 7.

Closes https://github.com/wxWidgets/wxWidgets/pull/1319
This commit is contained in:
Vadim Zeitlin
2019-05-12 03:14:10 +02:00
parent 885d80ef22
commit 616b915119
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/anybutton.cpp
View File

@@ -1156,31 +1156,16 @@ void DrawXPBackground(wxAnyButton *button, HDC hdc, RECT& rectBtn, UINT state)
::GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
TMT_CONTENTMARGINS, &rectBtn, &margins);
::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight);
::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
if ( button->UseBgCol() && iState != PBS_HOT )
{
COLORREF colBg = wxColourToRGB(button->GetBackgroundColour());
AutoHBRUSH hbrushBackground(colBg);
// don't overwrite the focus rect
RECT rectClient;
::CopyRect(&rectClient, &rectBtn);
::InflateRect(&rectClient, -1, -1);
if ( wxGetWinVersion() >= wxWinVersion_10 )
{
// buttons have flat appearance so we can fully color them
// even outside the "safe" rectangle
SelectInHDC brush(hdc, hbrushBackground);
COLORREF colTheme = GetPixel(hdc, rectClient.left, rectClient.top);
ExtFloodFill(hdc, rectClient.left, rectClient.top, colTheme, FLOODFILLSURFACE);
}
else
{
FillRect(hdc, &rectClient, hbrushBackground);
}
FillRect(hdc, &rectBtn, hbrushBackground);
}
::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
}
#endif // wxUSE_UXTHEME