From d105fe21698e4b4accbc75f5d1714e35fcdfad5c Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Wed, 3 Dec 2003 03:55:12 +0000 Subject: [PATCH] Only honour SBS_SIZEBOX*ALIGN styles if SBS_SIZE{GRIP,BOX} is set. --- controls/scroll.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/controls/scroll.c b/controls/scroll.c index fe78a1a8de..5c87c2d437 100644 --- a/controls/scroll.c +++ b/controls/scroll.c @@ -974,7 +974,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) return; - if (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX)) + if (nBar == SB_CTL && (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX))) { switch(msg) { @@ -1278,17 +1278,16 @@ LPCREATESTRUCTW lpCreate /* [in] The style and place of the scroll bar */) } - if (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN) + if (lpCreate->style & (SBS_SIZEGRIP | SBS_SIZEBOX)) { - MoveWindow( hwnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL)+1, - GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); - } - else if(lpCreate->style & SBS_SIZEBOXBOTTOMRIGHTALIGN) - { - MoveWindow( hwnd, lpCreate->x+lpCreate->cx-GetSystemMetrics(SM_CXVSCROLL)-1, - lpCreate->y+lpCreate->cy-GetSystemMetrics(SM_CYHSCROLL)-1, - GetSystemMetrics(SM_CXVSCROLL)+1, - GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); + if (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN) + MoveWindow( hwnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL)+1, + GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); + else if(lpCreate->style & SBS_SIZEBOXBOTTOMRIGHTALIGN) + MoveWindow( hwnd, lpCreate->x+lpCreate->cx-GetSystemMetrics(SM_CXVSCROLL)-1, + lpCreate->y+lpCreate->cy-GetSystemMetrics(SM_CYHSCROLL)-1, + GetSystemMetrics(SM_CXVSCROLL)+1, + GetSystemMetrics(SM_CYHSCROLL)+1, FALSE ); } else if (lpCreate->style & SBS_VERT) { -- 2.32.0.93.g670b81a890