From b45ea1fce52d93615470bab8b671cba5907fb01e Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 21 Feb 2017 14:27:59 -0500 Subject: 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 Reviewed-by: Tom Sepez --- fpdfsdk/pdfwindow/PWL_ScrollBar.cpp | 4 ++-- fpdfsdk/pdfwindow/PWL_Wnd.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/pdfwindow') diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp index a202513b92..652c8e1f45 100644 --- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp +++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp @@ -723,13 +723,13 @@ bool CPWL_ScrollBar::OnLButtonDown(const CFX_PointF& point, uint32_t nFlag) { rcMinArea.Normalize(); rcMaxArea.Normalize(); - if (rcMinArea.Contains(point.x, point.y)) { + if (rcMinArea.Contains(point)) { m_sData.SubBig(); MovePosButton(true); NotifyScrollWindow(); } - if (rcMaxArea.Contains(point.x, point.y)) { + if (rcMaxArea.Contains(point)) { m_sData.AddBig(); MovePosButton(true); NotifyScrollWindow(); diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp index 341ae7448f..f5d97adc19 100644 --- a/fpdfsdk/pdfwindow/PWL_Wnd.cpp +++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp @@ -673,11 +673,11 @@ void CPWL_Wnd::OnSetFocus() {} void CPWL_Wnd::OnKillFocus() {} bool CPWL_Wnd::WndHitTest(const CFX_PointF& point) const { - return IsValid() && IsVisible() && GetWindowRect().Contains(point.x, point.y); + return IsValid() && IsVisible() && GetWindowRect().Contains(point); } bool CPWL_Wnd::ClientHitTest(const CFX_PointF& point) const { - return IsValid() && IsVisible() && GetClientRect().Contains(point.x, point.y); + return IsValid() && IsVisible() && GetClientRect().Contains(point); } const CPWL_Wnd* CPWL_Wnd::GetRootWnd() const { -- cgit v1.2.3