| Index: xfa/fwl/core/ifwl_listbox.cpp
|
| diff --git a/xfa/fwl/core/ifwl_listbox.cpp b/xfa/fwl/core/ifwl_listbox.cpp
|
| index d52e8b1c8cf5e0f15d806bf00d5b601756e006f2..9a713c09cd4f367cb115e26dbeff31181c72e7c0 100644
|
| --- a/xfa/fwl/core/ifwl_listbox.cpp
|
| +++ b/xfa/fwl/core/ifwl_listbox.cpp
|
| @@ -1089,49 +1089,50 @@ void IFWL_ListBox::OnVK(CFWL_ListItem* pItem, bool bShift, bool bCtrl) {
|
| }
|
|
|
| bool IFWL_ListBox::OnScroll(IFWL_ScrollBar* pScrollBar,
|
| - uint32_t dwCode,
|
| + FWL_SCBCODE dwCode,
|
| FX_FLOAT fPos) {
|
| CFX_SizeF fs;
|
| pScrollBar->GetRange(&fs.x, &fs.y);
|
| FX_FLOAT iCurPos = pScrollBar->GetPos();
|
| FX_FLOAT fStep = pScrollBar->GetStepSize();
|
| switch (dwCode) {
|
| - case FWL_SCBCODE_Min: {
|
| + case FWL_SCBCODE::Min: {
|
| fPos = fs.x;
|
| break;
|
| }
|
| - case FWL_SCBCODE_Max: {
|
| + case FWL_SCBCODE::Max: {
|
| fPos = fs.y;
|
| break;
|
| }
|
| - case FWL_SCBCODE_StepBackward: {
|
| + case FWL_SCBCODE::StepBackward: {
|
| fPos -= fStep;
|
| if (fPos < fs.x + fStep / 2)
|
| fPos = fs.x;
|
| break;
|
| }
|
| - case FWL_SCBCODE_StepForward: {
|
| + case FWL_SCBCODE::StepForward: {
|
| fPos += fStep;
|
| if (fPos > fs.y - fStep / 2)
|
| fPos = fs.y;
|
| break;
|
| }
|
| - case FWL_SCBCODE_PageBackward: {
|
| + case FWL_SCBCODE::PageBackward: {
|
| fPos -= pScrollBar->GetPageSize();
|
| if (fPos < fs.x)
|
| fPos = fs.x;
|
| break;
|
| }
|
| - case FWL_SCBCODE_PageForward: {
|
| + case FWL_SCBCODE::PageForward: {
|
| fPos += pScrollBar->GetPageSize();
|
| if (fPos > fs.y)
|
| fPos = fs.y;
|
| break;
|
| }
|
| - case FWL_SCBCODE_Pos:
|
| - case FWL_SCBCODE_TrackPos:
|
| + case FWL_SCBCODE::Pos:
|
| + case FWL_SCBCODE::TrackPos:
|
| + case FWL_SCBCODE::None:
|
| break;
|
| - case FWL_SCBCODE_EndScroll:
|
| + case FWL_SCBCODE::EndScroll:
|
| return false;
|
| }
|
| if (iCurPos != fPos) {
|
|
|