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

In TREEVIEW_EnsureVisible handle case where firstVisible is NULL.

This commit is contained in:
Ulrich Czekalla 2003-11-27 00:55:18 +00:00 committed by Alexandre Julliard
parent cfcc449324
commit 1afef2c732
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/comctl32/treeview.c
View File

@ -4382,8 +4382,10 @@ static INT TREEVIEW_ProcessLetterKeys(
static LRESULT static LRESULT
TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll) TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll)
{ {
int viscount;
BOOL hasFirstVisible = infoPtr->firstVisible != NULL;
HTREEITEM newFirstVisible = NULL; HTREEITEM newFirstVisible = NULL;
int visible_pos; int visible_pos = -1;
if (!TREEVIEW_ValidItem(infoPtr, item)) if (!TREEVIEW_ValidItem(infoPtr, item))
return FALSE; return FALSE;
@ -4408,23 +4410,26 @@ TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll)
} }
} }
TRACE("%p (%s) %ld - %ld\n", item, TREEVIEW_ItemName(item), item->visibleOrder, viscount = TREEVIEW_GetVisibleCount(infoPtr);
infoPtr->firstVisible->visibleOrder);
visible_pos = item->visibleOrder - infoPtr->firstVisible->visibleOrder; TRACE("%p (%s) %ld - %ld viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder,
hasFirstVisible ? infoPtr->firstVisible->visibleOrder : -1, viscount);
if (hasFirstVisible)
visible_pos = item->visibleOrder - infoPtr->firstVisible->visibleOrder;
if (visible_pos < 0) if (visible_pos < 0)
{ {
/* item is before the start of the list: put it at the top. */ /* item is before the start of the list: put it at the top. */
newFirstVisible = item; newFirstVisible = item;
} }
else if (visible_pos >= TREEVIEW_GetVisibleCount(infoPtr) else if (visible_pos >= viscount
/* Sometimes, before we are displayed, GVC is 0, causing us to /* Sometimes, before we are displayed, GVC is 0, causing us to
* spuriously scroll up. */ * spuriously scroll up. */
&& visible_pos > 0) && visible_pos > 0)
{ {
/* item is past the end of the list. */ /* item is past the end of the list. */
int scroll = visible_pos - TREEVIEW_GetVisibleCount(infoPtr); int scroll = visible_pos - viscount;
newFirstVisible = TREEVIEW_GetListItem(infoPtr, infoPtr->firstVisible, newFirstVisible = TREEVIEW_GetListItem(infoPtr, infoPtr->firstVisible,
scroll + 1); scroll + 1);