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_fffield.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/cxfa_fffield.h') diff --git a/xfa/fxfa/cxfa_fffield.h b/xfa/fxfa/cxfa_fffield.h index a27b3844b6..b51234a437 100644 --- a/xfa/fxfa/cxfa_fffield.h +++ b/xfa/fxfa/cxfa_fffield.h @@ -35,14 +35,17 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate { bool PerformLayout() override; bool OnMouseEnter() override; bool OnMouseExit() override; - bool OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) override; + bool AcceptsFocusOnButtonDown(uint32_t dwFlags, + const CFX_PointF& point, + FWL_MouseCommand command) override; + void OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) override; bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override; bool OnLButtonDblClk(uint32_t dwFlags, const CFX_PointF& point) override; bool OnMouseMove(uint32_t dwFlags, const CFX_PointF& point) override; bool OnMouseWheel(uint32_t dwFlags, int16_t zDelta, const CFX_PointF& point) override; - bool OnRButtonDown(uint32_t dwFlags, const CFX_PointF& point) override; + void OnRButtonDown(uint32_t dwFlags, const CFX_PointF& point) override; bool OnRButtonUp(uint32_t dwFlags, const CFX_PointF& point) override; bool OnRButtonDblClk(uint32_t dwFlags, const CFX_PointF& point) override; -- cgit v1.2.3