Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:05:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[UXTHEME] -Implement painting windows with WS_MINIMIZE. Such windows are minimized mdi windows.

Browse source 
svn path=/trunk/; revision=74247
This commit is contained in:
Giannis Adamopoulos 2017-03-31 11:26:20 +00:00
parent 9cac6ddd71
commit 55bba159b9
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/uxtheme/nonclient.c
View file

@ -245,7 +245,7 @@ ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext,
iStateId = BUTTON_DISABLED; iStateId = BUTTON_DISABLED;
} }
iPartId = WP_MINBUTTON; iPartId = pcontext->wi.dwStyle & WS_MINIMIZE ? WP_RESTOREBUTTON : WP_MINBUTTON;
break; break;
default: default:
@ -329,7 +329,9 @@ ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent)
CaptionText = UserGetWindowCaption(pcontext->hWnd); CaptionText = UserGetWindowCaption(pcontext->hWnd);
/* Get the caption part and state id */ /* Get the caption part and state id */
if (pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW) if (pcontext->wi.dwStyle & WS_MINIMIZE)
iPart = WP_MINCAPTION;
else if (pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW)
iPart = WP_SMALLCAPTION; iPart = WP_SMALLCAPTION;
else if (pcontext->wi.dwStyle & WS_MAXIMIZE) else if (pcontext->wi.dwStyle & WS_MAXIMIZE)
iPart = WP_MAXCAPTION; iPart = WP_MAXCAPTION;
@ -630,12 +632,6 @@ ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBufferi
if(!(pcontext->wi.dwStyle & WS_VISIBLE)) if(!(pcontext->wi.dwStyle & WS_VISIBLE))
return; return;
if(pcontext->wi.dwStyle & WS_MINIMIZE)
{
ThemeDrawTitle(pcontext, prcCurrent);
return;
}
if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION)
{ {
if (bDoDoubleBuffering) if (bDoDoubleBuffering)
@ -650,6 +646,9 @@ ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBufferi
DrawClassicFrame(pcontext, prcCurrent); DrawClassicFrame(pcontext, prcCurrent);
} }
if(pcontext->wi.dwStyle & WS_MINIMIZE)
return;
if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle)) if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle))
ThemeDrawMenuBar(pcontext, prcCurrent); ThemeDrawMenuBar(pcontext, prcCurrent);

4
reactos/dll/win32/uxtheme/themehooks.c
View file

@ -97,7 +97,9 @@ void SetThemeRegion(HWND hWnd)
GetWindowInfo(hWnd, &wi); GetWindowInfo(hWnd, &wi);
/* Get the caption part id */ /* Get the caption part id */
if (wi.dwExStyle & WS_EX_TOOLWINDOW) if (wi.dwStyle & WS_MINIMIZE)
iPart = WP_MINCAPTION;
else if (wi.dwExStyle & WS_EX_TOOLWINDOW)
iPart = WP_SMALLCAPTION; iPart = WP_SMALLCAPTION;
else if (wi.dwStyle & WS_MAXIMIZE) else if (wi.dwStyle & WS_MAXIMIZE)
iPart = WP_MAXCAPTION; iPart = WP_MAXCAPTION;