From d27f392c79ce53390f9de36778bb20f73f3e9324 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Tue, 10 Apr 2018 16:10:36 +0000 Subject: Break down CXFA_FFWidget::On{L|R}ButtonDown() into two steps. The first step, AcceptsFocusOnButtonDown(), returns whether the widget wants focus on a mouse click. The second step, On{L|R}ButtonDown(), handles the click after focus has been assigned. Bug: chromium:820256 Change-Id: I9da1f1a930f198fc17b24acb7f1e3e6ef7f12ae4 Reviewed-on: https://pdfium-review.googlesource.com/29951 Reviewed-by: Ryan Harrison Commit-Queue: Henrique Nakashima --- xfa/fxfa/cxfa_ffwidget.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/cxfa_ffwidget.cpp') diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index 629f3bd188..f9a4807099 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -360,10 +360,14 @@ bool CXFA_FFWidget::OnMouseExit() { return false; } -bool CXFA_FFWidget::OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) { +bool CXFA_FFWidget::AcceptsFocusOnButtonDown(uint32_t dwFlags, + const CFX_PointF& point, + FWL_MouseCommand command) { return false; } +void CXFA_FFWidget::OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) {} + bool CXFA_FFWidget::OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) { return false; } @@ -382,9 +386,7 @@ bool CXFA_FFWidget::OnMouseWheel(uint32_t dwFlags, return false; } -bool CXFA_FFWidget::OnRButtonDown(uint32_t dwFlags, const CFX_PointF& point) { - return false; -} +void CXFA_FFWidget::OnRButtonDown(uint32_t dwFlags, const CFX_PointF& point) {} bool CXFA_FFWidget::OnRButtonUp(uint32_t dwFlags, const CFX_PointF& point) { return false; -- cgit v1.2.3