diff options
Diffstat (limited to 'fpdfsdk/cpdfsdk_pageview.cpp')
| -rw-r--r-- | fpdfsdk/cpdfsdk_pageview.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index 0136077df5..aae903eeb1 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -156,8 +156,8 @@ CPDFSDK_Annot* CPDFSDK_PageView::GetFXWidgetAtPoint(FX_FLOAT pageX, #endif // PDF_ENABLE_XFA if (bHitTest) { pAnnotMgr->Annot_OnGetViewBBox(this, pSDKAnnot.Get()); - if (pAnnotMgr->Annot_OnHitTest(this, pSDKAnnot.Get(), - CFX_PointF(pageX, pageY))) + CFX_FloatPoint point(pageX, pageY); + if (pAnnotMgr->Annot_OnHitTest(this, pSDKAnnot.Get(), point)) return pSDKAnnot.Get(); } } @@ -246,7 +246,8 @@ CPDFSDK_Annot* CPDFSDK_PageView::GetAnnotByXFAWidget(CXFA_FFWidget* hWidget) { } #endif // PDF_ENABLE_XFA -bool CPDFSDK_PageView::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) { +bool CPDFSDK_PageView::OnLButtonDown(const CFX_FloatPoint& point, + uint32_t nFlag) { CPDFSDK_Annot::ObservedPtr pAnnot(GetFXWidgetAtPoint(point.x, point.y)); if (!pAnnot) { m_pFormFillEnv->KillFocusAnnot(nFlag); @@ -266,7 +267,8 @@ bool CPDFSDK_PageView::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) { } #ifdef PDF_ENABLE_XFA -bool CPDFSDK_PageView::OnRButtonDown(const CFX_PointF& point, uint32_t nFlag) { +bool CPDFSDK_PageView::OnRButtonDown(const CFX_FloatPoint& point, + uint32_t nFlag) { CPDFSDK_Annot::ObservedPtr pAnnot(GetFXWidgetAtPoint(point.x, point.y)); if (!pAnnot) return false; @@ -283,7 +285,8 @@ bool CPDFSDK_PageView::OnRButtonDown(const CFX_PointF& point, uint32_t nFlag) { return true; } -bool CPDFSDK_PageView::OnRButtonUp(const CFX_PointF& point, uint32_t nFlag) { +bool CPDFSDK_PageView::OnRButtonUp(const CFX_FloatPoint& point, + uint32_t nFlag) { CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = m_pFormFillEnv->GetAnnotHandlerMgr(); CPDFSDK_Annot::ObservedPtr pFXAnnot(GetFXWidgetAtPoint(point.x, point.y)); @@ -297,7 +300,8 @@ bool CPDFSDK_PageView::OnRButtonUp(const CFX_PointF& point, uint32_t nFlag) { } #endif // PDF_ENABLE_XFA -bool CPDFSDK_PageView::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) { +bool CPDFSDK_PageView::OnLButtonUp(const CFX_FloatPoint& point, + uint32_t nFlag) { CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = m_pFormFillEnv->GetAnnotHandlerMgr(); CPDFSDK_Annot::ObservedPtr pFXAnnot(GetFXWidgetAtPoint(point.x, point.y)); @@ -311,7 +315,7 @@ bool CPDFSDK_PageView::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) { pAnnotHandlerMgr->Annot_OnLButtonUp(this, &pFXAnnot, nFlag, point); } -bool CPDFSDK_PageView::OnMouseMove(const CFX_PointF& point, int nFlag) { +bool CPDFSDK_PageView::OnMouseMove(const CFX_FloatPoint& point, int nFlag) { CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = m_pFormFillEnv->GetAnnotHandlerMgr(); CPDFSDK_Annot::ObservedPtr pFXAnnot(GetFXAnnotAtPoint(point.x, point.y)); @@ -345,7 +349,7 @@ bool CPDFSDK_PageView::OnMouseMove(const CFX_PointF& point, int nFlag) { bool CPDFSDK_PageView::OnMouseWheel(double deltaX, double deltaY, - const CFX_PointF& point, + const CFX_FloatPoint& point, int nFlag) { CPDFSDK_Annot::ObservedPtr pAnnot(GetFXWidgetAtPoint(point.x, point.y)); if (!pAnnot) |