comctl32/listbox: Fix multicolumn navigation on VK_RIGHT.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/listbox: Fix multicolumn navigation on VK_RIGHT.
da75153e · Nikolay Sivov · Alexandre Julliard · c9b6dd83 · da75153e
Commit da75153e authored Aug 22, 2018 by Nikolay Sivov Committed by Alexandre Julliard Aug 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

listbox.c dlls/comctl32/listbox.c +1 -2

No files found.
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2349,8 +2349,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key )
        if (descr->style & LBS_MULTICOLUMN)
        {
            bForceSelection = FALSE;
-            if (descr->focus_item + descr->page_size < descr->nb_items)
-                caret = descr->focus_item + descr->page_size;
+            caret = min(descr->focus_item + descr->page_size, descr->nb_items - 1);
            break;
        }
        /* fall through */