| Index: xfa/fwl/basewidget/fwl_listboximp.cpp
|
| diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp
|
| index 9b5d2fc42485d9a4fe9108a9eb837feb50fa948a..dd017e215ff5741351aa9e54ee4711ee4c2941c8 100644
|
| --- a/xfa/fwl/basewidget/fwl_listboximp.cpp
|
| +++ b/xfa/fwl/basewidget/fwl_listboximp.cpp
|
| @@ -142,25 +142,22 @@ FWL_ERR CFWL_ListBoxImp::Update() {
|
| CalcSize();
|
| return FWL_ERR_Succeeded;
|
| }
|
| -uint32_t CFWL_ListBoxImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
|
| +FWL_WidgetHit CFWL_ListBoxImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
|
| if (IsShowScrollBar(FALSE)) {
|
| CFX_RectF rect;
|
| m_pHorzScrollBar->GetWidgetRect(rect);
|
| - if (rect.Contains(fx, fy)) {
|
| - return FWL_WGTHITTEST_HScrollBar;
|
| - }
|
| + if (rect.Contains(fx, fy))
|
| + return FWL_WidgetHit::HScrollBar;
|
| }
|
| if (IsShowScrollBar(TRUE)) {
|
| CFX_RectF rect;
|
| m_pVertScrollBar->GetWidgetRect(rect);
|
| - if (rect.Contains(fx, fy)) {
|
| - return FWL_WGTHITTEST_VScrollBar;
|
| - }
|
| - }
|
| - if (m_rtClient.Contains(fx, fy)) {
|
| - return FWL_WGTHITTEST_Client;
|
| + if (rect.Contains(fx, fy))
|
| + return FWL_WidgetHit::VScrollBar;
|
| }
|
| - return FWL_WGTHITTEST_Unknown;
|
| + if (m_rtClient.Contains(fx, fy))
|
| + return FWL_WidgetHit::Client;
|
| + return FWL_WidgetHit::Unknown;
|
| }
|
| FWL_ERR CFWL_ListBoxImp::DrawWidget(CFX_Graphics* pGraphics,
|
| const CFX_Matrix* pMatrix) {
|
|
|