Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 18:46:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed behaviour of sizing grip

Browse source 
svn path=/trunk/; revision=8126
This commit is contained in:
Thomas Bluemel 2004-02-10 08:11:56 +00:00
parent 28c16df7d2
commit db915d211a
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reactos/lib/user32/windows/nonclient.c
View file

@ -60,6 +60,11 @@ Already defined in makefile now.
#define HAS_THINFRAME(Style, ExStyle) \ #define HAS_THINFRAME(Style, ExStyle) \
(((Style) & (WS_BORDER | WS_MINIMIZE)) || (!((Style) & (WS_CHILD | WS_POPUP)))) (((Style) & (WS_BORDER | WS_MINIMIZE)) || (!((Style) & (WS_CHILD | WS_POPUP))))
#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \
(!(Style & WS_CHILD) || (ExStyle & WS_EX_MDICHILD) || \
((Style & WS_CHILD) && !(ParentStyle & WS_MAXIMIZE) && \
(WindowRect.right - WindowRect.left == ParentClientRect.right) && \
(WindowRect.bottom - WindowRect.top == ParentClientRect.bottom)))
/* /*
* FIXME: This should be moved to a header * FIXME: This should be moved to a header
*/ */
@ -268,6 +273,7 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn)
HDC hDC; HDC hDC;
BOOL Active; BOOL Active;
DWORD Style, ExStyle; DWORD Style, ExStyle;
HWND Parent;
RECT ClientRect, WindowRect, CurrentRect, TempRect; RECT ClientRect, WindowRect, CurrentRect, TempRect;
if (!IsWindowVisible(hWnd)) if (!IsWindowVisible(hWnd))
@ -280,13 +286,14 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn)
{ {
return 0; return 0;
} }
Parent = GetParent(hWnd);
ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE); ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE);
if (ExStyle & WS_EX_MDICHILD) if (ExStyle & WS_EX_MDICHILD)
{ {
Active = IsChild(GetForegroundWindow(), hWnd); Active = IsChild(GetForegroundWindow(), hWnd);
if (Active) if (Active)
Active = (hWnd == (HWND)SendMessageW(GetParent(hWnd), WM_MDIGETACTIVE, 0, 0)); Active = (hWnd == (HWND)SendMessageW(Parent, WM_MDIGETACTIVE, 0, 0));
} }
else else
{ {
@ -438,6 +445,8 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn)
if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL) && if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL) &&
(CurrentRect.bottom - CurrentRect.top) > GetSystemMetrics(SM_CYHSCROLL)) (CurrentRect.bottom - CurrentRect.top) > GetSystemMetrics(SM_CYHSCROLL))
{ {
RECT ParentClientRect;
TempRect = CurrentRect; TempRect = CurrentRect;
if (ExStyle & WS_EX_LEFTSCROLLBAR) if (ExStyle & WS_EX_LEFTSCROLLBAR)
TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL); TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL);
@ -446,7 +455,9 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn)
TempRect.top = TempRect.bottom - GetSystemMetrics(SM_CYHSCROLL); TempRect.top = TempRect.bottom - GetSystemMetrics(SM_CYHSCROLL);
FillRect(hDC, &TempRect, GetSysColorBrush(COLOR_SCROLLBAR)); FillRect(hDC, &TempRect, GetSysColorBrush(COLOR_SCROLLBAR));
/* FIXME: Correct drawing of size-box with WS_EX_LEFTSCROLLBAR */ /* FIXME: Correct drawing of size-box with WS_EX_LEFTSCROLLBAR */
if (!(Style & WS_CHILD) || (ExStyle & WS_EX_MDICHILD)) if(Parent)
GetClientRect(Parent, &ParentClientRect);
if (HASSIZEGRIP(Style, ExStyle, GetWindowLongW(Parent, GWL_STYLE), WindowRect, ParentClientRect))
{ {
TempRect.top--; TempRect.top--;
TempRect.bottom++; TempRect.bottom++;
@ -582,7 +593,7 @@ DefWndNCActivate(HWND hWnd, WPARAM wParam)
LRESULT LRESULT
DefWndNCHitTest(HWND hWnd, POINT Point) DefWndNCHitTest(HWND hWnd, POINT Point)
{ {
RECT WindowRect, ClientRect; RECT WindowRect, ClientRect, OrigWndRect;
POINT ClientPoint; POINT ClientPoint;
SIZE WindowBorders; SIZE WindowBorders;
ULONG Style = GetWindowLongW(hWnd, GWL_STYLE); ULONG Style = GetWindowLongW(hWnd, GWL_STYLE);
@ -593,7 +604,8 @@ DefWndNCHitTest(HWND hWnd, POINT Point)
{ {
return HTNOWHERE; return HTNOWHERE;
} }
OrigWndRect = WindowRect;
if (UserHasWindowEdge(Style, ExStyle)) if (UserHasWindowEdge(Style, ExStyle))
{ {
DWORD XSize, YSize; DWORD XSize, YSize;
@ -731,7 +743,8 @@ DefWndNCHitTest(HWND hWnd, POINT Point)
if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL) && if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL) &&
(WindowRect.bottom - WindowRect.top) > GetSystemMetrics(SM_CYHSCROLL)) (WindowRect.bottom - WindowRect.top) > GetSystemMetrics(SM_CYHSCROLL))
{ {
RECT TempRect = WindowRect, TempRect2 = WindowRect; RECT ParentRect, TempRect = WindowRect, TempRect2 = WindowRect;
HWND Parent = GetParent(hWnd);
TempRect.bottom -= GetSystemMetrics(SM_CYHSCROLL); TempRect.bottom -= GetSystemMetrics(SM_CYHSCROLL);
if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0)
@ -751,8 +764,10 @@ DefWndNCHitTest(HWND hWnd, POINT Point)
TempRect.top = TempRect2.top; TempRect.top = TempRect2.top;
TempRect.bottom = TempRect2.bottom; TempRect.bottom = TempRect2.bottom;
if (PtInRect(&TempRect, Point) && if(Parent)
(!(Style & WS_CHILD) || (ExStyle & WS_EX_MDICHILD))) GetClientRect(Parent, &ParentRect);
if (PtInRect(&TempRect, Point) && HASSIZEGRIP(Style, ExStyle,
GetWindowLongW(Parent, GWL_STYLE), OrigWndRect, ParentRect))
{ {
if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0)
return HTBOTTOMLEFT; return HTBOTTOMLEFT;
@ -921,6 +936,16 @@ DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam)
case HTBOTTOMLEFT: case HTBOTTOMLEFT:
case HTBOTTOMRIGHT: case HTBOTTOMRIGHT:
{ {
HWND Parent;
if(wParam == HTBOTTOMRIGHT && (Parent = GetParent(hWnd)) &&
(GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) &&
!(GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_MDICHILD) &&
!(GetWindowLongW(Parent, GWL_STYLE) & WS_MAXIMIZE))
{
SendMessageW(Parent, WM_SYSCOMMAND, SC_SIZE + wParam - 2, lParam);
break;
}
SendMessageW(hWnd, WM_SYSCOMMAND, SC_SIZE + wParam - 2, lParam); SendMessageW(hWnd, WM_SYSCOMMAND, SC_SIZE + wParam - 2, lParam);
break; break;
} }