diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-14 11:52:07 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-14 18:12:34 +0000 |
| commit | f528eee136a602643a7777d87a2cce52cf83f38a (patch) | |
| tree | 94643b8f0b26a8cd61437db4b9867b9a60a00ef8 /fpdfsdk/pdfwindow/PWL_Wnd.h | |
| parent | 22da8c268d2228203b40a8c73a2d3f6c25fc9acc (diff) | |
| download | pdfium-f528eee136a602643a7777d87a2cce52cf83f38a.tar.xz | |
Reland "Convert CFX_FloatPoint to CFX_PointF"
This CL updates the CFX_FloatPoint Cl to accommodate for the Origin CL being
reverted.
Change-Id: I345fe1117938a49ad9ee5f310fe7b5e21d9f1948
Reviewed-on: https://pdfium-review.googlesource.com/2697
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_Wnd.h')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_Wnd.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h index dd4f321d8a..12b29aeb7e 100644 --- a/fpdfsdk/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/pdfwindow/PWL_Wnd.h @@ -264,17 +264,17 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual bool OnKeyDown(uint16_t nChar, uint32_t nFlag); virtual bool OnKeyUp(uint16_t nChar, uint32_t nFlag); virtual bool OnChar(uint16_t nChar, uint32_t nFlag); - virtual bool OnLButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnMButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnMButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnMButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnRButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); - virtual bool OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnLButtonDblClk(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnMButtonDblClk(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnMButtonDown(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnMButtonUp(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnRButtonDown(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnRButtonUp(const CFX_PointF& point, uint32_t nFlag); + virtual bool OnMouseMove(const CFX_PointF& point, uint32_t nFlag); virtual bool OnMouseWheel(short zDelta, - const CFX_FloatPoint& point, + const CFX_PointF& point, uint32_t nFlag); virtual void SetFocus(); @@ -308,7 +308,7 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual CFX_FloatRect GetWindowRect() const; virtual CFX_FloatRect GetClientRect() const; - CFX_FloatPoint GetCenterPoint() const; + CFX_PointF GetCenterPoint() const; int32_t GetBorderWidth() const; bool IsVisible() const { return m_bVisible; } bool HasFlag(uint32_t dwFlags) const; @@ -320,8 +320,8 @@ class CPWL_Wnd : public CPWL_TimerHandler { const CPWL_Dash& GetBorderDash() const; void* GetAttachedData() const; - bool WndHitTest(const CFX_FloatPoint& point) const; - bool ClientHitTest(const CFX_FloatPoint& point) const; + bool WndHitTest(const CFX_PointF& point) const; + bool ClientHitTest(const CFX_PointF& point) const; bool IsCaptureMouse() const; const CPWL_Wnd* GetFocused() const; @@ -341,9 +341,9 @@ class CPWL_Wnd : public CPWL_TimerHandler { void SetChildMatrix(const CFX_Matrix& mt); CFX_Matrix GetWindowMatrix() const; - virtual CFX_FloatPoint ChildToParent(const CFX_FloatPoint& point) const; + virtual CFX_PointF ChildToParent(const CFX_PointF& point) const; virtual CFX_FloatRect ChildToParent(const CFX_FloatRect& rect) const; - virtual CFX_FloatPoint ParentToChild(const CFX_FloatPoint& point) const; + virtual CFX_PointF ParentToChild(const CFX_PointF& point) const; virtual CFX_FloatRect ParentToChild(const CFX_FloatRect& rect) const; // those methods only implemented by listctrl item @@ -389,7 +389,7 @@ class CPWL_Wnd : public CPWL_TimerHandler { void InvalidateRectMove(const CFX_FloatRect& rcOld, const CFX_FloatRect& rcNew); - void PWLtoWnd(const CFX_FloatPoint& point, int32_t& x, int32_t& y) const; + void PWLtoWnd(const CFX_PointF& point, int32_t& x, int32_t& y) const; FX_RECT PWLtoWnd(const CFX_FloatRect& rect) const; bool IsWndCaptureMouse(const CPWL_Wnd* pWnd) const; |