Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

better handling of caption buttons

Browse source 
svn path=/trunk/; revision=5999
This commit is contained in:
Thomas Bluemel 2003-09-06 14:30:21 +00:00
parent e1f57fd5f7
commit 625bd1a280
1 changed files with 70 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
reactos/lib/user32/windows/defwnd.c
View file

@ -1,4 +1,4 @@
/* $Id: defwnd.c,v 1.76 2003/08/31 14:25:28 rcampbell Exp $ /* $Id: defwnd.c,v 1.77 2003/09/06 14:30:21 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -861,6 +861,71 @@ DefWndHitTestNC(HWND hWnd, POINT Point)
return(HTNOWHERE); return(HTNOWHERE);
} }
VOID STATIC
DefWndDoButtonHandle(HWND hWnd, WPARAM wParam)
{
MSG Msg;
BOOL InBtn = TRUE, HasBtn = FALSE;
ULONG Btn;
WPARAM SCMsg, CurBtn = wParam, OrigBtn = wParam;
switch(wParam)
{
case HTCLOSE:
Btn = DFCS_CAPTIONCLOSE;
SCMsg = SC_CLOSE;
HasBtn = IsCloseBoxActive(hWnd);
break;
case HTMINBUTTON:
Btn = DFCS_CAPTIONMIN;
SCMsg = SC_MINIMIZE;
HasBtn = IsMinBoxActive(hWnd);
break;
case HTMAXBUTTON:
Btn = DFCS_CAPTIONMAX;
SCMsg = SC_MAXIMIZE;
HasBtn = IsMaxBoxActive(hWnd);
break;
default:
return;
}
SetCapture(hWnd);
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), HasBtn , Btn);
while(1)
{
GetMessageW(&Msg, 0, 0, 0);
switch(Msg.message)
{
case WM_NCLBUTTONUP:
case WM_LBUTTONUP:
if(InBtn)
goto done;
else
{
ReleaseCapture();
return;
}
case WM_NCMOUSEMOVE:
case WM_MOUSEMOVE:
CurBtn = DefWndHitTestNC(hWnd, Msg.pt);
if(InBtn != (CurBtn == OrigBtn))
{
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), (CurBtn == OrigBtn) , Btn);
}
InBtn = CurBtn == OrigBtn;
break;
}
}
done:
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), FALSE , Btn);
ReleaseCapture();
SendMessageA(hWnd, WM_SYSCOMMAND, SCMsg, 0);
return;
}
LRESULT LRESULT
DefWndHandleLButtonDownNC(HWND hWnd, WPARAM wParam, LPARAM lParam) DefWndHandleLButtonDownNC(HWND hWnd, WPARAM wParam, LPARAM lParam)
{ {
@ -892,7 +957,7 @@ DefWndHandleLButtonDownNC(HWND hWnd, WPARAM wParam, LPARAM lParam)
} }
case HTMENU: case HTMENU:
{ {
SendMessageA(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU, lParam); SendMessageA(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTMENU, lParam);
break; break;
} }
case HTHSCROLL: case HTHSCROLL:
@ -906,19 +971,11 @@ DefWndHandleLButtonDownNC(HWND hWnd, WPARAM wParam, LPARAM lParam)
break; break;
} }
case HTMINBUTTON: case HTMINBUTTON:
{
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), IsMinBoxActive(hWnd), DFCS_CAPTIONMIN);
break;
}
case HTMAXBUTTON: case HTMAXBUTTON:
{
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), IsMaxBoxActive(hWnd), DFCS_CAPTIONMAX);
break;
}
case HTCLOSE: case HTCLOSE:
{ {
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), TRUE, DFCS_CAPTIONCLOSE); DefWndDoButtonHandle(hWnd, wParam);
break; break;
} }
case HTLEFT: case HTLEFT:
case HTRIGHT: case HTRIGHT:
@ -948,27 +1005,7 @@ DefWndHandleLButtonDblClkNC(HWND hWnd, WPARAM wParam, LPARAM lParam)
LRESULT LRESULT
DefWndHandleLButtonUpNC(HWND hWnd, WPARAM wParam, LPARAM lParam) DefWndHandleLButtonUpNC(HWND hWnd, WPARAM wParam, LPARAM lParam)
{ {
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), FALSE, DFCS_CAPTIONMIN); UNIMPLEMENTED;
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), FALSE, DFCS_CAPTIONMAX);
UserDrawCaptionButton( hWnd, GetWindowDC(hWnd), FALSE, DFCS_CAPTIONCLOSE);
switch (wParam)
{
case HTMINBUTTON:
{
SendMessageA(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
break;
}
case HTMAXBUTTON:
{
SendMessageA(hWnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0);
break;
}
case HTCLOSE:
{
SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
break;
}
}
return(0); return(0);
} }