ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a bunch of bugs related to scrolling.

This commit is contained in:
Dimitrie O. Paun 2002-09-12 22:26:08 +00:00 committed by Alexandre Julliard
parent c6629293a8
commit 1da4ea287d
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/comctl32/listview.c
View File

@ -843,22 +843,20 @@ static VOID LISTVIEW_UpdateScroll(LISTVIEW_INFO *infoPtr)
if (uView == LVS_LIST) if (uView == LVS_LIST)
{ {
/* update horizontal scrollbar */ /* update horizontal scrollbar */
INT nCountPerColumn = LISTVIEW_GetCountPerColumn(infoPtr); INT nCountPerColumn = LISTVIEW_GetCountPerColumn(infoPtr);
INT nCountPerRow = LISTVIEW_GetCountPerRow(infoPtr); INT nCountPerRow = LISTVIEW_GetCountPerRow(infoPtr);
INT nNumOfItems = GETITEMCOUNT(infoPtr); INT nNumOfItems = GETITEMCOUNT(infoPtr);
scrollInfo.nMax = nNumOfItems / nCountPerColumn;
TRACE("items=%d, perColumn=%d, perRow=%d\n", TRACE("items=%d, perColumn=%d, perRow=%d\n",
nNumOfItems, nCountPerColumn, nCountPerRow); nNumOfItems, nCountPerColumn, nCountPerRow);
scrollInfo.nMax = nNumOfItems / nCountPerColumn;
if((nNumOfItems % nCountPerColumn) == 0) if((nNumOfItems % nCountPerColumn) == 0)
{
scrollInfo.nMax--; scrollInfo.nMax--;
} if (scrollInfo.nMax < 0) scrollInfo.nMax = 0;
scrollInfo.nPos = ListView_GetTopIndex(infoPtr->hwndSelf) / nCountPerColumn; scrollInfo.nPos = ListView_GetTopIndex(infoPtr->hwndSelf) / nCountPerColumn;
scrollInfo.nPage = nCountPerRow; scrollInfo.nPage = nCountPerRow;
scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE; scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
TRACE("LVS_LIST\n");
SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo, TRUE); SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo, TRUE);
ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE); ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE);
} }
@ -8070,13 +8068,13 @@ static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode,
nNewScrollPos = scrollInfo.nMin; nNewScrollPos = scrollInfo.nMin;
} }
/* carry on only if it really changed */ /* set the new position, and reread in case it changed */
if (nNewScrollPos == nOldScrollPos) return 0;
/* set the new position */
scrollInfo.fMask = SIF_POS; scrollInfo.fMask = SIF_POS;
scrollInfo.nPos = nNewScrollPos; scrollInfo.nPos = nNewScrollPos;
SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &scrollInfo, TRUE); nNewScrollPos = SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &scrollInfo, TRUE);
/* carry on only if it really changed */
if (nNewScrollPos == nOldScrollPos) return 0;
/* now adjust to client coordinates */ /* now adjust to client coordinates */
nScrollDiff = nOldScrollPos - nNewScrollPos; nScrollDiff = nOldScrollPos - nNewScrollPos;
@ -8153,6 +8151,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode,
case SB_THUMBPOSITION: case SB_THUMBPOSITION:
case SB_THUMBTRACK: case SB_THUMBTRACK:
nScrollDiff = scrollInfo.nTrackPos - scrollInfo.nPos; nScrollDiff = scrollInfo.nTrackPos - scrollInfo.nPos;
break;
default: default:
nScrollDiff = 0; nScrollDiff = 0;
@ -8173,20 +8172,20 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode,
nNewScrollPos = scrollInfo.nMin; nNewScrollPos = scrollInfo.nMin;
} }
/* set the new position, and reread in case it changed */
scrollInfo.fMask = SIF_POS;
scrollInfo.nPos = nNewScrollPos;
nNewScrollPos = SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo, TRUE);
/* carry on only if it really changed */ /* carry on only if it really changed */
if (nNewScrollPos == nOldScrollPos) return 0; if (nNewScrollPos == nOldScrollPos) return 0;
/* set the new position */ if(uView == LVS_REPORT)
scrollInfo.fMask = SIF_POS; LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos);
scrollInfo.nPos = nNewScrollPos;
SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &scrollInfo, TRUE);
if(uView == LVS_REPORT)
LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos);
/* now adjust to client coordinates */ /* now adjust to client coordinates */
nScrollDiff = nOldScrollPos - nNewScrollPos; nScrollDiff = nOldScrollPos - nNewScrollPos;
if (uView == LVS_REPORT) nScrollDiff *= infoPtr->nItemHeight; if (uView == LVS_LIST) nScrollDiff *= infoPtr->nItemWidth;
/* and scroll the window */ /* and scroll the window */
ScrollWindowEx( infoPtr->hwndSelf, nScrollDiff, 0, &infoPtr->rcList, ScrollWindowEx( infoPtr->hwndSelf, nScrollDiff, 0, &infoPtr->rcList,