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

Improvements by Royce Mitchell III

Browse source 
svn path=/trunk/; revision=4167
This commit is contained in:
Jason Filby 2003-02-17 19:48:27 +00:00
parent acea065ea0
commit f3ad138b6b
1 changed files with 167 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

174
reactos/lib/user32/controls/scrollbar.c
View file

@ -1,4 +1,4 @@
/* $Id: scrollbar.c,v 1.7 2003/01/24 22:42:14 jfilby Exp $ /* $Id: scrollbar.c,v 1.8 2003/02/17 19:48:27 jfilby Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -10,8 +10,6 @@
*/ */
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
/* INCLUDES ******************************************************************/
#include <windows.h> #include <windows.h>
#include <user32.h> #include <user32.h>
#include <debug.h> #include <debug.h>
@ -32,18 +30,26 @@ static HBITMAP hLfArrowI;
static HBITMAP hRgArrowI; static HBITMAP hRgArrowI;
*/ */
#define TOP_ARROW(flags,pressed) \ #define TOP_ARROW(flags,pressed) \
(((flags)&ESB_DISABLE_UP) ? hUpArrowI : ((pressed) ? hUpArrowD:hUpArrow)) (((flags)&ESB_DISABLE_UP) ? hUpArrowI : ((pressed) ?
hUpArrowD:hUpArrow))
#define BOTTOM_ARROW(flags,pressed) \ #define BOTTOM_ARROW(flags,pressed) \
(((flags)&ESB_DISABLE_DOWN) ? hDnArrowI : ((pressed) ? hDnArrowD:hDnArrow)) (((flags)&ESB_DISABLE_DOWN) ? hDnArrowI : ((pressed) ?
hDnArrowD:hDnArrow))
#define LEFT_ARROW(flags,pressed) \ #define LEFT_ARROW(flags,pressed) \
(((flags)&ESB_DISABLE_LEFT) ? hLfArrowI : ((pressed) ? hLfArrowD:hLfArrow)) (((flags)&ESB_DISABLE_LEFT) ? hLfArrowI : ((pressed) ?
hLfArrowD:hLfArrow))
#define RIGHT_ARROW(flags,pressed) \ #define RIGHT_ARROW(flags,pressed) \
(((flags)&ESB_DISABLE_RIGHT) ? hRgArrowI : ((pressed) ? hRgArrowD:hRgArrow)) (((flags)&ESB_DISABLE_RIGHT) ? hRgArrowI : ((pressed) ?
hRgArrowD:hRgArrow))
#define SCROLL_ARROW_THUMB_OVERLAP 0 /* Overlap between arrows and thumb */ #define SCROLL_ARROW_THUMB_OVERLAP 0 /* Overlap between arrows and
#define SCROLL_MIN_THUMB 6 /* Minimum size of the thumb in pixels */ thumb */
#define SCROLL_FIRST_DELAY 200 /* Delay (in ms) before first repetition when holding the button down */ #define SCROLL_MIN_THUMB 6 /* Minimum size of the thumb
#define SCROLL_REPEAT_DELAY 50 /* Delay (in ms) between scroll repetitions */ in pixels */
#define SCROLL_FIRST_DELAY 200 /* Delay (in ms) before first
repetition when holding the button down */
#define SCROLL_REPEAT_DELAY 50 /* Delay (in ms) between
scroll repetitions */
#define SCROLL_TIMER 0 /* Scroll timer id */ #define SCROLL_TIMER 0 /* Scroll timer id */
/* What to do after SCROLL_SetScrollInfo() */ /* What to do after SCROLL_SetScrollInfo() */
@ -59,21 +65,25 @@ enum SCROLL_HITTEST
SCROLL_TOP_ARROW, /* Top or left arrow */ SCROLL_TOP_ARROW, /* Top or left arrow */
SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */
SCROLL_THUMB, /* Thumb rectangle */ SCROLL_THUMB, /* Thumb rectangle */
SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom
arrow */
SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ SCROLL_BOTTOM_ARROW /* Bottom or right arrow */
}; };
static BOOL SCROLL_MovingThumb = FALSE; /* Is the moving thumb being displayed? */ static BOOL SCROLL_MovingThumb = FALSE; /* Is the moving thumb being
displayed? */
/* Thumb-tracking info */ /* Thumb-tracking info */
static HWND SCROLL_TrackingWin = 0; static HWND SCROLL_TrackingWin = 0;
static INT SCROLL_TrackingBar = 0; static INT SCROLL_TrackingBar = 0;
static INT SCROLL_TrackingPos = 0; static INT SCROLL_TrackingPos = 0;
/* static INT SCROLL_TrackingVal = 0; */ /* static INT SCROLL_TrackingVal = 0; */
static enum SCROLL_HITTEST SCROLL_trackHitTest; /* Hit test code of the last button-down event */ static enum SCROLL_HITTEST SCROLL_trackHitTest; /* Hit test code of the
last button-down event */
static BOOL SCROLL_trackVertical; static BOOL SCROLL_trackVertical;
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS
*****************************************************************/
HBRUSH DefWndControlColor (HDC hDC, UINT ctlType); HBRUSH DefWndControlColor (HDC hDC, UINT ctlType);
HPEN STDCALL GetSysColorPen (int nIndex); HPEN STDCALL GetSysColorPen (int nIndex);
@ -91,7 +101,8 @@ GetScrollBarInfo (HWND hwnd, LONG idObject, PSCROLLBARINFO psbi)
/* Ported from WINE20020904 */ /* Ported from WINE20020904 */
/* Draw the scroll bar interior (everything except the arrows). */ /* Draw the scroll bar interior (everything except the arrows). */
static void static void
SCROLL_DrawInterior (HWND hwnd, HDC hdc, INT nBar, INT arrowSize, PSCROLLBARINFO psbi) SCROLL_DrawInterior (HWND hwnd, HDC hdc, INT nBar, BOOL vertical, INT
arrowSize, PSCROLLBARINFO psbi)
{ {
INT thumbSize = psbi->xyThumbBottom - psbi->xyThumbTop; INT thumbSize = psbi->xyThumbBottom - psbi->xyThumbTop;
HPEN hSavePen; HPEN hSavePen;
@ -111,14 +122,16 @@ DbgPrint("[SCROLL_DrawInterior:%d]\n", nBar);
* The window-owned scrollbars need to call DefWndControlColor * The window-owned scrollbars need to call DefWndControlColor
* to correctly setup default scrollbar colors * to correctly setup default scrollbar colors
*/ */
if (nBar == SB_CTL) if ( nBar == SB_CTL )
{ {
hBrush = (HBRUSH) NtUserSendMessage (GetParent (hwnd), WM_CTLCOLORSCROLLBAR, hBrush = (HBRUSH) NtUserSendMessage (GetParent (hwnd),
WM_CTLCOLORSCROLLBAR,
(WPARAM) hdc, (LPARAM) hwnd); (WPARAM) hdc, (LPARAM) hwnd);
} }
else else
{ {
/* hBrush = NtUserGetControlColor (hdc, CTLCOLOR_SCROLLBAR); FIXME */ /* DefWndControlColor */ /* hBrush = NtUserGetControlColor (hdc, CTLCOLOR_SCROLLBAR); FIXME
*/ /* DefWndControlColor */
hBrush = GetSysColorBrush(COLOR_SCROLLBAR); hBrush = GetSysColorBrush(COLOR_SCROLLBAR);
} }
@ -126,15 +139,17 @@ DbgPrint("[SCROLL_DrawInterior:%d]\n", nBar);
hSaveBrush = SelectObject (hdc, hBrush); hSaveBrush = SelectObject (hdc, hBrush);
/* Calculate the scroll rectangle */ /* Calculate the scroll rectangle */
if (nBar == SB_VERT) if (vertical)
{ {
psbi->rcScrollBar.top += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; psbi->rcScrollBar.top += arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
psbi->rcScrollBar.bottom -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); psbi->rcScrollBar.bottom -= (arrowSize -
SCROLL_ARROW_THUMB_OVERLAP);
} }
else if (nBar == SB_HORZ) else
{ {
psbi->rcScrollBar.left += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; psbi->rcScrollBar.left += arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
psbi->rcScrollBar.right -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); psbi->rcScrollBar.right -= (arrowSize -
SCROLL_ARROW_THUMB_OVERLAP);
} }
/* Draw the scroll rectangles and thumb */ /* Draw the scroll rectangles and thumb */
@ -153,36 +168,42 @@ DbgPrint("[SCROLL_DrawInterior:%d]\n", nBar);
return; return;
} }
if (nBar == SB_VERT) if (vertical)
{ {
PatBlt (hdc, PatBlt (hdc,
psbi->rcScrollBar.left, psbi->rcScrollBar.left,
psbi->rcScrollBar.top, psbi->rcScrollBar.top,
psbi->rcScrollBar.right - psbi->rcScrollBar.left, psbi->rcScrollBar.right - psbi->rcScrollBar.left,
psbi->dxyLineButton - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), psbi->dxyLineButton - (arrowSize -
SCROLL_ARROW_THUMB_OVERLAP),
top_selected ? 0x0f0000 : PATCOPY); top_selected ? 0x0f0000 : PATCOPY);
psbi->rcScrollBar.top += psbi->dxyLineButton - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); psbi->rcScrollBar.top += psbi->dxyLineButton - (arrowSize -
SCROLL_ARROW_THUMB_OVERLAP);
PatBlt (hdc, PatBlt (hdc,
psbi->rcScrollBar.left, psbi->rcScrollBar.left,
psbi->rcScrollBar.top + thumbSize, psbi->rcScrollBar.top + thumbSize,
psbi->rcScrollBar.right - psbi->rcScrollBar.left, psbi->rcScrollBar.right - psbi->rcScrollBar.left,
psbi->rcScrollBar.bottom - psbi->rcScrollBar.top - thumbSize, psbi->rcScrollBar.bottom - psbi->rcScrollBar.top -
thumbSize,
bottom_selected ? 0x0f0000 : PATCOPY); bottom_selected ? 0x0f0000 : PATCOPY);
psbi->rcScrollBar.bottom = psbi->rcScrollBar.top + thumbSize; psbi->rcScrollBar.bottom = psbi->rcScrollBar.top + thumbSize;
} }
else if (nBar == SB_HORZ) else
{ {
PatBlt (hdc, PatBlt (hdc,
psbi->rcScrollBar.left, psbi->rcScrollBar.left,
psbi->rcScrollBar.top, psbi->rcScrollBar.top,
psbi->dxyLineButton - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), psbi->dxyLineButton - (arrowSize -
SCROLL_ARROW_THUMB_OVERLAP),
psbi->rcScrollBar.bottom - psbi->rcScrollBar.top, psbi->rcScrollBar.bottom - psbi->rcScrollBar.top,
top_selected ? 0x0f0000 : PATCOPY); top_selected ? 0x0f0000 : PATCOPY);
psbi->rcScrollBar.left += psbi->dxyLineButton - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); psbi->rcScrollBar.left += psbi->dxyLineButton - (arrowSize -
SCROLL_ARROW_THUMB_OVERLAP);
PatBlt (hdc, PatBlt (hdc,
psbi->rcScrollBar.left + thumbSize, psbi->rcScrollBar.left + thumbSize,
psbi->rcScrollBar.top, psbi->rcScrollBar.top,
psbi->rcScrollBar.right - psbi->rcScrollBar.left - thumbSize, psbi->rcScrollBar.right - psbi->rcScrollBar.left -
thumbSize,
psbi->rcScrollBar.bottom - psbi->rcScrollBar.top, psbi->rcScrollBar.bottom - psbi->rcScrollBar.top,
bottom_selected ? 0x0f0000 : PATCOPY); bottom_selected ? 0x0f0000 : PATCOPY);
psbi->rcScrollBar.right = psbi->rcScrollBar.left + thumbSize; psbi->rcScrollBar.right = psbi->rcScrollBar.left + thumbSize;
@ -198,14 +219,15 @@ DbgPrint("[SCROLL_DrawInterior:%d]\n", nBar);
/* Ported from WINE20020904 */ /* Ported from WINE20020904 */
static void static void
SCROLL_DrawMovingThumb (HDC hdc, RECT * rect, int nBar, int arrowSize, int thumbSize, PSCROLLBARINFO psbi) SCROLL_DrawMovingThumb (HDC hdc, RECT * rect, BOOL vertical, int
arrowSize, int thumbSize, PSCROLLBARINFO psbi)
{ {
INT pos = SCROLL_TrackingPos; INT pos = SCROLL_TrackingPos;
INT max_size; INT max_size;
if (nBar == SB_VERT) if ( vertical )
max_size = psbi->rcScrollBar.bottom - psbi->rcScrollBar.top; max_size = psbi->rcScrollBar.bottom - psbi->rcScrollBar.top;
else if (nBar == SB_HORZ) else
max_size = psbi->rcScrollBar.right - psbi->rcScrollBar.left; max_size = psbi->rcScrollBar.right - psbi->rcScrollBar.left;
max_size -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) + thumbSize; max_size -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) + thumbSize;
@ -215,7 +237,8 @@ SCROLL_DrawMovingThumb (HDC hdc, RECT * rect, int nBar, int arrowSize, int thumb
else if (pos > max_size) else if (pos > max_size)
pos = max_size; pos = max_size;
SCROLL_DrawInterior (SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, arrowSize, psbi); SCROLL_DrawInterior (SCROLL_TrackingWin, hdc, SCROLL_TrackingBar,
vertical, arrowSize, psbi);
SCROLL_MovingThumb = !SCROLL_MovingThumb; SCROLL_MovingThumb = !SCROLL_MovingThumb;
} }
@ -224,40 +247,36 @@ SCROLL_DrawMovingThumb (HDC hdc, RECT * rect, int nBar, int arrowSize, int thumb
/* Draw the scroll bar arrows. */ /* Draw the scroll bar arrows. */
static void static void
SCROLL_DrawArrows (HDC hdc, PSCROLLBARINFO info, SCROLL_DrawArrows (HDC hdc, PSCROLLBARINFO info,
RECT * rect, INT arrowSize, int nBar, RECT * rect, INT arrowSize, BOOL vertical,
BOOL top_pressed, BOOL bottom_pressed) BOOL top_pressed, BOOL bottom_pressed)
{ {
RECT r; RECT r1, r2;
int scrollDirFlag1, scrollDirFlag2; int scrollDirFlag1, scrollDirFlag2;
if (nBar == SB_VERT) r1 = r2 = *rect;
if (vertical)
{ {
scrollDirFlag1 = DFCS_SCROLLUP; scrollDirFlag1 = DFCS_SCROLLUP;
scrollDirFlag2 = DFCS_SCROLLDOWN; scrollDirFlag2 = DFCS_SCROLLDOWN;
r1.bottom = r1.top + arrowSize;
r2.top = r2.bottom - arrowSize;
} }
else if (nBar == SB_HORZ) else
{ {
scrollDirFlag1 = DFCS_SCROLLLEFT; scrollDirFlag1 = DFCS_SCROLLLEFT;
scrollDirFlag2 = DFCS_SCROLLRIGHT; scrollDirFlag2 = DFCS_SCROLLRIGHT;
r1.right = r1.left + arrowSize;
r2.left = r2.right - arrowSize;
} }
r = *rect; DrawFrameControl (hdc, &r1, DFC_SCROLL,
if (nBar == SB_VERT) scrollDirFlag1 | (top_pressed ? (DFCS_PUSHED | DFCS_FLAT) :
r.bottom = r.top + arrowSize; 0)
else if (nBar == SB_HORZ)
r.right = r.left + arrowSize;
DrawFrameControl (hdc, &r, DFC_SCROLL,
scrollDirFlag1 | (top_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0)
/* | (info.flags&ESB_DISABLE_LTUP ? DFCS_INACTIVE : 0) */ /* | (info.flags&ESB_DISABLE_LTUP ? DFCS_INACTIVE : 0) */
); );
r = *rect; DrawFrameControl (hdc, &r2, DFC_SCROLL,
if (nBar == SB_VERT) scrollDirFlag2 | (bottom_pressed ? (DFCS_PUSHED |
r.top = r.bottom - arrowSize; DFCS_FLAT) : 0)
else if (nBar == SB_HORZ)
r.left = r.right - arrowSize;
DrawFrameControl (hdc, &r, DFC_SCROLL,
scrollDirFlag2 | (bottom_pressed ? (DFCS_PUSHED | DFCS_FLAT) : 0)
/* | (info.flags&ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) */ /* | (info.flags&ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) */
); );
} }
@ -272,26 +291,43 @@ SCROLL_DrawScrollBar (HWND hwnd, HDC hdc, INT nBar,
INT thumbSize; INT thumbSize;
SCROLLBARINFO info; SCROLLBARINFO info;
BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb;
BOOL vertical;
info.cbSize = sizeof(SCROLLBARINFO); info.cbSize = sizeof(SCROLLBARINFO);
GetScrollBarInfo (hwnd, nBar, &info); GetScrollBarInfo (hwnd, nBar, &info);
thumbSize = info.xyThumbBottom - info.xyThumbTop; thumbSize = info.xyThumbBottom - info.xyThumbTop;
if (nBar == SB_HORZ) switch ( nBar )
{ {
arrowSize = GetSystemMetrics(SM_CYHSCROLL); case SB_HORZ:
} else vertical = FALSE;
if (nBar == SB_VERT) break;
{ case SB_VERT:
arrowSize = GetSystemMetrics(SM_CXVSCROLL); vertical = TRUE;
break;
case SB_CTL:
vertical = (GetWindowLong(hwnd,GWL_STYLE)&SBS_VERT) != 0;
break;
#ifdef DBG
default:
DASSERT(!"SCROLL_DrawScrollBar() called with invalid nBar");
break;
#endif /* DBG */
} }
if (vertical)
arrowSize = GetSystemMetrics(SM_CXVSCROLL);
else
arrowSize = GetSystemMetrics(SM_CYHSCROLL);
if (IsRectEmpty (&(info.rcScrollBar))) goto END; if (IsRectEmpty (&(info.rcScrollBar))) goto END;
if (Save_SCROLL_MovingThumb && (SCROLL_TrackingWin == hwnd) && (SCROLL_TrackingBar == nBar)) if (Save_SCROLL_MovingThumb && (SCROLL_TrackingWin == hwnd) &&
(SCROLL_TrackingBar == nBar))
{ {
SCROLL_DrawMovingThumb (hdc, &(info.rcScrollBar), nBar, arrowSize, thumbSize, &info); SCROLL_DrawMovingThumb (hdc, &(info.rcScrollBar), nBar, vertical,
arrowSize, thumbSize, &info);
} }
/* Draw the arrows */ /* Draw the arrows */
@ -299,24 +335,27 @@ SCROLL_DrawScrollBar (HWND hwnd, HDC hdc, INT nBar,
{ {
if (SCROLL_trackVertical == TRUE /* && GetCapture () == hwnd */) if (SCROLL_trackVertical == TRUE /* && GetCapture () == hwnd */)
{ {
SCROLL_DrawArrows (hdc, &info, &(info.rcScrollBar), arrowSize, nBar, SCROLL_DrawArrows (hdc, &info, &(info.rcScrollBar), arrowSize,
vertical,
(SCROLL_trackHitTest == SCROLL_TOP_ARROW), (SCROLL_trackHitTest == SCROLL_TOP_ARROW),
(SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW)); (SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW));
} }
else else
{ {
SCROLL_DrawArrows (hdc, &info, &(info.rcScrollBar), arrowSize, nBar, FALSE, FALSE); SCROLL_DrawArrows (hdc, &info, &(info.rcScrollBar), arrowSize,
vertical, FALSE, FALSE);
} }
} }
if (interior) if (interior)
{ {
SCROLL_DrawInterior (hwnd, hdc, nBar, arrowSize, &info); SCROLL_DrawInterior (hwnd, hdc, nBar, vertical, arrowSize, &info);
} }
if (Save_SCROLL_MovingThumb && if (Save_SCROLL_MovingThumb &&
(SCROLL_TrackingWin == hwnd) && (SCROLL_TrackingBar == nBar)) (SCROLL_TrackingWin == hwnd) && (SCROLL_TrackingBar == nBar))
SCROLL_DrawMovingThumb (hdc, &info.rcScrollBar, nBar, arrowSize, thumbSize, &info); SCROLL_DrawMovingThumb (hdc, &info.rcScrollBar, nBar, vertical,
arrowSize, thumbSize, &info);
/* if scroll bar has focus, reposition the caret */ /* if scroll bar has focus, reposition the caret */
/* if (hwnd == GetFocus () && (nBar == SB_CTL)) /* if (hwnd == GetFocus () && (nBar == SB_CTL))
@ -356,7 +395,8 @@ GetScrollRange (HWND hWnd, int nBar, LPINT lpMinPos, LPINT lpMaxPos)
} }
int STDCALL int STDCALL
SetScrollInfo (HWND hwnd, int fnBar, LPCSCROLLINFO lpsi, WINBOOL fRedraw) SetScrollInfo (HWND hwnd, int fnBar, LPCSCROLLINFO lpsi, WINBOOL
fRedraw)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
return 0; return 0;