diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-04-10 16:10:36 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-10 16:10:36 +0000 |
| commit | d27f392c79ce53390f9de36778bb20f73f3e9324 (patch) | |
| tree | 0e1b34a82134a0e170146e573414cf0461683047 /xfa/fxfa/cxfa_ffimageedit.cpp | |
| parent | 4027887ee29a7f4920b03041068bff9bde239782 (diff) | |
| download | pdfium-d27f392c79ce53390f9de36778bb20f73f3e9324.tar.xz | |
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 <rharrison@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffimageedit.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffimageedit.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp index df47493cca..40afdb1c4c 100644 --- a/xfa/fxfa/cxfa_ffimageedit.cpp +++ b/xfa/fxfa/cxfa_ffimageedit.cpp @@ -96,13 +96,22 @@ void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS, iImageYDpi, iHorzAlign, iVertAlign); } -bool CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags, - const CFX_PointF& point) { +bool CXFA_FFImageEdit::AcceptsFocusOnButtonDown(uint32_t dwFlags, + const CFX_PointF& point, + FWL_MouseCommand command) { + if (command != FWL_MouseCommand::LeftButtonDown) + return CXFA_FFField::AcceptsFocusOnButtonDown(dwFlags, point, command); + if (!m_pNode->IsOpenAccess()) return false; if (!PtInActiveRect(point)) return false; + return true; +} + +void CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags, + const CFX_PointF& point) { SetButtonDown(true); CFWL_MessageMouse ms(nullptr, m_pNormalWidget.get()); @@ -110,7 +119,6 @@ bool CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags, ms.m_dwFlags = dwFlags; ms.m_pos = FWLToClient(point); TranslateFWLMessage(&ms); - return true; } void CXFA_FFImageEdit::SetFWLRect() { |