Menu
▾
▴
[htoolkit-cvs] port/src/cbits/Win32 Window.c,1.31,1.32
|
From: <kr_...@us...> - 2003-07-02 18:09:50
|
Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1:/tmp/cvs-serv3675/src/cbits/Win32
Modified Files:
Window.c
Log Message:
Setup the default page and line steps for scrollers to 1 and 10
Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Window.c 8 Jun 2003 10:25:41 -0000 1.31
--- Window.c 2 Jul 2003 18:09:47 -0000 1.32
***************
*** 149,156 ****
pData->DomainSize.cx = 0;
pData->DomainSize.cy = 0;
! pData->LineSize.cx = 0;
! pData->LineSize.cy = 0;
! pData->PageSize.cx = 0;
! pData->PageSize.cy = 0;
pData->bInDragMode = FALSE;
pData->bInMouseMoveMode = FALSE;
--- 149,156 ----
pData->DomainSize.cx = 0;
pData->DomainSize.cy = 0;
! pData->LineSize.cx = 1;
! pData->LineSize.cy = 1;
! pData->PageSize.cx = 10;
! pData->PageSize.cy = 10;
pData->bInDragMode = FALSE;
pData->bInMouseMoveMode = FALSE;
***************
*** 311,326 ****
int nPos = pData->Origin.y;
int nLimit;
- int nLine;
- int nPage;
GetClientRect(hWnd,&rect);
nLimit = pData->DomainSize.cy - (rect.bottom-rect.top);
- /* DAAN: use default scroll when line/page is unspecified: line=10% of view, page=80% of view */
- if (pData->LineSize.cy <= 0) nLine = max(1,(rect.bottom-rect.top)/10);
- else nLine = pData->LineSize.cy;
- if (pData->PageSize.cy <= 0) nPage = max(1,((rect.bottom-rect.top)*8)/10);
- else nPage = pData->PageSize.cy;
-
switch (LOWORD(wParam))
{
--- 311,318 ----
***************
*** 329,348 ****
break;
case SB_LINEDOWN:
! nPos = min(nLimit,pData->Origin.y + nLine);
break;
case SB_LINEUP:
! nPos = max(0,pData->Origin.y - nLine);
break;
case SB_PAGEDOWN:
! nPos = min(nLimit,pData->Origin.y + nPage);
break;
case SB_PAGEUP:
! nPos = max(0,pData->Origin.y - nPage);
break;
case SB_THUMBPOSITION:
- nPos = (HIWORD(wParam)); /* DAAN: position exactly */
- break;
case SB_THUMBTRACK:
! nPos = (HIWORD(wParam)/nLine)*nLine;
break;
case SB_TOP:
--- 321,338 ----
break;
case SB_LINEDOWN:
! nPos = min(nLimit,pData->Origin.y + pData->LineSize.cy);
break;
case SB_LINEUP:
! nPos = max(0,pData->Origin.y - pData->LineSize.cy);
break;
case SB_PAGEDOWN:
! nPos = min(nLimit,pData->Origin.y + pData->PageSize.cy);
break;
case SB_PAGEUP:
! nPos = max(0,pData->Origin.y - pData->PageSize.cy);
break;
case SB_THUMBPOSITION:
case SB_THUMBTRACK:
! nPos = (HIWORD(wParam)/pData->LineSize.cy)*pData->LineSize.cy;
break;
case SB_TOP:
***************
*** 374,389 ****
int nPos = pData->Origin.x;
int nLimit;
- int nLine;
- int nPage;
GetClientRect(hWnd,&rect);
nLimit = pData->DomainSize.cx - (rect.right-rect.left);
- /* DAAN: use default scroll when line/page is unspecified: line=10% of view, page=80% of view */
- if (pData->LineSize.cx <= 0) nLine = max(1,(rect.right-rect.left)/10);
- else nLine = pData->LineSize.cx;
- if (pData->PageSize.cx <= 0) nPage = max(1,((rect.right-rect.left)*8)/10);
- else nPage = pData->PageSize.cx;
-
switch (LOWORD(wParam))
{
--- 364,371 ----
***************
*** 392,411 ****
break;
case SB_LINEDOWN:
! nPos = min(nLimit,pData->Origin.x + nLine);
break;
case SB_LINEUP:
! nPos = max(0,pData->Origin.x - nLine);
break;
case SB_PAGEDOWN:
! nPos = min(nLimit,pData->Origin.x + nPage);
break;
case SB_PAGEUP:
! nPos = max(0,pData->Origin.x - nPage);
break;
case SB_THUMBPOSITION:
- nPos = (HIWORD(wParam)); /* DAAN: position exactly */
- break;
case SB_THUMBTRACK:
! nPos = (HIWORD(wParam)/nLine)*nLine;
break;
case SB_TOP:
--- 374,391 ----
break;
case SB_LINEDOWN:
! nPos = min(nLimit,pData->Origin.x + pData->LineSize.cx);
break;
case SB_LINEUP:
! nPos = max(0,pData->Origin.x - pData->LineSize.cx);
break;
case SB_PAGEDOWN:
! nPos = min(nLimit,pData->Origin.x + pData->PageSize.cx);
break;
case SB_PAGEUP:
! nPos = max(0,pData->Origin.x - pData->PageSize.cx);
break;
case SB_THUMBPOSITION:
case SB_THUMBTRACK:
! nPos = (HIWORD(wParam)/pData->LineSize.cx)*pData->LineSize.cx;
break;
case SB_TOP:
***************
*** 436,450 ****
int nDelta = GET_WHEEL_DELTA_WPARAM(wParam)/WHEEL_DELTA;
int nPos, nOldPos = pData->Origin.y;
- int nLine;
GetClientRect(hWnd,&rect);
nLimit = pData->DomainSize.cy - (rect.bottom-rect.top);
! /* DAAN: use default scroll when line/page is unspecified: line=10% of view, page=80% of view */
! if (pData->LineSize.cy <= 0) nLine = max(1,(rect.bottom - rect.top)/10);
! else nLine = pData->LineSize.cy;
!
!
! nPos = nOldPos - nDelta*nLine;
nPos = max(0,min(nLimit,nPos));
--- 416,424 ----
int nDelta = GET_WHEEL_DELTA_WPARAM(wParam)/WHEEL_DELTA;
int nPos, nOldPos = pData->Origin.y;
GetClientRect(hWnd,&rect);
nLimit = pData->DomainSize.cy - (rect.bottom-rect.top);
! nPos = nOldPos - nDelta*pData->LineSize.cy;
nPos = max(0,min(nLimit,nPos));
|
