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

user32/listbox: Fix mouse wheel scrolling for multi-column listboxes. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2019-06-05 14:38:58 +03:00 committed by Alexandre Julliard
parent 1f37875194
commit b95bc84273
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/user32/listbox.c
View File

@ -2083,7 +2083,7 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos
static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta )
{ {
UINT pulScrollLines = 3; INT pulScrollLines = 3;
SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0);
@ -2097,9 +2097,20 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta )
if (descr->wheel_remain && pulScrollLines) if (descr->wheel_remain && pulScrollLines)
{ {
int cLineScroll; int cLineScroll;
pulScrollLines = min((UINT) descr->page_size, pulScrollLines); if (descr->style & LBS_MULTICOLUMN)
cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; {
descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; pulScrollLines = min(descr->width / descr->column_width, pulScrollLines);
pulScrollLines = max(1, pulScrollLines);
cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA;
descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines;
cLineScroll *= descr->page_size;
}
else
{
pulScrollLines = min(descr->page_size, pulScrollLines);
cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA;
descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines;
}
LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE );
} }
return 0; return 0;