Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-22 18:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[UXTHEME] Properly show disabled close button

Browse source 
CORE-17203
This commit is contained in:
Stanislav Motylkov 2020-08-16 17:34:38 +03:00
parent 2fb2f1e4c5
commit 685084b63c
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -277,6 +277,8 @@ ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext,
INT iStateId) INT iStateId)
{ {
INT iPartId; INT iPartId;
HMENU SysMenu;
UINT MenuState;
PWND_DATA pwndData = ThemeGetWndData(pcontext->hWnd); PWND_DATA pwndData = ThemeGetWndData(pcontext->hWnd);
if (!pwndData) if (!pwndData)
return; return;
@ -284,6 +286,13 @@ ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext,
switch(buttonId) switch(buttonId)
{ {
case CLOSEBUTTON: case CLOSEBUTTON:
SysMenu = GetSystemMenu(pcontext->hWnd, FALSE);
MenuState = GetMenuState(SysMenu, SC_CLOSE, MF_BYCOMMAND);
if (!(pcontext->wi.dwStyle & WS_SYSMENU) || (MenuState & (MF_GRAYED | MF_DISABLED)) || pcontext->wi.dwStyle & CS_NOCLOSE)
{
iStateId = (pcontext->Active ? BUTTON_DISABLED : BUTTON_INACTIVE_DISABLED);
}
iPartId = pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; iPartId = pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON;
break; break;