diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-21 14:27:59 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-21 20:44:29 +0000 |
| commit | b45ea1fce52d93615470bab8b671cba5907fb01e (patch) | |
| tree | 15153c437a253f73b3f5bb154a294ace77fe2c6d /xfa/fxfa/app/xfa_ffchoicelist.cpp | |
| parent | 37a35df8c878d6e21a62ce0dfd2d480997d9e86c (diff) | |
| download | pdfium-b45ea1fce52d93615470bab8b671cba5907fb01e.tar.xz | |
Convert CFWL messages to use CFX_PointF
This Cl updates the various CFWL_Message classes to take CFX_PointF instead of
x,y values.
Change-Id: I5d9d01d68be64fc9e69c04574994c01286ad24e1
Reviewed-on: https://pdfium-review.googlesource.com/2811
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/app/xfa_ffchoicelist.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffchoicelist.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index efe8b0c8c2..3aabde870a 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -226,12 +226,9 @@ CFX_RectF CXFA_FFComboBox::GetBBox(uint32_t dwStatus, bool bDrawFocus) { return CXFA_FFWidget::GetBBox(dwStatus); } -bool CXFA_FFComboBox::PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy) { - if (!m_pNormalWidget) - return false; - return static_cast<CFWL_ComboBox*>(m_pNormalWidget) - ->GetBBox() - .Contains(fx, fy); +bool CXFA_FFComboBox::PtInActiveRect(const CFX_PointF& point) { + auto pComboBox = static_cast<CFWL_ComboBox*>(m_pNormalWidget); + return pComboBox && pComboBox->GetBBox().Contains(point); } bool CXFA_FFComboBox::LoadWidget() { @@ -292,13 +289,15 @@ void CXFA_FFComboBox::UpdateWidgetProperty() { } pComboBox->EditModifyStylesEx(dwEditStyles, 0xFFFFFFFF); } -bool CXFA_FFComboBox::OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) { - if (!CXFA_FFField::OnRButtonUp(dwFlags, fx, fy)) + +bool CXFA_FFComboBox::OnRButtonUp(uint32_t dwFlags, const CFX_PointF& point) { + if (!CXFA_FFField::OnRButtonUp(dwFlags, point)) return false; - GetDoc()->GetDocEnvironment()->PopupMenu(this, CFX_PointF(fx, fy)); + GetDoc()->GetDocEnvironment()->PopupMenu(this, point); return true; } + bool CXFA_FFComboBox::OnKillFocus(CXFA_FFWidget* pNewWidget) { bool flag = ProcessCommittedData(); if (!flag) { |