TREEVIEW_UpdateScrollBars() now copes with an empty tree.

292d8429 · Adam Gundy · Alexandre Julliard · d4fcc4bd · 292d8429
Commit 292d8429 authored Mar 06, 2003 by Adam Gundy Committed by Alexandre Julliard Mar 06, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 6 deletions

treeview.c dlls/comctl32/treeview.c +15 -6

No files found.
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -2690,14 +2690,23 @@ TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr)
    if (vert)
    {
 	si.nPage = TREEVIEW_GetVisibleCount(infoPtr);
-	si.nPos  = infoPtr->firstVisible->visibleOrder;
-	si.nMax  = infoPtr->maxVisibleOrder - 1;
+       if ( si.nPage )
+       {
+           si.nPos  = infoPtr->firstVisible->visibleOrder;
+           si.nMax  = infoPtr->maxVisibleOrder - 1;

-	SetScrollInfo(hwnd, SB_VERT, &si, TRUE);
+           SetScrollInfo(hwnd, SB_VERT, &si, TRUE);

-	if (!(infoPtr->uInternalStatus & TV_VSCROLL))
-	    ShowScrollBar(hwnd, SB_VERT, TRUE);
-	infoPtr->uInternalStatus |= TV_VSCROLL;
+           if (!(infoPtr->uInternalStatus & TV_VSCROLL))
+               ShowScrollBar(hwnd, SB_VERT, TRUE);
+           infoPtr->uInternalStatus |= TV_VSCROLL;
+       }
+       else
+       {
+           if (infoPtr->uInternalStatus & TV_VSCROLL)
+               ShowScrollBar(hwnd, SB_VERT, FALSE);
+           infoPtr->uInternalStatus &= ~TV_VSCROLL;
+       }
    }
    else
    {