| Index: xfa/fxfa/app/xfa_ffsignature.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffsignature.cpp b/xfa/fxfa/app/xfa_ffsignature.cpp
|
| index ce1cee203346a9b06759324a730b38b8ab3e6bf6..4008abf80885ef2ca005c2e516b23caa1ffee89c 100644
|
| --- a/xfa/fxfa/app/xfa_ffsignature.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffsignature.cpp
|
| @@ -96,24 +96,20 @@ FX_BOOL CXFA_FFSignature::OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags) {
|
| FX_BOOL CXFA_FFSignature::OnChar(uint32_t dwChar, uint32_t dwFlags) {
|
| return FALSE;
|
| }
|
| -uint32_t CXFA_FFSignature::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
|
| +FWL_WidgetHit CXFA_FFSignature::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
|
| if (m_pNormalWidget) {
|
| FX_FLOAT ffx = fx, ffy = fy;
|
| FWLToClient(ffx, ffy);
|
| - uint32_t dwWidgetHit = m_pNormalWidget->HitTest(ffx, ffy);
|
| - if (dwWidgetHit != FWL_WGTHITTEST_Unknown) {
|
| - return FWL_WGTHITTEST_Client;
|
| - }
|
| + if (m_pNormalWidget->HitTest(ffx, ffy) != FWL_WidgetHit::Unknown)
|
| + return FWL_WidgetHit::Client;
|
| }
|
| CFX_RectF rtBox;
|
| GetRectWithoutRotate(rtBox);
|
| - if (!rtBox.Contains(fx, fy)) {
|
| - return FWL_WGTHITTEST_Unknown;
|
| - }
|
| - if (m_rtCaption.Contains(fx, fy)) {
|
| - return FWL_WGTHITTEST_Titlebar;
|
| - }
|
| - return FWL_WGTHITTEST_Client;
|
| + if (!rtBox.Contains(fx, fy))
|
| + return FWL_WidgetHit::Unknown;
|
| + if (m_rtCaption.Contains(fx, fy))
|
| + return FWL_WidgetHit::Titlebar;
|
| + return FWL_WidgetHit::Client;
|
| }
|
| FX_BOOL CXFA_FFSignature::OnSetCursor(FX_FLOAT fx, FX_FLOAT fy) {
|
| return FALSE;
|
|
|