Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-01 19:50:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[uxtheme]

Browse source 
- After doing any drawing operation for the non client area, restore the previously opened theme. Fixes GetWindowTheme

svn path=/branches/GSoC_2011/ThemesSupport/; revision=52639
This commit is contained in:
Giannis Adamopoulos 2011-07-11 18:17:11 +00:00
parent 832f3db5a1
commit 012c87272c
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dll/win32/uxtheme/ncthm.h
View file

@ -4,6 +4,7 @@ typedef struct _DRAW_CONTEXT
HWND hWnd; HWND hWnd;
HDC hDC; HDC hDC;
HTHEME theme; HTHEME theme;
HTHEME hPrevTheme;
WINDOWINFO wi; WINDOWINFO wi;
BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */
HRGN hRgn; HRGN hRgn;

3
dll/win32/uxtheme/nonclient.c
View file

@ -165,6 +165,7 @@ ThemeInitDrawContext(PDRAW_CONTEXT pcontext,
GetWindowInfo(hWnd, &pcontext->wi); GetWindowInfo(hWnd, &pcontext->wi);
pcontext->hWnd = hWnd; pcontext->hWnd = hWnd;
pcontext->Active = IsWindowActive(hWnd, pcontext->wi.dwExStyle); pcontext->Active = IsWindowActive(hWnd, pcontext->wi.dwExStyle);
pcontext->hPrevTheme = GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme));
pcontext->theme = OpenThemeData(pcontext->hWnd, L"WINDOW"); pcontext->theme = OpenThemeData(pcontext->hWnd, L"WINDOW");
pcontext->CaptionHeight = pcontext->wi.cyWindowBorders; pcontext->CaptionHeight = pcontext->wi.cyWindowBorders;
@ -186,6 +187,8 @@ ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext)
CloseThemeData (pcontext->theme); CloseThemeData (pcontext->theme);
SetPropW(pcontext->hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), pcontext->hPrevTheme);
if(pcontext->hRgn != NULL) if(pcontext->hRgn != NULL)
{ {
DeleteObject(pcontext->hRgn); DeleteObject(pcontext->hRgn);

2
dll/win32/uxtheme/system.c
View file

@ -61,7 +61,7 @@ HINSTANCE hDllInst;
ATOM atDialogThemeEnabled; ATOM atDialogThemeEnabled;
static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS;
static ATOM atWindowTheme; ATOM atWindowTheme;
static ATOM atSubAppName; static ATOM atSubAppName;
static ATOM atSubIdList; static ATOM atSubIdList;