Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32] Minimize Wine diff (#2035)

Browse source 
Addendum to b931f643e3.

CORE-16466
This commit is contained in:
Serge Gautherie 2019-11-26 23:27:21 +01:00 committed by Katayama Hirofumi MZ
parent 3bc93e9353
commit 27502f5c51
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dll/win32/comctl32/listview.c
View file

@ -2115,26 +2115,17 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr)
ZeroMemory(&vertInfo, sizeof(SCROLLINFO)); ZeroMemory(&vertInfo, sizeof(SCROLLINFO));
vertInfo.cbSize = sizeof(SCROLLINFO); vertInfo.cbSize = sizeof(SCROLLINFO);
#ifdef __REACTOS__ /* CORE-16466 part 2 of 4 */ #ifdef __REACTOS__ /* CORE-16466 part 2 of 4 */
vertInfo.nPage = max((infoPtr->rcList.bottom - infoPtr->rcList.top), 0); vertInfo.nPage = max(0, infoPtr->rcList.bottom - infoPtr->rcList.top);
#else #else
vertInfo.nPage = infoPtr->rcList.bottom - infoPtr->rcList.top; vertInfo.nPage = infoPtr->rcList.bottom - infoPtr->rcList.top;
#endif #endif
if (infoPtr->uView == LV_VIEW_DETAILS) if (infoPtr->uView == LV_VIEW_DETAILS)
{ {
#ifdef __REACTOS__ /* CORE-16466 part 3 of 4 */ #ifdef __REACTOS__ /* CORE-16466 part 3a of 4 */
if (vertInfo.nPage != 0) if (vertInfo.nPage != 0)
{ {
vertInfo.nMax = infoPtr->nItemCount; #endif
/* scroll by at least one page */
if (vertInfo.nPage < infoPtr->nItemHeight)
vertInfo.nPage = infoPtr->nItemHeight;
if (infoPtr->nItemHeight > 0)
vertInfo.nPage /= infoPtr->nItemHeight;
}
#else
vertInfo.nMax = infoPtr->nItemCount; vertInfo.nMax = infoPtr->nItemCount;
/* scroll by at least one page */ /* scroll by at least one page */
@ -2143,6 +2134,8 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr)
if (infoPtr->nItemHeight > 0) if (infoPtr->nItemHeight > 0)
vertInfo.nPage /= infoPtr->nItemHeight; vertInfo.nPage /= infoPtr->nItemHeight;
#ifdef __REACTOS__ /* CORE-16466 part 3b of 4 */
}
#endif #endif
} }
else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */