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

Take into account enabled state when drawing themed borders

Browse Source 
Pass ETS_DISABLED instead of ETS_NORMAL when the window is disabled.
This commit is contained in:
Vadim Zeitlin
2019-01-16 01:50:44 +01:00
parent 78072514e9
commit d47dbe9faa
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/window.cpp
View File

@@ -3738,7 +3738,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
hTheme, hTheme,
GetHdcOf(*impl), GetHdcOf(*impl),
EP_EDITTEXT, EP_EDITTEXT,
ETS_NORMAL, IsEnabled() ? ETS_NORMAL : ETS_DISABLED,
rect, rect,
&rcClient) == S_OK ) &rcClient) == S_OK )
{ {
@@ -3774,21 +3774,22 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
wxCopyRectToRECT(GetSize(), rcBorder); wxCopyRectToRECT(GetSize(), rcBorder);
RECT rcClient; RECT rcClient;
const int nState = IsEnabled() ? ETS_NORMAL : ETS_DISABLED;
::GetThemeBackgroundContentRect( ::GetThemeBackgroundContentRect(
hTheme, GetHdcOf(*impl), EP_EDITTEXT, ETS_NORMAL, &rcBorder, &rcClient); hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, &rcClient);
InflateRect(&rcClient, -1, -1); InflateRect(&rcClient, -1, -1);
::ExcludeClipRect(GetHdcOf(*impl), rcClient.left, rcClient.top, ::ExcludeClipRect(GetHdcOf(*impl), rcClient.left, rcClient.top,
rcClient.right, rcClient.bottom); rcClient.right, rcClient.bottom);
// Make sure the background is in a proper state // Make sure the background is in a proper state
if (::IsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, ETS_NORMAL)) if (::IsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, nState))
{ {
::DrawThemeParentBackground(GetHwnd(), GetHdcOf(*impl), &rcBorder); ::DrawThemeParentBackground(GetHwnd(), GetHdcOf(*impl), &rcBorder);
} }
// Draw the border // Draw the border
const int nState = IsEnabled() ? ETS_NORMAL : ETS_DISABLED;
::DrawThemeBackground(hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, NULL); ::DrawThemeBackground(hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, NULL);
} }
} }