AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverted FILLCOLORHINT->FILLCOLOR change. Now when a near black themeColor is returned with FILLCOLORHINT, retry with FILLCOLOR.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth 2004-03-07 20:00:28 +00:00
parent 73bb677607
commit 20fa338c41
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/msw/notebook.cpp
View File

@ -946,9 +946,28 @@ wxColour wxNotebook::GetThemeBackgroundColour()
hTheme, hTheme,
10 /* TABP_BODY */, 10 /* TABP_BODY */,
1 /* NORMAL */, 1 /* NORMAL */,
3802 /* color of bg fill */, 3821 /* FILLCOLORHINT */,
&themeColor); &themeColor);
/*
[DS] Workaround for WindowBlinds:
Some themes return a near black theme color using FILLCOLORHINT,
this makes notebook pages have an ugly black background and makes
text (usually black) unreadable. Retry again with FILLCOLOR.
This workaround potentially breaks appearance of some themes,
but in practice it already fixes some themes.
*/
if (themeColor == 1)
{
wxUxThemeEngine::Get()->GetThemeColor(
hTheme,
10 /* TABP_BODY */,
1 /* NORMAL */,
3802 /* FILLCOLOR */,
&themeColor);
}
wxColour colour(GetRValue(themeColor), GetGValue(themeColor), GetBValue(themeColor)); wxColour colour(GetRValue(themeColor), GetGValue(themeColor), GetBValue(themeColor));
return colour; return colour;
} }