diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-26 14:24:28 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-26 14:24:28 -0800 |
| commit | 281a9eadff15b167e2ee3032e21b83190ad49125 (patch) | |
| tree | f02f7d0842f59d8e69bda011b3e62547ffb1acde /fpdfsdk/src | |
| parent | 566b974287ce0e81a963138152b8898f22480f52 (diff) | |
| download | pdfium-281a9eadff15b167e2ee3032e21b83190ad49125.tar.xz | |
Re-land "Replace CPDF_Rect and CPDF_Point with CFX types."
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1737593006 .
Diffstat (limited to 'fpdfsdk/src')
38 files changed, 1069 insertions, 1005 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp b/fpdfsdk/src/formfiller/FFL_CheckBox.cpp index f76613ed3f..78a689af64 100644 --- a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_CheckBox.cpp @@ -73,7 +73,7 @@ FX_BOOL CFFL_CheckBox::OnChar(CPDFSDK_Annot* pAnnot, FX_BOOL CFFL_CheckBox::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFFL_Button::OnLButtonUp(pPageView, pAnnot, nFlags, point); if (IsValid()) { diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index ce73f7d4cb..e596ba08ba 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -36,18 +36,18 @@ CFFL_FormFiller::~CFFL_FormFiller() { } void CFFL_FormFiller::SetWindowRect(CPDFSDK_PageView* pPageView, - const CPDF_Rect& rcWindow) { + const CFX_FloatRect& rcWindow) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { - pWnd->Move(CPDF_Rect(rcWindow), TRUE, FALSE); + pWnd->Move(CFX_FloatRect(rcWindow), TRUE, FALSE); } } -CPDF_Rect CFFL_FormFiller::GetWindowRect(CPDFSDK_PageView* pPageView) { +CFX_FloatRect CFFL_FormFiller::GetWindowRect(CPDFSDK_PageView* pPageView) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { return pWnd->GetWindowRect(); } - return CPDF_Rect(0, 0, 0, 0); + return CFX_FloatRect(0, 0, 0, 0); } FX_RECT CFFL_FormFiller::GetViewBBox(CPDFSDK_PageView* pPageView, @@ -55,20 +55,20 @@ FX_RECT CFFL_FormFiller::GetViewBBox(CPDFSDK_PageView* pPageView, ASSERT(pPageView); ASSERT(pAnnot); - CPDF_Rect rcAnnot = m_pWidget->GetRect(); + CFX_FloatRect rcAnnot = m_pWidget->GetRect(); if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { - CPDF_Rect rcWindow = pWnd->GetWindowRect(); + CFX_FloatRect rcWindow = pWnd->GetWindowRect(); rcAnnot = PWLtoFFL(rcWindow); } - CPDF_Rect rcWin = rcAnnot; + CFX_FloatRect rcWin = rcAnnot; - CPDF_Rect rcFocus = GetFocusBox(pPageView); + CFX_FloatRect rcFocus = GetFocusBox(pPageView); if (!rcFocus.IsEmpty()) rcWin.Union(rcFocus); - CPDF_Rect rect = CPWL_Utils::InflateRect(rcWin, 1); + CFX_FloatRect rect = CPWL_Utils::InflateRect(rcWin, 1); return rect.GetOutterRect(); } @@ -118,7 +118,7 @@ void CFFL_FormFiller::OnMouseExit(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_FormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE)) { m_bValid = TRUE; FX_RECT rect = GetViewBBox(pPageView, pAnnot); @@ -136,7 +136,7 @@ FX_BOOL CFFL_FormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_FormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { FX_RECT rcFFL = GetViewBBox(pPageView, pAnnot); InvalidateRect(rcFFL.left, rcFFL.top, rcFFL.right, rcFFL.bottom); @@ -150,7 +150,7 @@ FX_BOOL CFFL_FormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_FormFiller::OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { pWnd->OnLButtonDblClk(WndtoPWL(pPageView, point), nFlags); return TRUE; @@ -162,7 +162,7 @@ FX_BOOL CFFL_FormFiller::OnLButtonDblClk(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_FormFiller::OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if ((m_ptOldPos.x != point.x) || (m_ptOldPos.y != point.y)) { m_ptOldPos = point; } @@ -179,7 +179,7 @@ FX_BOOL CFFL_FormFiller::OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!IsValid()) return FALSE; @@ -193,7 +193,7 @@ FX_BOOL CFFL_FormFiller::OnMouseWheel(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_FormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE)) { pWnd->OnRButtonDown(WndtoPWL(pPageView, point), nFlags); return TRUE; @@ -205,7 +205,7 @@ FX_BOOL CFFL_FormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_FormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { pWnd->OnRButtonUp(WndtoPWL(pPageView, point), nFlags); return TRUE; @@ -420,7 +420,7 @@ CFX_Matrix CFFL_FormFiller::GetWindowMatrix(void* pAttachedData) { CFX_Matrix CFFL_FormFiller::GetCurMatrix() { CFX_Matrix mt; - CPDF_Rect rcDA; + CFX_FloatRect rcDA; m_pWidget->GetPDFAnnot()->GetRect(rcDA); switch (m_pWidget->GetRotate()) { @@ -451,16 +451,16 @@ CFX_WideString CFFL_FormFiller::LoadPopupMenuString(int nIndex) { return L""; } -CPDF_Rect CFFL_FormFiller::GetPDFWindowRect() const { - CPDF_Rect rectAnnot; +CFX_FloatRect CFFL_FormFiller::GetPDFWindowRect() const { + CFX_FloatRect rectAnnot; m_pWidget->GetPDFAnnot()->GetRect(rectAnnot); FX_FLOAT fWidth = rectAnnot.right - rectAnnot.left; FX_FLOAT fHeight = rectAnnot.top - rectAnnot.bottom; if ((m_pWidget->GetRotate() / 90) & 0x01) - return CPDF_Rect(0, 0, fHeight, fWidth); + return CFX_FloatRect(0, 0, fHeight, fWidth); - return CPDF_Rect(0, 0, fWidth, fHeight); + return CFX_FloatRect(0, 0, fWidth, fHeight); } CPDFSDK_PageView* CFFL_FormFiller::GetCurPageView() { @@ -469,61 +469,61 @@ CPDFSDK_PageView* CFFL_FormFiller::GetCurPageView() { return pSDKDoc ? pSDKDoc->GetPageView(pPage) : nullptr; } -CPDF_Rect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) { +CFX_FloatRect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { - CPDF_Rect rcFocus = FFLtoWnd(pPageView, PWLtoFFL(pWnd->GetFocusRect())); - CPDF_Rect rcPage = pPageView->GetPDFPage()->GetPageBBox(); + CFX_FloatRect rcFocus = FFLtoWnd(pPageView, PWLtoFFL(pWnd->GetFocusRect())); + CFX_FloatRect rcPage = pPageView->GetPDFPage()->GetPageBBox(); if (rcPage.Contains(rcFocus)) return rcFocus; } - return CPDF_Rect(0, 0, 0, 0); + return CFX_FloatRect(0, 0, 0, 0); } -CPDF_Rect CFFL_FormFiller::FFLtoPWL(const CPDF_Rect& rect) { +CFX_FloatRect CFFL_FormFiller::FFLtoPWL(const CFX_FloatRect& rect) { CFX_Matrix mt; mt.SetReverse(GetCurMatrix()); - CPDF_Rect temp = rect; + CFX_FloatRect temp = rect; mt.TransformRect(temp); return temp; } -CPDF_Rect CFFL_FormFiller::PWLtoFFL(const CPDF_Rect& rect) { +CFX_FloatRect CFFL_FormFiller::PWLtoFFL(const CFX_FloatRect& rect) { CFX_Matrix mt = GetCurMatrix(); - CPDF_Rect temp = rect; + CFX_FloatRect temp = rect; mt.TransformRect(temp); return temp; } -CPDF_Point CFFL_FormFiller::FFLtoPWL(const CPDF_Point& point) { +CFX_FloatPoint CFFL_FormFiller::FFLtoPWL(const CFX_FloatPoint& point) { CFX_Matrix mt; mt.SetReverse(GetCurMatrix()); - CPDF_Point pt = point; + CFX_FloatPoint pt = point; mt.Transform(pt.x, pt.y); return pt; } -CPDF_Point CFFL_FormFiller::PWLtoFFL(const CPDF_Point& point) { +CFX_FloatPoint CFFL_FormFiller::PWLtoFFL(const CFX_FloatPoint& point) { CFX_Matrix mt = GetCurMatrix(); - CPDF_Point pt = point; + CFX_FloatPoint pt = point; mt.Transform(pt.x, pt.y); return pt; } -CPDF_Point CFFL_FormFiller::WndtoPWL(CPDFSDK_PageView* pPageView, - const CPDF_Point& pt) { +CFX_FloatPoint CFFL_FormFiller::WndtoPWL(CPDFSDK_PageView* pPageView, + const CFX_FloatPoint& pt) { return FFLtoPWL(pt); } -CPDF_Rect CFFL_FormFiller::FFLtoWnd(CPDFSDK_PageView* pPageView, - const CPDF_Rect& rect) { +CFX_FloatRect CFFL_FormFiller::FFLtoWnd(CPDFSDK_PageView* pPageView, + const CFX_FloatRect& rect) { return rect; } @@ -650,8 +650,8 @@ void CFFL_Button::OnMouseExit(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_Button::OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { - CPDF_Rect rcAnnot = pAnnot->GetRect(); + const CFX_FloatPoint& point) { + CFX_FloatRect rcAnnot = pAnnot->GetRect(); if (!rcAnnot.Contains(point.x, point.y)) return FALSE; @@ -665,8 +665,8 @@ FX_BOOL CFFL_Button::OnLButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_Button::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { - CPDF_Rect rcAnnot = pAnnot->GetRect(); + const CFX_FloatPoint& point) { + CFX_FloatRect rcAnnot = pAnnot->GetRect(); if (!rcAnnot.Contains(point.x, point.y)) return FALSE; @@ -681,7 +681,7 @@ FX_BOOL CFFL_Button::OnLButtonUp(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_Button::OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(m_pApp); return TRUE; diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index a5100f6904..21a4bb6ab2 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -29,8 +29,8 @@ CFFL_IFormFiller::~CFFL_IFormFiller() { FX_BOOL CFFL_IFormFiller::Annot_HitTest(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - CPDF_Point point) { - CPDF_Rect rc = pAnnot->GetRect(); + CFX_FloatPoint point) { + CFX_FloatRect rc = pAnnot->GetRect(); if (rc.Contains(point.x, point.y)) return TRUE; return FALSE; @@ -44,10 +44,10 @@ FX_RECT CFFL_IFormFiller::GetViewBBox(CPDFSDK_PageView* pPageView, ASSERT(pPageView); CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot(); - CPDF_Rect rcAnnot; + CFX_FloatRect rcAnnot; pPDFAnnot->GetRect(rcAnnot); - CPDF_Rect rcWin = CPWL_Utils::InflateRect(rcAnnot, 1); + CFX_FloatRect rcWin = CPWL_Utils::InflateRect(rcAnnot, 1); return rcWin.GetOutterRect(); } @@ -67,7 +67,7 @@ void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument(); if (pDocument->GetFocusAnnot() == pAnnot) { - CPDF_Rect rcFocus = pFormFiller->GetFocusBox(pPageView); + CFX_FloatRect rcFocus = pFormFiller->GetFocusBox(pPageView); if (!rcFocus.IsEmpty()) { CFX_PathData path; path.SetPointCount(5); @@ -196,7 +196,7 @@ void CFFL_IFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_IFormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); if (!m_bNotifying) { @@ -238,7 +238,7 @@ FX_BOOL CFFL_IFormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_IFormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument(); @@ -318,7 +318,7 @@ void CFFL_IFormFiller::OnButtonUp(CPDFSDK_Widget* pWidget, FX_BOOL CFFL_IFormFiller::OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { @@ -331,7 +331,7 @@ FX_BOOL CFFL_IFormFiller::OnLButtonDblClk(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_IFormFiller::OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); // change cursor @@ -346,7 +346,7 @@ FX_BOOL CFFL_IFormFiller::OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { @@ -359,7 +359,7 @@ FX_BOOL CFFL_IFormFiller::OnMouseWheel(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_IFormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { @@ -372,7 +372,7 @@ FX_BOOL CFFL_IFormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CFFL_IFormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { @@ -570,12 +570,12 @@ void CFFL_IFormFiller::QueryWherePopup(void* pPrivateData, FX_FLOAT& fPopupRet) { CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData; - CPDF_Rect rcPageView(0, 0, 0, 0); + CFX_FloatRect rcPageView(0, 0, 0, 0); rcPageView.right = pData->pWidget->GetPDFPage()->GetPageWidth(); rcPageView.bottom = pData->pWidget->GetPDFPage()->GetPageHeight(); rcPageView.Normalize(); - CPDF_Rect rcAnnot = pData->pWidget->GetRect(); + CFX_FloatRect rcAnnot = pData->pWidget->GetRect(); FX_FLOAT fTop = 0.0f; FX_FLOAT fBottom = 0.0f; diff --git a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp b/fpdfsdk/src/formfiller/FFL_RadioButton.cpp index 2a742c0a85..845df115ca 100644 --- a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp +++ b/fpdfsdk/src/formfiller/FFL_RadioButton.cpp @@ -74,7 +74,7 @@ FX_BOOL CFFL_RadioButton::OnChar(CPDFSDK_Annot* pAnnot, FX_BOOL CFFL_RadioButton::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFFL_Button::OnLButtonUp(pPageView, pAnnot, nFlags, point); if (IsValid()) { diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index ca4e07be4d..42f2aad48f 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -112,7 +112,7 @@ FX_BOOL CFFL_TextField::OnChar(CPDFSDK_Annot* pAnnot, CPDFSDK_PageView* pPageView = GetCurPageView(); ASSERT(pPageView); m_bValid = !m_bValid; - CPDF_Rect rcAnnot = pAnnot->GetRect(); + CFX_FloatRect rcAnnot = pAnnot->GetRect(); m_pApp->FFI_Invalidate(pAnnot->GetUnderlyingPage(), rcAnnot.left, rcAnnot.top, rcAnnot.right, rcAnnot.bottom); diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index 9aee35f760..759f758e5e 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -11,12 +11,12 @@ #include "fpdfsdk/include/fsdk_define.h" typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray; -typedef CFX_ArrayTemplate<CPDF_Rect> CPDF_RectArray; +typedef CFX_ArrayTemplate<CFX_FloatRect> CPDF_RectArray; enum FPDF_TYPE { MAX, MIN }; enum FPDF_VALUE { TOP, LEFT, RIGHT, BOTTOM }; -FX_BOOL IsValiableRect(CPDF_Rect rect, CPDF_Rect rcPage) { +FX_BOOL IsValiableRect(CFX_FloatRect rect, CFX_FloatRect rcPage) { if (rect.left - rect.right > 0.000001f || rect.bottom - rect.top > 0.000001f) return FALSE; @@ -46,7 +46,7 @@ void GetContentsRect(CPDF_Document* pDoc, if (!pPageObject) continue; - CPDF_Rect rc; + CFX_FloatRect rc; rc.left = pPageObject->m_Left; rc.right = pPageObject->m_Right; rc.bottom = pPageObject->m_Bottom; @@ -62,7 +62,7 @@ void ParserStream(CPDF_Dictionary* pPageDic, CPDF_ObjectArray* pObjectArray) { if (!pStream) return; - CPDF_Rect rect; + CFX_FloatRect rect; if (pStream->KeyExist("Rect")) rect = pStream->GetRectBy("Rect"); else if (pStream->KeyExist("BBox")) @@ -127,25 +127,25 @@ FX_FLOAT GetMinMaxValue(CPDF_RectArray& array, switch (value) { case LEFT: { for (int i = 0; i < nRects; i++) - pArray[i] = CPDF_Rect(array.GetAt(i)).left; + pArray[i] = CFX_FloatRect(array.GetAt(i)).left; break; } case TOP: { for (int i = 0; i < nRects; i++) - pArray[i] = CPDF_Rect(array.GetAt(i)).top; + pArray[i] = CFX_FloatRect(array.GetAt(i)).top; break; } case RIGHT: { for (int i = 0; i < nRects; i++) - pArray[i] = CPDF_Rect(array.GetAt(i)).right; + pArray[i] = CFX_FloatRect(array.GetAt(i)).right; break; } case BOTTOM: { for (int i = 0; i < nRects; i++) - pArray[i] = CPDF_Rect(array.GetAt(i)).bottom; + pArray[i] = CFX_FloatRect(array.GetAt(i)).bottom; break; } @@ -166,8 +166,8 @@ FX_FLOAT GetMinMaxValue(CPDF_RectArray& array, return fRet; } -CPDF_Rect CalculateRect(CPDF_RectArray* pRectArray) { - CPDF_Rect rcRet; +CFX_FloatRect CalculateRect(CPDF_RectArray* pRectArray) { + CFX_FloatRect rcRet; rcRet.left = GetMinMaxValue(*pRectArray, MIN, LEFT); rcRet.top = GetMinMaxValue(*pRectArray, MAX, TOP); @@ -245,8 +245,8 @@ void SetPageContents(CFX_ByteString key, } } -CFX_Matrix GetMatrix(CPDF_Rect rcAnnot, - CPDF_Rect rcStream, +CFX_Matrix GetMatrix(CFX_FloatRect rcAnnot, + CFX_FloatRect rcStream, const CFX_Matrix& matrix) { if (rcStream.IsEmpty()) return CFX_Matrix(); @@ -266,8 +266,8 @@ void GetOffset(FX_FLOAT& fa, FX_FLOAT& fd, FX_FLOAT& fe, FX_FLOAT& ff, - CPDF_Rect rcAnnot, - CPDF_Rect rcStream, + CFX_FloatRect rcAnnot, + CFX_FloatRect rcStream, const CFX_Matrix& matrix) { FX_FLOAT fStreamWidth = 0.0f; FX_FLOAT fStreamHeight = 0.0f; @@ -323,15 +323,15 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { if (iRet == FLATTEN_NOTHINGTODO || iRet == FLATTEN_FAIL) return iRet; - CPDF_Rect rcOriginalCB; - CPDF_Rect rcMerger = CalculateRect(&RectArray); - CPDF_Rect rcOriginalMB = pPageDict->GetRectBy("MediaBox"); + CFX_FloatRect rcOriginalCB; + CFX_FloatRect rcMerger = CalculateRect(&RectArray); + CFX_FloatRect rcOriginalMB = pPageDict->GetRectBy("MediaBox"); if (pPageDict->KeyExist("CropBox")) rcOriginalMB = pPageDict->GetRectBy("CropBox"); if (rcOriginalMB.IsEmpty()) { - rcOriginalMB = CPDF_Rect(0.0f, 0.0f, 612.0f, 792.0f); + rcOriginalMB = CFX_FloatRect(0.0f, 0.0f, 612.0f, 792.0f); } rcMerger.left = @@ -407,7 +407,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { pNewOXbjectDic->SetAtName("Subtype", "Form"); pNewOXbjectDic->SetAtInteger("FormType", 1); pNewOXbjectDic->SetAtName("Name", "FRM"); - CPDF_Rect rcBBox = pPageDict->GetRectBy("ArtBox"); + CFX_FloatRect rcBBox = pPageDict->GetRectBy("ArtBox"); pNewOXbjectDic->SetAtRect("BBox", rcBBox); } @@ -416,7 +416,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { if (!pAnnotDic) continue; - CPDF_Rect rcAnnot = pAnnotDic->GetRectBy("Rect"); + CFX_FloatRect rcAnnot = pAnnotDic->GetRectBy("Rect"); rcAnnot.Normalize(); CFX_ByteString sAnnotState = pAnnotDic->GetStringBy("AS"); @@ -452,7 +452,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { CPDF_Dictionary* pAPDic = pAPStream->GetDict(); CFX_Matrix matrix = pAPDic->GetMatrixBy("Matrix"); - CPDF_Rect rcStream; + CFX_FloatRect rcStream; if (pAPDic->KeyExist("Rect")) rcStream = pAPDic->GetRectBy("Rect"); else if (pAPDic->KeyExist("BBox")) diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 4a4e1de0fe..c88dccd86a 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -288,7 +288,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFLink_GetAnnotRect(FPDF_LINK linkAnnot, return FALSE; CPDF_Dictionary* pAnnotDict = ToDictionary(static_cast<CPDF_Object*>(linkAnnot)); - CPDF_Rect rt = pAnnotDict->GetRectBy("Rect"); + CFX_FloatRect rt = pAnnotDict->GetRectBy("Rect"); rect->left = rt.left; rect->bottom = rt.bottom; rect->right = rt.right; diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index b833a61c02..46026b593d 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -277,7 +277,7 @@ DLLEXPORT void STDCALL FPDFPage_TransformAnnots(FPDF_PAGE page, for (size_t i = 0; i < AnnotList.Count(); ++i) { CPDF_Annot* pAnnot = AnnotList.GetAt(i); // transformAnnots Rectangle - CPDF_Rect rect; + CFX_FloatRect rect; pAnnot->GetRect(rect); CFX_Matrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d, (FX_FLOAT)e, (FX_FLOAT)f); diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index c1f332bd74..a14c66fbc6 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -187,7 +187,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnMouseMove(FPDF_FORMHANDLE hHandle, if (!pPageView) return FALSE; - CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); + CFX_FloatPoint pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); return pPageView->OnMouseMove(pt, modifier); } @@ -200,7 +200,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonDown(FPDF_FORMHANDLE hHandle, if (!pPageView) return FALSE; - CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); + CFX_FloatPoint pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); return pPageView->OnLButtonDown(pt, modifier); } @@ -213,7 +213,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonUp(FPDF_FORMHANDLE hHandle, if (!pPageView) return FALSE; - CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); + CFX_FloatPoint pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); return pPageView->OnLButtonUp(pt, modifier); } @@ -227,7 +227,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnRButtonDown(FPDF_FORMHANDLE hHandle, if (!pPageView) return FALSE; - CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); + CFX_FloatPoint pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); return pPageView->OnRButtonDown(pt, modifier); } @@ -240,7 +240,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnRButtonUp(FPDF_FORMHANDLE hHandle, if (!pPageView) return FALSE; - CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); + CFX_FloatPoint pt((FX_FLOAT)page_x, (FX_FLOAT)page_y); return pPageView->OnRButtonUp(pt, modifier); } #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index 2baef4c21b..f9bf170554 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -192,7 +192,7 @@ CPDFSDK_Document* CPDFXFA_Document::GetSDKDocument( } void CPDFXFA_Document::FXRect2PDFRect(const CFX_RectF& fxRectF, - CPDF_Rect& pdfRect) { + CFX_FloatRect& pdfRect) { pdfRect.left = fxRectF.left; pdfRect.top = fxRectF.bottom(); pdfRect.right = fxRectF.right(); @@ -220,7 +220,7 @@ void CPDFXFA_Document::InvalidateRect(IXFA_PageView* pPageView, if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return; - CPDF_Rect rcPage; + CFX_FloatRect rcPage; FXRect2PDFRect(rt, rcPage); CPDFXFA_Page* pPage = GetPage(pPageView); @@ -285,7 +285,7 @@ void CPDFXFA_Document::DisplayCaret(IXFA_Widget* hWidget, if (pPage == NULL) return; - CPDF_Rect rcCaret; + CFX_FloatRect rcCaret; FXRect2PDFRect(*pRtAnchor, rcCaret); CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); @@ -327,7 +327,7 @@ FX_BOOL CPDFXFA_Document::GetPopupPos(IXFA_Widget* hWidget, FS_RECTF pageViewRect; pEnv->FFI_GetPageViewRect(pPage, pageViewRect); - CPDF_Rect rcAnchor; + CFX_FloatRect rcAnchor; rcAnchor.left = rtAnchor.left; rcAnchor.top = rtAnchor.bottom(); diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index 661eaef1a1..28b8114ed6 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -156,7 +156,7 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDown( CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { @@ -164,10 +164,11 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDown( } return FALSE; } -FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonUp(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, - const CPDF_Point& point) { +FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonUp( + CPDFSDK_PageView* pPageView, + CPDFSDK_Annot* pAnnot, + FX_DWORD nFlags, + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { @@ -179,7 +180,7 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDblClk( CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { @@ -187,10 +188,11 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDblClk( } return FALSE; } -FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnMouseMove(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, - const CPDF_Point& point) { +FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnMouseMove( + CPDFSDK_PageView* pPageView, + CPDFSDK_Annot* pAnnot, + FX_DWORD nFlags, + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { @@ -198,11 +200,12 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnMouseMove(CPDFSDK_PageView* pPageView, } return FALSE; } -FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnMouseWheel(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, - short zDelta, - const CPDF_Point& point) { +FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnMouseWheel( + CPDFSDK_PageView* pPageView, + CPDFSDK_Annot* pAnnot, + FX_DWORD nFlags, + short zDelta, + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { @@ -215,7 +218,7 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonDown( CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { @@ -223,10 +226,11 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonDown( } return FALSE; } -FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonUp(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, - const CPDF_Point& point) { +FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonUp( + CPDFSDK_PageView* pPageView, + CPDFSDK_Annot* pAnnot, + FX_DWORD nFlags, + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { @@ -331,7 +335,7 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChangeFocus( } #endif // PDF_ENABLE_XFA -CPDF_Rect CPDFSDK_AnnotHandlerMgr::Annot_OnGetViewBBox( +CFX_FloatRect CPDFSDK_AnnotHandlerMgr::Annot_OnGetViewBBox( CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot) { ASSERT(pAnnot); @@ -343,7 +347,7 @@ CPDF_Rect CPDFSDK_AnnotHandlerMgr::Annot_OnGetViewBBox( FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnHitTest(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pAnnot); if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { if (pAnnotHandler->CanAnswer(pAnnot)) @@ -493,7 +497,7 @@ void CPDFSDK_BFAnnotHandler::OnMouseExit(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -508,7 +512,7 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -523,7 +527,7 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonUp(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -538,7 +542,7 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_BFAnnotHandler::OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -554,7 +558,7 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, short zDelta, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -570,7 +574,7 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnMouseWheel(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_BFAnnotHandler::OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -584,7 +588,7 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnRButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_BFAnnotHandler::OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -694,8 +698,8 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnKillFocus(CPDFSDK_Annot* pAnnot, return TRUE; } -CPDF_Rect CPDFSDK_BFAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot) { +CFX_FloatRect CPDFSDK_BFAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView, + CPDFSDK_Annot* pAnnot) { CFX_ByteString sSubType = pAnnot->GetSubType(); if (sSubType == BFFT_SIGNATURE) { @@ -704,16 +708,16 @@ CPDF_Rect CPDFSDK_BFAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView, return m_pFormFiller->GetViewBBox(pPageView, pAnnot); } - return CPDF_Rect(0, 0, 0, 0); + return CFX_FloatRect(0, 0, 0, 0); } FX_BOOL CPDFSDK_BFAnnotHandler::HitTest(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { ASSERT(pPageView); ASSERT(pAnnot); - CPDF_Rect rect = GetViewBBox(pPageView, pAnnot); + CFX_FloatRect rect = GetViewBBox(pPageView, pAnnot); return rect.Contains(point.x, point.y); } @@ -777,8 +781,8 @@ void CPDFSDK_XFAAnnotHandler::ReleaseAnnot(CPDFSDK_Annot* pAnnot) { delete pWidget; } -CPDF_Rect CPDFSDK_XFAAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot) { +CFX_FloatRect CPDFSDK_XFAAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView, + CPDFSDK_Annot* pAnnot) { ASSERT(pAnnot); IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); @@ -803,7 +807,7 @@ CPDF_Rect CPDFSDK_XFAAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::HitTest(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -850,7 +854,7 @@ void CPDFSDK_XFAAnnotHandler::OnMouseExit(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -862,7 +866,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -874,7 +878,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonUp(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -886,7 +890,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -899,7 +903,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, short zDelta, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -911,7 +915,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::OnMouseWheel(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -923,7 +927,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonDown(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; @@ -935,7 +939,7 @@ FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonUp(CPDFSDK_PageView* pPageView, FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_DWORD nFlags, - const CPDF_Point& point) { + const CFX_FloatPoint& point) { if (!pPageView || !pAnnot) return FALSE; diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp index 79418d972e..705205f1e2 100644 --- a/fpdfsdk/src/fsdk_baseannot.cpp +++ b/fpdfsdk/src/fsdk_baseannot.cpp @@ -537,15 +537,15 @@ CPDF_Dictionary* CPDFSDK_BAAnnot::GetAnnotDict() const { return m_pAnnot->GetAnnotDict(); } -void CPDFSDK_BAAnnot::SetRect(const CPDF_Rect& rect) { +void CPDFSDK_BAAnnot::SetRect(const CFX_FloatRect& rect) { ASSERT(rect.right - rect.left >= GetMinWidth()); ASSERT(rect.top - rect.bottom >= GetMinHeight()); m_pAnnot->GetAnnotDict()->SetAtRect("Rect", rect); } -CPDF_Rect CPDFSDK_BAAnnot::GetRect() const { - CPDF_Rect rect; +CFX_FloatRect CPDFSDK_BAAnnot::GetRect() const { + CFX_FloatRect rect; m_pAnnot->GetRect(rect); return rect; } @@ -835,7 +835,7 @@ FX_BOOL CPDFSDK_BAAnnot::GetColor(FX_COLORREF& color) const { } void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType, - const CPDF_Rect& rcBBox, + const CFX_FloatRect& rcBBox, const CFX_Matrix& matrix, const CFX_ByteString& sContents, const CFX_ByteString& sAPState) { diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 1bae4dd5a1..0359c0bc9f 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -816,7 +816,7 @@ void CPDFSDK_Widget::DrawAppearance(CFX_RenderDevice* pDevice, !IsWidgetAppearanceValid(CPDF_Annot::Normal)) { CFX_PathData pathData; - CPDF_Rect rcAnnot = GetRect(); + CFX_FloatRect rcAnnot = GetRect(); pathData.AppendRect(rcAnnot.left, rcAnnot.bottom, rcAnnot.right, rcAnnot.top); @@ -841,7 +841,7 @@ void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice, CPDFSDK_PageView* pPageView) { int nFieldType = GetFieldType(); if (m_pInterForm->IsNeedHighLight(nFieldType)) { - CPDF_Rect rc = GetRect(); + CFX_FloatRect rc = GetRect(); FX_COLORREF color = m_pInterForm->GetHighlightColor(nFieldType); uint8_t alpha = m_pInterForm->GetHighlightAlpha(); @@ -868,7 +868,7 @@ void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice, void CPDFSDK_Widget::ResetAppearance_PushButton() { CPDF_FormControl* pControl = GetFormControl(); - CPDF_Rect rcWindow = GetRotatedRect(); + CFX_FloatRect rcWindow = GetRotatedRect(); int32_t nLayout = 0; switch (pControl->GetTextPosition()) { case TEXTPOS_ICON: @@ -937,7 +937,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() { break; } - CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth); + CFX_FloatRect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth); CPWL_Color crText(COLORTYPE_GRAY, 0); @@ -1125,8 +1125,8 @@ void CPDFSDK_Widget::ResetAppearance_CheckBox() { break; } - CPDF_Rect rcWindow = GetRotatedRect(); - CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth); + CFX_FloatRect rcWindow = GetRotatedRect(); + CFX_FloatRect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth); CPDF_DefaultAppearance da = pControl->GetDefaultAppearance(); if (da.HasColor()) { @@ -1251,8 +1251,8 @@ void CPDFSDK_Widget::ResetAppearance_RadioButton() { break; } - CPDF_Rect rcWindow = GetRotatedRect(); - CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth); + CFX_FloatRect rcWindow = GetRotatedRect(); + CFX_FloatRect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth); CPDF_DefaultAppearance da = pControl->GetDefaultAppearance(); if (da.HasColor()) { @@ -1290,7 +1290,7 @@ void CPDFSDK_Widget::ResetAppearance_RadioButton() { CFX_ByteString csAP_N_ON; - CPDF_Rect rcCenter = + CFX_FloatRect rcCenter = CPWL_Utils::DeflateRect(CPWL_Utils::GetCenterSquare(rcWindow), 1.0f); if (nStyle == PCS_CIRCLE) { @@ -1375,8 +1375,8 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) { CPDF_FormField* pField = pControl->GetField(); CFX_ByteTextBuf sBody, sLines; - CPDF_Rect rcClient = GetClientRect(); - CPDF_Rect rcButton = rcClient; + CFX_FloatRect rcClient = GetClientRect(); + CFX_FloatRect rcButton = rcClient; rcButton.left = rcButton.right - 13; rcButton.Normalize(); @@ -1388,7 +1388,7 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) { CBA_FontMap font_map(this, pEnv->GetSysHandler()); pEdit->SetFontMap(&font_map); - CPDF_Rect rcEdit = rcClient; + CFX_FloatRect rcEdit = rcClient; rcEdit.right = rcButton.left; rcEdit.Normalize(); @@ -1414,10 +1414,10 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) { pEdit->SetText(pField->GetOptionLabel(nCurSel).c_str()); } - CPDF_Rect rcContent = pEdit->GetContentRect(); + CFX_FloatRect rcContent = pEdit->GetContentRect(); CFX_ByteString sEdit = - CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, 0.0f)); + CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f)); if (sEdit.GetLength() > 0) { sBody << "/Tx BMC\n" << "q\n"; @@ -1447,7 +1447,7 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) { void CPDFSDK_Widget::ResetAppearance_ListBox() { CPDF_FormControl* pControl = GetFormControl(); CPDF_FormField* pField = pControl->GetField(); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); CFX_ByteTextBuf sBody, sLines; if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) { @@ -1459,7 +1459,8 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() { CBA_FontMap font_map(this, pEnv->GetSysHandler()); pEdit->SetFontMap(&font_map); - pEdit->SetPlateRect(CPDF_Rect(rcClient.left, 0.0f, rcClient.right, 0.0f)); + pEdit->SetPlateRect( + CFX_FloatRect(rcClient.left, 0.0f, rcClient.right, 0.0f)); FX_FLOAT fFontSize = GetFontSize(); @@ -1488,12 +1489,12 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() { pEdit->SetText(pField->GetOptionLabel(i).c_str()); - CPDF_Rect rcContent = pEdit->GetContentRect(); + CFX_FloatRect rcContent = pEdit->GetContentRect(); FX_FLOAT fItemHeight = rcContent.Height(); if (bSelected) { - CPDF_Rect rcItem = - CPDF_Rect(rcClient.left, fy - fItemHeight, rcClient.right, fy); + CFX_FloatRect rcItem = + CFX_FloatRect(rcClient.left, fy - fItemHeight, rcClient.right, fy); sList << "q\n" << CPWL_Utils::GetColorAppStream( CPWL_Color(COLORTYPE_RGB, 0, 51.0f / 255.0f, 113.0f / 255.0f), @@ -1504,12 +1505,12 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() { sList << "BT\n" << CPWL_Utils::GetColorAppStream( CPWL_Color(COLORTYPE_GRAY, 1), TRUE) - << CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, fy)) + << CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, fy)) << "ET\n"; } else { CPWL_Color crText = GetTextPWLColor(); sList << "BT\n" << CPWL_Utils::GetColorAppStream(crText, TRUE) - << CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, fy)) + << CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, fy)) << "ET\n"; } @@ -1546,7 +1547,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { CBA_FontMap font_map(this, pEnv->GetSysHandler()); pEdit->SetFontMap(&font_map); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); pEdit->SetPlateRect(rcClient); pEdit->SetAlignmentH(pControl->GetControlAlignment()); @@ -1605,10 +1606,10 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { else pEdit->SetText(pField->GetValue().c_str()); - CPDF_Rect rcContent = pEdit->GetContentRect(); + CFX_FloatRect rcContent = pEdit->GetContentRect(); CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream( - pEdit, CPDF_Point(0.0f, 0.0f), NULL, !bCharArray, subWord); + pEdit, CFX_FloatPoint(0.0f, 0.0f), NULL, !bCharArray, subWord); if (sEdit.GetLength() > 0) { sBody << "/Tx BMC\n" @@ -1680,8 +1681,8 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { WriteAppearance("N", GetRotatedRect(), GetMatrix(), sAP); } -CPDF_Rect CPDFSDK_Widget::GetClientRect() const { - CPDF_Rect rcWindow = GetRotatedRect(); +CFX_FloatRect CPDFSDK_Widget::GetClientRect() const { + CFX_FloatRect rcWindow = GetRotatedRect(); FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth(); switch (GetBorderStyle()) { case BBS_BEVELED: @@ -1693,22 +1694,22 @@ CPDF_Rect CPDFSDK_Widget::GetClientRect() const { return CPWL_Utils::DeflateRect(rcWindow, fBorderWidth); } -CPDF_Rect CPDFSDK_Widget::GetRotatedRect() const { - CPDF_Rect rectAnnot = GetRect(); +CFX_FloatRect CPDFSDK_Widget::GetRotatedRect() const { + CFX_FloatRect rectAnnot = GetRect(); FX_FLOAT fWidth = rectAnnot.right - rectAnnot.left; FX_FLOAT fHeight = rectAnnot.top - rectAnnot.bottom; CPDF_FormControl* pControl = GetFormControl(); - CPDF_Rect rcPDFWindow; + CFX_FloatRect rcPDFWindow; switch (abs(pControl->GetRotation() % 360)) { case 0: case 180: default: - rcPDFWindow = CPDF_Rect(0, 0, fWidth, fHeight); + rcPDFWindow = CFX_FloatRect(0, 0, fWidth, fHeight); break; case 90: case 270: - rcPDFWindow = CPDF_Rect(0, 0, fHeight, fWidth); + rcPDFWindow = CFX_FloatRect(0, 0, fHeight, fWidth); break; } @@ -1724,7 +1725,7 @@ CFX_ByteString CPDFSDK_Widget::GetBackgroundAppStream() const { } CFX_ByteString CPDFSDK_Widget::GetBorderAppStream() const { - CPDF_Rect rcWindow = GetRotatedRect(); + CFX_FloatRect rcWindow = GetRotatedRect(); CPWL_Color crBorder = GetBorderPWLColor(); CPWL_Color crBackground = GetFillPWLColor(); CPWL_Color crLeftTop, crRightBottom; @@ -1766,7 +1767,7 @@ CFX_ByteString CPDFSDK_Widget::GetBorderAppStream() const { CFX_Matrix CPDFSDK_Widget::GetMatrix() const { CFX_Matrix mt; CPDF_FormControl* pControl = GetFormControl(); - CPDF_Rect rcAnnot = GetRect(); + CFX_FloatRect rcAnnot = GetRect(); FX_FLOAT fWidth = rcAnnot.right - rcAnnot.left; FX_FLOAT fHeight = rcAnnot.top - rcAnnot.bottom; @@ -2785,7 +2786,7 @@ void CBA_AnnotIterator::GenerateResults() { int nLeftTopIndex = -1; FX_FLOAT fTop = 0.0f; for (int i = sa.size() - 1; i >= 0; i--) { - CPDF_Rect rcAnnot = GetAnnotRect(sa[i]); + CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]); if (rcAnnot.top > fTop) { nLeftTopIndex = i; fTop = rcAnnot.top; @@ -2793,13 +2794,13 @@ void CBA_AnnotIterator::GenerateResults() { } if (nLeftTopIndex >= 0) { CPDFSDK_Annot* pLeftTopAnnot = sa[nLeftTopIndex]; - CPDF_Rect rcLeftTop = GetAnnotRect(pLeftTopAnnot); + CFX_FloatRect rcLeftTop = GetAnnotRect(pLeftTopAnnot); m_Annots.push_back(pLeftTopAnnot); sa.erase(sa.begin() + nLeftTopIndex); std::vector<int> aSelect; for (int i = 0; i < sa.size(); ++i) { - CPDF_Rect rcAnnot = GetAnnotRect(sa[i]); + CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]); FX_FLOAT fCenterY = (rcAnnot.top + rcAnnot.bottom) / 2.0f; if (fCenterY > rcLeftTop.bottom && fCenterY < rcLeftTop.top) aSelect.push_back(i); @@ -2825,7 +2826,7 @@ void CBA_AnnotIterator::GenerateResults() { int nLeftTopIndex = -1; FX_FLOAT fLeft = -1.0f; for (int i = sa.size() - 1; i >= 0; --i) { - CPDF_Rect rcAnnot = GetAnnotRect(sa[i]); + CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]); if (fLeft < 0) { nLeftTopIndex = 0; fLeft = rcAnnot.left; @@ -2837,13 +2838,13 @@ void CBA_AnnotIterator::GenerateResults() { if (nLeftTopIndex >= 0) { CPDFSDK_Annot* pLeftTopAnnot = sa[nLeftTopIndex]; - CPDF_Rect rcLeftTop = GetAnnotRect(pLeftTopAnnot); + CFX_FloatRect rcLeftTop = GetAnnotRect(pLeftTopAnnot); m_Annots.push_back(pLeftTopAnnot); sa.erase(sa.begin() + nLeftTopIndex); std::vector<int> aSelect; for (int i = 0; i < sa.size(); ++i) { - CPDF_Rect rcAnnot = GetAnnotRect(sa[i]); + CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]); FX_FLOAT fCenterX = (rcAnnot.left + rcAnnot.right) / 2.0f; if (fCenterX > rcLeftTop.left && fCenterX < rcLeftTop.right) aSelect.push_back(i); @@ -2860,8 +2861,8 @@ void CBA_AnnotIterator::GenerateResults() { } } -CPDF_Rect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) { - CPDF_Rect rcAnnot; +CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) { + CFX_FloatRect rcAnnot; pAnnot->GetPDFAnnot()->GetRect(rcAnnot); return rcAnnot; } diff --git a/fpdfsdk/src/fsdk_baseform_embeddertest.cpp b/fpdfsdk/src/fsdk_baseform_embeddertest.cpp index 109b22f3b5..4fd3bb785c 100644 --- a/fpdfsdk/src/fsdk_baseform_embeddertest.cpp +++ b/fpdfsdk/src/fsdk_baseform_embeddertest.cpp @@ -13,7 +13,7 @@ namespace { -void CheckRect(const CPDF_Rect& actual, const CPDF_Rect& expected) { +void CheckRect(const CFX_FloatRect& actual, const CFX_FloatRect& expected) { EXPECT_EQ(expected.left, actual.left); EXPECT_EQ(expected.bottom, actual.bottom); EXPECT_EQ(expected.right, actual.right); @@ -30,10 +30,10 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) { EXPECT_TRUE(LoadPage(1)); EXPECT_TRUE(LoadPage(2)); - CPDF_Rect LeftBottom(200, 200, 220, 220); - CPDF_Rect RightBottom(400, 201, 420, 221); - CPDF_Rect LeftTop(201, 400, 221, 420); - CPDF_Rect RightTop(401, 401, 421, 421); + CFX_FloatRect LeftBottom(200, 200, 220, 220); + CFX_FloatRect RightBottom(400, 201, 420, 221); + CFX_FloatRect LeftTop(201, 400, 221, 420); + CFX_FloatRect RightTop(401, 401, 421, 421); CPDFSDK_Document* pSDKDoc = CPDFSDK_Document::FromFPDFFormHandle(form_handle()); diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 9e627167fe..933f451538 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -58,7 +58,7 @@ class CFX_SystemHandler : public IFX_SystemHandler { public: // IFX_SystemHandler void InvalidateRect(FX_HWND hWnd, FX_RECT rect) override; - void OutputSelectedRect(void* pFormFiller, CPDF_Rect& rect) override; + void OutputSelectedRect(void* pFormFiller, CFX_FloatRect& rect) override; FX_BOOL IsSelectionImplemented() override; CFX_WideString GetClipboardText(FX_HWND hWnd) override { return L""; } FX_BOOL SetClipboardText(FX_HWND hWnd, CFX_WideString string) override { @@ -132,19 +132,20 @@ void CFX_SystemHandler::InvalidateRect(FX_HWND hWnd, FX_RECT rect) { device2page.Transform((FX_FLOAT)rect.left, (FX_FLOAT)rect.top, left, top); device2page.Transform((FX_FLOAT)rect.right, (FX_FLOAT)rect.bottom, right, bottom); - CPDF_Rect rcPDF(left, bottom, right, top); + CFX_FloatRect rcPDF(left, bottom, right, top); rcPDF.Normalize(); m_pEnv->FFI_Invalidate(pPage, rcPDF.left, rcPDF.top, rcPDF.right, rcPDF.bottom); } -void CFX_SystemHandler::OutputSelectedRect(void* pFormFiller, CPDF_Rect& rect) { +void CFX_SystemHandler::OutputSelectedRect(void* pFormFiller, + CFX_FloatRect& rect) { CFFL_FormFiller* pFFL = (CFFL_FormFiller*)pFormFiller; if (pFFL) { - CPDF_Point leftbottom = CPDF_Point(rect.left, rect.bottom); - CPDF_Point righttop = CPDF_Point(rect.right, rect.top); - CPDF_Point ptA = pFFL->PWLtoFFL(leftbottom); - CPDF_Point ptB = pFFL->PWLtoFFL(righttop); + CFX_FloatPoint leftbottom = CFX_FloatPoint(rect.left, rect.bottom); + CFX_FloatPoint righttop = CFX_FloatPoint(rect.right, rect.top); + CFX_FloatPoint ptA = pFFL->PWLtoFFL(leftbottom); + CFX_FloatPoint ptB = pFFL->PWLtoFFL(righttop); CPDFSDK_Annot* pAnnot = pFFL->GetSDKAnnot(); UnderlyingPageType* pPage = pAnnot->GetUnderlyingPage(); ASSERT(pPage); @@ -758,7 +759,7 @@ CPDFSDK_Annot* CPDFSDK_PageView::GetFXAnnotAtPoint(FX_FLOAT pageX, CPDFSDK_AnnotHandlerMgr* pAnnotMgr = pEnv->GetAnnotHandlerMgr(); CPDFSDK_AnnotIterator annotIterator(this, false); while (CPDFSDK_Annot* pSDKAnnot = annotIterator.Next()) { - CPDF_Rect rc = pAnnotMgr->Annot_OnGetViewBBox(this, pSDKAnnot); + CFX_FloatRect rc = pAnnotMgr->Annot_OnGetViewBBox(this, pSDKAnnot); if (rc.Contains(pageX, pageY)) return pSDKAnnot; } @@ -778,7 +779,7 @@ CPDFSDK_Annot* CPDFSDK_PageView::GetFXWidgetAtPoint(FX_FLOAT pageX, #endif // PDF_ENABLE_XFA if (bHitTest) { pAnnotMgr->Annot_OnGetViewBBox(this, pSDKAnnot); - CPDF_Point point(pageX, pageY); + CFX_FloatPoint point(pageX, pageY); if (pAnnotMgr->Annot_OnHitTest(this, pSDKAnnot, point)) return pSDKAnnot; } @@ -914,7 +915,7 @@ CPDFSDK_Annot* CPDFSDK_PageView::GetAnnotByXFAWidget(IXFA_Widget* hWidget) { } #endif // PDF_ENABLE_XFA -FX_BOOL CPDFSDK_PageView::OnLButtonDown(const CPDF_Point& point, +FX_BOOL CPDFSDK_PageView::OnLButtonDown(const CFX_FloatPoint& point, FX_UINT nFlag) { CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); ASSERT(pEnv); @@ -933,7 +934,7 @@ FX_BOOL CPDFSDK_PageView::OnLButtonDown(const CPDF_Point& point, } #ifdef PDF_ENABLE_XFA -FX_BOOL CPDFSDK_PageView::OnRButtonDown(const CPDF_Point& point, +FX_BOOL CPDFSDK_PageView::OnRButtonDown(const CFX_FloatPoint& point, FX_UINT nFlag) { CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); ASSERT(pEnv); @@ -953,7 +954,8 @@ FX_BOOL CPDFSDK_PageView::OnRButtonDown(const CPDF_Point& point, return TRUE; } -FX_BOOL CPDFSDK_PageView::OnRButtonUp(const CPDF_Point& point, FX_UINT nFlag) { +FX_BOOL CPDFSDK_PageView::OnRButtonUp(const CFX_FloatPoint& point, + FX_UINT nFlag) { CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); ASSERT(pEnv); CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr(); @@ -972,7 +974,8 @@ FX_BOOL CPDFSDK_PageView::OnRButtonUp(const CPDF_Point& point, FX_UINT nFlag) { } #endif // PDF_ENABLE_XFA -FX_BOOL CPDFSDK_PageView::OnLButtonUp(const CPDF_Point& point, FX_UINT nFlag) { +FX_BOOL CPDFSDK_PageView::OnLButtonUp(const CFX_FloatPoint& point, + FX_UINT nFlag) { CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); ASSERT(pEnv); CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr(); @@ -988,7 +991,7 @@ FX_BOOL CPDFSDK_PageView::OnLButtonUp(const CPDF_Point& point, FX_UINT nFlag) { return bRet; } -FX_BOOL CPDFSDK_PageView::OnMouseMove(const CPDF_Point& point, int nFlag) { +FX_BOOL CPDFSDK_PageView::OnMouseMove(const CFX_FloatPoint& point, int nFlag) { CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr(); if (CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y)) { @@ -1021,7 +1024,7 @@ FX_BOOL CPDFSDK_PageView::OnMouseMove(const CPDF_Point& point, int nFlag) { FX_BOOL CPDFSDK_PageView::OnMouseWheel(double deltaX, double deltaY, - const CPDF_Point& point, + const CFX_FloatPoint& point, int nFlag) { if (CPDFSDK_Annot* pAnnot = GetFXWidgetAtPoint(point.x, point.y)) { CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); @@ -1146,14 +1149,14 @@ void CPDFSDK_PageView::ClearFXAnnots() { void CPDFSDK_PageView::UpdateRects(CFX_RectArray& rects) { for (int i = 0; i < rects.GetSize(); i++) { - CPDF_Rect rc = rects.GetAt(i); + CFX_FloatRect rc = rects.GetAt(i); CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); pEnv->FFI_Invalidate(m_page, rc.left, rc.top, rc.right, rc.bottom); } } void CPDFSDK_PageView::UpdateView(CPDFSDK_Annot* pAnnot) { - CPDF_Rect rcWindow = pAnnot->GetRect(); + CFX_FloatRect rcWindow = pAnnot->GetRect(); CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); pEnv->FFI_Invalidate(m_page, rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); diff --git a/fpdfsdk/src/fxedit/fxet_ap.cpp b/fpdfsdk/src/fxedit/fxet_ap.cpp index 2803b60d72..562f566edb 100644 --- a/fpdfsdk/src/fxedit/fxet_ap.cpp +++ b/fpdfsdk/src/fxedit/fxet_ap.cpp @@ -60,13 +60,13 @@ static CFX_ByteString GetFontSetString(IFX_Edit_FontMap* pFontMap, CFX_ByteString IFX_Edit::GetEditAppearanceStream( IFX_Edit* pEdit, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange /* = NULL*/, FX_BOOL bContinuous /* = TRUE*/, FX_WORD SubWord /* = 0*/) { CFX_ByteTextBuf sEditStream, sWords; - CPDF_Point ptOld(0.0f, 0.0f), ptNew(0.0f, 0.0f); + CFX_FloatPoint ptOld(0.0f, 0.0f), ptNew(0.0f, 0.0f); int32_t nCurFontIndex = -1; if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) { @@ -92,13 +92,13 @@ CFX_ByteString IFX_Edit::GetEditAppearanceStream( CPVT_Word word; if (pIterator->GetWord(word)) { - ptNew = CPDF_Point(word.ptWord.x + ptOffset.x, - word.ptWord.y + ptOffset.y); + ptNew = CFX_FloatPoint(word.ptWord.x + ptOffset.x, + word.ptWord.y + ptOffset.y); } else { CPVT_Line line; pIterator->GetLine(line); - ptNew = CPDF_Point(line.ptLine.x + ptOffset.x, - line.ptLine.y + ptOffset.y); + ptNew = CFX_FloatPoint(line.ptLine.x + ptOffset.x, + line.ptLine.y + ptOffset.y); } if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) { @@ -129,8 +129,8 @@ CFX_ByteString IFX_Edit::GetEditAppearanceStream( } else { CPVT_Word word; if (pIterator->GetWord(word)) { - ptNew = CPDF_Point(word.ptWord.x + ptOffset.x, - word.ptWord.y + ptOffset.y); + ptNew = CFX_FloatPoint(word.ptWord.x + ptOffset.x, + word.ptWord.y + ptOffset.y); if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) { sEditStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y @@ -176,7 +176,7 @@ CFX_ByteString IFX_Edit::GetEditAppearanceStream( CFX_ByteString IFX_Edit::GetSelectAppearanceStream( IFX_Edit* pEdit, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange) { CFX_ByteTextBuf sRet; diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/src/fxedit/fxet_edit.cpp index 0e66b0e3b5..1b68dc0510 100644 --- a/fpdfsdk/src/fxedit/fxet_edit.cpp +++ b/fpdfsdk/src/fxedit/fxet_edit.cpp @@ -155,7 +155,7 @@ void CFX_Edit_Refresh::BeginRefresh() { } void CFX_Edit_Refresh::Push(const CPVT_WordRange& linerange, - const CPDF_Rect& rect) { + const CFX_FloatRect& rect) { m_NewLineRects.Add(linerange, rect); } @@ -175,7 +175,7 @@ void CFX_Edit_Refresh::NoAnalyse() { void CFX_Edit_Refresh::Analyse(int32_t nAlignment) { FX_BOOL bLineTopChanged = FALSE; - CPDF_Rect rcResult; + CFX_FloatRect rcResult; FX_FLOAT fWidthDiff; int32_t szMax = std::max(m_OldLineRects.GetSize(), m_NewLineRects.GetSize()); @@ -240,7 +240,7 @@ void CFX_Edit_Refresh::Analyse(int32_t nAlignment) { } } -void CFX_Edit_Refresh::AddRefresh(const CPDF_Rect& rect) { +void CFX_Edit_Refresh::AddRefresh(const CFX_FloatRect& rect) { m_RefreshRects.Add(rect); } @@ -814,9 +814,9 @@ IFX_Edit_FontMap* CFX_Edit::GetFontMap() { return NULL; } -void CFX_Edit::SetPlateRect(const CPDF_Rect& rect, FX_BOOL bPaint) { +void CFX_Edit::SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint) { m_pVT->SetPlateRect(rect); - m_ptScrollPos = CPDF_Point(rect.left, rect.top); + m_ptScrollPos = CFX_FloatPoint(rect.left, rect.top); if (bPaint) Paint(); } @@ -1631,11 +1631,11 @@ int32_t CFX_Edit::GetCharArray() const { return m_pVT->GetCharArray(); } -CPDF_Rect CFX_Edit::GetPlateRect() const { +CFX_FloatRect CFX_Edit::GetPlateRect() const { return m_pVT->GetPlateRect(); } -CPDF_Rect CFX_Edit::GetContentRect() const { +CFX_FloatRect CFX_Edit::GetContentRect() const { return VTToEdit(m_pVT->GetContentRect()); } @@ -1659,12 +1659,12 @@ CPVT_WordRange CFX_Edit::GetVisibleWordRange() const { return GetWholeWordRange(); if (m_pVT->IsValid()) { - CPDF_Rect rcPlate = m_pVT->GetPlateRect(); + CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); - CPVT_WordPlace place1 = - m_pVT->SearchWordPlace(EditToVT(CPDF_Point(rcPlate.left, rcPlate.top))); + CPVT_WordPlace place1 = m_pVT->SearchWordPlace( + EditToVT(CFX_FloatPoint(rcPlate.left, rcPlate.top))); CPVT_WordPlace place2 = m_pVT->SearchWordPlace( - EditToVT(CPDF_Point(rcPlate.right, rcPlate.bottom))); + EditToVT(CFX_FloatPoint(rcPlate.right, rcPlate.bottom))); return CPVT_WordRange(place1, place2); } @@ -1672,7 +1672,7 @@ CPVT_WordRange CFX_Edit::GetVisibleWordRange() const { return CPVT_WordRange(); } -CPVT_WordPlace CFX_Edit::SearchWordPlace(const CPDF_Point& point) const { +CPVT_WordPlace CFX_Edit::SearchWordPlace(const CFX_FloatPoint& point) const { if (m_pVT->IsValid()) { return m_pVT->SearchWordPlace(EditToVT(point)); } @@ -1712,7 +1712,7 @@ void CFX_Edit::RearrangePart(const CPVT_WordRange& range) { void CFX_Edit::SetContentChanged() { if (m_bNotify && m_pNotify) { - CPDF_Rect rcContent = m_pVT->GetContentRect(); + CFX_FloatRect rcContent = m_pVT->GetContentRect(); if (rcContent.Width() != m_rcOldContent.Width() || rcContent.Height() != m_rcOldContent.Height()) { if (!m_bNotifyFlag) { @@ -1751,9 +1751,9 @@ FX_BOOL CFX_Edit::IsSelected() const { return m_SelState.IsExist(); } -CPDF_Point CFX_Edit::VTToEdit(const CPDF_Point& point) const { - CPDF_Rect rcContent = m_pVT->GetContentRect(); - CPDF_Rect rcPlate = m_pVT->GetPlateRect(); +CFX_FloatPoint CFX_Edit::VTToEdit(const CFX_FloatPoint& point) const { + CFX_FloatRect rcContent = m_pVT->GetContentRect(); + CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); FX_FLOAT fPadding = 0.0f; @@ -1769,13 +1769,13 @@ CPDF_Point CFX_Edit::VTToEdit(const CPDF_Point& point) const { break; } - return CPDF_Point(point.x - (m_ptScrollPos.x - rcPlate.left), - point.y - (m_ptScrollPos.y + fPadding - rcPlate.top)); + return CFX_FloatPoint(point.x - (m_ptScrollPos.x - rcPlate.left), + point.y - (m_ptScrollPos.y + fPadding - rcPlate.top)); } -CPDF_Point CFX_Edit::EditToVT(const CPDF_Point& point) const { - CPDF_Rect rcContent = m_pVT->GetContentRect(); - CPDF_Rect rcPlate = m_pVT->GetPlateRect(); +CFX_FloatPoint CFX_Edit::EditToVT(const CFX_FloatPoint& point) const { + CFX_FloatRect rcContent = m_pVT->GetContentRect(); + CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); FX_FLOAT fPadding = 0.0f; @@ -1791,28 +1791,32 @@ CPDF_Point CFX_Edit::EditToVT(const CPDF_Point& point) const { break; } - return CPDF_Point(point.x + (m_ptScrollPos.x - rcPlate.left), - point.y + (m_ptScrollPos.y + fPadding - rcPlate.top)); + return CFX_FloatPoint(point.x + (m_ptScrollPos.x - rcPlate.left), + point.y + (m_ptScrollPos.y + fPadding - rcPlate.top)); } -CPDF_Rect CFX_Edit::VTToEdit(const CPDF_Rect& rect) const { - CPDF_Point ptLeftBottom = VTToEdit(CPDF_Point(rect.left, rect.bottom)); - CPDF_Point ptRightTop = VTToEdit(CPDF_Point(rect.right, rect.top)); +CFX_FloatRect CFX_Edit::VTToEdit(const CFX_FloatRect& rect) const { + CFX_FloatPoint ptLeftBottom = + VTToEdit(CFX_FloatPoint(rect.left, rect.bottom)); + CFX_FloatPoint ptRightTop = VTToEdit(CFX_FloatPoint(rect.right, rect.top)); - return CPDF_Rect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, ptRightTop.y); + return CFX_FloatRect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, + ptRightTop.y); } -CPDF_Rect CFX_Edit::EditToVT(const CPDF_Rect& rect) const { - CPDF_Point ptLeftBottom = EditToVT(CPDF_Point(rect.left, rect.bottom)); - CPDF_Point ptRightTop = EditToVT(CPDF_Point(rect.right, rect.top)); +CFX_FloatRect CFX_Edit::EditToVT(const CFX_FloatRect& rect) const { + CFX_FloatPoint ptLeftBottom = + EditToVT(CFX_FloatPoint(rect.left, rect.bottom)); + CFX_FloatPoint ptRightTop = EditToVT(CFX_FloatPoint(rect.right, rect.top)); - return CPDF_Rect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, ptRightTop.y); + return CFX_FloatRect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, + ptRightTop.y); } void CFX_Edit::SetScrollInfo() { if (m_bNotify && m_pNotify) { - CPDF_Rect rcPlate = m_pVT->GetPlateRect(); - CPDF_Rect rcContent = m_pVT->GetContentRect(); + CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); + CFX_FloatRect rcContent = m_pVT->GetContentRect(); if (!m_bNotifyFlag) { m_bNotifyFlag = TRUE; @@ -1868,21 +1872,21 @@ void CFX_Edit::SetScrollPosY(FX_FLOAT fy) { } } -void CFX_Edit::SetScrollPos(const CPDF_Point& point) { +void CFX_Edit::SetScrollPos(const CFX_FloatPoint& point) { SetScrollPosX(point.x); SetScrollPosY(point.y); SetScrollLimit(); SetCaretInfo(); } -CPDF_Point CFX_Edit::GetScrollPos() const { +CFX_FloatPoint CFX_Edit::GetScrollPos() const { return m_ptScrollPos; } void CFX_Edit::SetScrollLimit() { if (m_pVT->IsValid()) { - CPDF_Rect rcContent = m_pVT->GetContentRect(); - CPDF_Rect rcPlate = m_pVT->GetPlateRect(); + CFX_FloatRect rcContent = m_pVT->GetContentRect(); + CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); if (rcPlate.Width() > rcContent.Width()) { SetScrollPosX(rcPlate.left); @@ -1912,8 +1916,8 @@ void CFX_Edit::ScrollToCaret() { SetScrollLimit(); if (m_pVT->IsValid()) { - CPDF_Point ptHead(0, 0); - CPDF_Point ptFoot(0, 0); + CFX_FloatPoint ptHead(0, 0); + CFX_FloatPoint ptFoot(0, 0); if (IPDF_VariableText_Iterator* pIterator = m_pVT->GetIterator()) { pIterator->SetAt(m_wpCaret); @@ -1933,10 +1937,10 @@ void CFX_Edit::ScrollToCaret() { } } - CPDF_Point ptHeadEdit = VTToEdit(ptHead); - CPDF_Point ptFootEdit = VTToEdit(ptFoot); + CFX_FloatPoint ptHeadEdit = VTToEdit(ptHead); + CFX_FloatPoint ptFootEdit = VTToEdit(ptFoot); - CPDF_Rect rcPlate = m_pVT->GetPlateRect(); + CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); if (!FX_EDIT_IsFloatEqual(rcPlate.left, rcPlate.right)) { if (FX_EDIT_IsFloatSmaller(ptHeadEdit.x, rcPlate.left) || @@ -2003,10 +2007,10 @@ void CFX_Edit::RefreshPushLineRects(const CPVT_WordRange& wr) { if (lineinfo.lineplace.LineCmp(wpEnd) > 0) break; - CPDF_Rect rcLine(lineinfo.ptLine.x, - lineinfo.ptLine.y + lineinfo.fLineDescent, - lineinfo.ptLine.x + lineinfo.fLineWidth, - lineinfo.ptLine.y + lineinfo.fLineAscent); + CFX_FloatRect rcLine(lineinfo.ptLine.x, + lineinfo.ptLine.y + lineinfo.fLineDescent, + lineinfo.ptLine.x + lineinfo.fLineWidth, + lineinfo.ptLine.y + lineinfo.fLineAscent); m_Refresh.Push(CPVT_WordRange(lineinfo.lineplace, lineinfo.lineEnd), VTToEdit(rcLine)); @@ -2038,17 +2042,17 @@ void CFX_Edit::RefreshPushRandomRects(const CPVT_WordRange& wr) { if (place.LineCmp(wrTemp.BeginPos) == 0 || place.LineCmp(wrTemp.EndPos) == 0) { - CPDF_Rect rcWord(wordinfo.ptWord.x, - lineinfo.ptLine.y + lineinfo.fLineDescent, - wordinfo.ptWord.x + wordinfo.fWidth, - lineinfo.ptLine.y + lineinfo.fLineAscent); + CFX_FloatRect rcWord(wordinfo.ptWord.x, + lineinfo.ptLine.y + lineinfo.fLineDescent, + wordinfo.ptWord.x + wordinfo.fWidth, + lineinfo.ptLine.y + lineinfo.fLineAscent); m_Refresh.AddRefresh(VTToEdit(rcWord)); } else { - CPDF_Rect rcLine(lineinfo.ptLine.x, - lineinfo.ptLine.y + lineinfo.fLineDescent, - lineinfo.ptLine.x + lineinfo.fLineWidth, - lineinfo.ptLine.y + lineinfo.fLineAscent); + CFX_FloatRect rcLine(lineinfo.ptLine.x, + lineinfo.ptLine.y + lineinfo.fLineDescent, + lineinfo.ptLine.x + lineinfo.fLineWidth, + lineinfo.ptLine.y + lineinfo.fLineAscent); m_Refresh.AddRefresh(VTToEdit(rcLine)); @@ -2081,29 +2085,29 @@ void CFX_Edit::RefreshWordRange(const CPVT_WordRange& wr) { if (place.LineCmp(wrTemp.BeginPos) == 0 || place.LineCmp(wrTemp.EndPos) == 0) { - CPDF_Rect rcWord(wordinfo.ptWord.x, - lineinfo.ptLine.y + lineinfo.fLineDescent, - wordinfo.ptWord.x + wordinfo.fWidth, - lineinfo.ptLine.y + lineinfo.fLineAscent); + CFX_FloatRect rcWord(wordinfo.ptWord.x, + lineinfo.ptLine.y + lineinfo.fLineDescent, + wordinfo.ptWord.x + wordinfo.fWidth, + lineinfo.ptLine.y + lineinfo.fLineAscent); if (m_bNotify && m_pNotify) { if (!m_bNotifyFlag) { m_bNotifyFlag = TRUE; - CPDF_Rect rcRefresh = VTToEdit(rcWord); + CFX_FloatRect rcRefresh = VTToEdit(rcWord); m_pNotify->IOnInvalidateRect(&rcRefresh); m_bNotifyFlag = FALSE; } } } else { - CPDF_Rect rcLine(lineinfo.ptLine.x, - lineinfo.ptLine.y + lineinfo.fLineDescent, - lineinfo.ptLine.x + lineinfo.fLineWidth, - lineinfo.ptLine.y + lineinfo.fLineAscent); + CFX_FloatRect rcLine(lineinfo.ptLine.x, + lineinfo.ptLine.y + lineinfo.fLineDescent, + lineinfo.ptLine.x + lineinfo.fLineWidth, + lineinfo.ptLine.y + lineinfo.fLineAscent); if (m_bNotify && m_pNotify) { if (!m_bNotifyFlag) { m_bNotifyFlag = TRUE; - CPDF_Rect rcRefresh = VTToEdit(rcLine); + CFX_FloatRect rcRefresh = VTToEdit(rcLine); m_pNotify->IOnInvalidateRect(&rcRefresh); m_bNotifyFlag = FALSE; } @@ -2123,7 +2127,7 @@ void CFX_Edit::SetCaret(const CPVT_WordPlace& place) { void CFX_Edit::SetCaretInfo() { if (m_bNotify && m_pNotify) { if (!m_bNotifyFlag) { - CPDF_Point ptHead(0.0f, 0.0f), ptFoot(0.0f, 0.0f); + CFX_FloatPoint ptHead(0.0f, 0.0f), ptFoot(0.0f, 0.0f); if (IPDF_VariableText_Iterator* pIterator = m_pVT->GetIterator()) { pIterator->SetAt(m_wpCaret); @@ -2195,7 +2199,7 @@ void CFX_Edit::SetCaret(int32_t nPos) { } } -void CFX_Edit::OnMouseDown(const CPDF_Point& point, +void CFX_Edit::OnMouseDown(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl) { if (m_pVT->IsValid()) { @@ -2209,7 +2213,7 @@ void CFX_Edit::OnMouseDown(const CPDF_Point& point, } } -void CFX_Edit::OnMouseMove(const CPDF_Point& point, +void CFX_Edit::OnMouseMove(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl) { if (m_pVT->IsValid()) { @@ -2853,8 +2857,8 @@ FX_BOOL CFX_Edit::IsTextFull() const { FX_BOOL CFX_Edit::IsTextOverflow() const { if (!m_bEnableScroll && !m_bEnableOverflow) { - CPDF_Rect rcPlate = m_pVT->GetPlateRect(); - CPDF_Rect rcContent = m_pVT->GetContentRect(); + CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); + CFX_FloatRect rcContent = m_pVT->GetContentRect(); if (m_pVT->IsMultiLine() && GetTotalLines() > 1) { if (FX_EDIT_IsFloatBigger(rcContent.Height(), rcPlate.Height())) diff --git a/fpdfsdk/src/fxedit/fxet_list.cpp b/fpdfsdk/src/fxedit/fxet_list.cpp index 4e8ae0cb8e..313cc481b3 100644 --- a/fpdfsdk/src/fxedit/fxet_list.cpp +++ b/fpdfsdk/src/fxedit/fxet_list.cpp @@ -155,11 +155,11 @@ int32_t CFX_List::GetCount() const { return m_aListItems.GetSize(); } -CPDF_Rect CFX_List::GetPlateRect() const { +CFX_FloatRect CFX_List::GetPlateRect() const { return CFX_ListContainer::GetPlateRect(); } -CPDF_Rect CFX_List::GetContentRect() const { +CFX_FloatRect CFX_List::GetContentRect() const { return InnerToOuter(CFX_ListContainer::GetContentRect()); } @@ -167,8 +167,8 @@ FX_FLOAT CFX_List::GetFontSize() const { return m_fFontSize; } -int32_t CFX_List::GetItemIndex(const CPDF_Point& point) const { - CPDF_Point pt = OuterToInner(point); +int32_t CFX_List::GetItemIndex(const CFX_FloatPoint& point) const { + CFX_FloatPoint pt = OuterToInner(point); FX_BOOL bFirst = TRUE; FX_BOOL bLast = TRUE; @@ -250,15 +250,15 @@ int32_t CFX_List::FindNext(int32_t nIndex, FX_WCHAR nChar) const { return nCircleIndex; } -CPDF_Rect CFX_List::GetItemRect(int32_t nIndex) const { +CFX_FloatRect CFX_List::GetItemRect(int32_t nIndex) const { if (CFX_ListItem* pListItem = m_aListItems.GetAt(nIndex)) { - CPDF_Rect rcItem = pListItem->GetRect(); + CFX_FloatRect rcItem = pListItem->GetRect(); rcItem.left = 0.0f; rcItem.right = GetPlateRect().Width(); return InnerToOuter(rcItem); } - return CPDF_Rect(); + return CFX_FloatRect(); } FX_BOOL CFX_List::IsItemSelected(int32_t nIndex) const { @@ -423,35 +423,37 @@ void CFX_ListCtrl::SetNotify(IFX_List_Notify* pNotify) { m_pNotify = pNotify; } -CPDF_Point CFX_ListCtrl::InToOut(const CPDF_Point& point) const { - CPDF_Rect rcPlate = GetPlateRect(); +CFX_FloatPoint CFX_ListCtrl::InToOut(const CFX_FloatPoint& point) const { + CFX_FloatRect rcPlate = GetPlateRect(); - return CPDF_Point(point.x - (m_ptScrollPos.x - rcPlate.left), - point.y - (m_ptScrollPos.y - rcPlate.top)); + return CFX_FloatPoint(point.x - (m_ptScrollPos.x - rcPlate.left), + point.y - (m_ptScrollPos.y - rcPlate.top)); } -CPDF_Point CFX_ListCtrl::OutToIn(const CPDF_Point& point) const { - CPDF_Rect rcPlate = GetPlateRect(); +CFX_FloatPoint CFX_ListCtrl::OutToIn(const CFX_FloatPoint& point) const { + CFX_FloatRect rcPlate = GetPlateRect(); - return CPDF_Point(point.x + (m_ptScrollPos.x - rcPlate.left), - point.y + (m_ptScrollPos.y - rcPlate.top)); + return CFX_FloatPoint(point.x + (m_ptScrollPos.x - rcPlate.left), + point.y + (m_ptScrollPos.y - rcPlate.top)); } -CPDF_Rect CFX_ListCtrl::InToOut(const CPDF_Rect& rect) const { - CPDF_Point ptLeftBottom = InToOut(CPDF_Point(rect.left, rect.bottom)); - CPDF_Point ptRightTop = InToOut(CPDF_Point(rect.right, rect.top)); +CFX_FloatRect CFX_ListCtrl::InToOut(const CFX_FloatRect& rect) const { + CFX_FloatPoint ptLeftBottom = InToOut(CFX_FloatPoint(rect.left, rect.bottom)); + CFX_FloatPoint ptRightTop = InToOut(CFX_FloatPoint(rect.right, rect.top)); - return CPDF_Rect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, ptRightTop.y); + return CFX_FloatRect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, + ptRightTop.y); } -CPDF_Rect CFX_ListCtrl::OutToIn(const CPDF_Rect& rect) const { - CPDF_Point ptLeftBottom = OutToIn(CPDF_Point(rect.left, rect.bottom)); - CPDF_Point ptRightTop = OutToIn(CPDF_Point(rect.right, rect.top)); +CFX_FloatRect CFX_ListCtrl::OutToIn(const CFX_FloatRect& rect) const { + CFX_FloatPoint ptLeftBottom = OutToIn(CFX_FloatPoint(rect.left, rect.bottom)); + CFX_FloatPoint ptRightTop = OutToIn(CFX_FloatPoint(rect.right, rect.top)); - return CPDF_Rect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, ptRightTop.y); + return CFX_FloatRect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, + ptRightTop.y); } -void CFX_ListCtrl::OnMouseDown(const CPDF_Point& point, +void CFX_ListCtrl::OnMouseDown(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl) { int32_t nHitIndex = GetItemIndex(point); @@ -490,7 +492,7 @@ void CFX_ListCtrl::OnMouseDown(const CPDF_Point& point, ScrollToListItem(nHitIndex); } -void CFX_ListCtrl::OnMouseMove(const CPDF_Point& point, +void CFX_ListCtrl::OnMouseMove(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl) { int32_t nHitIndex = GetItemIndex(point); @@ -578,15 +580,15 @@ FX_BOOL CFX_ListCtrl::OnChar(FX_WORD nChar, FX_BOOL bShift, FX_BOOL bCtrl) { return FALSE; } -void CFX_ListCtrl::SetPlateRect(const CPDF_Rect& rect) { +void CFX_ListCtrl::SetPlateRect(const CFX_FloatRect& rect) { CFX_ListContainer::SetPlateRect(rect); m_ptScrollPos.x = rect.left; - SetScrollPos(CPDF_Point(rect.left, rect.top)); + SetScrollPos(CFX_FloatPoint(rect.left, rect.top)); ReArrange(0); InvalidateItem(-1); } -CPDF_Rect CFX_ListCtrl::GetItemRect(int32_t nIndex) const { +CFX_FloatRect CFX_ListCtrl::GetItemRect(int32_t nIndex) const { return InToOut(CFX_List::GetItemRect(nIndex)); } @@ -650,14 +652,14 @@ void CFX_ListCtrl::InvalidateItem(int32_t nItemIndex) { if (nItemIndex == -1) { if (!m_bNotifyFlag) { m_bNotifyFlag = TRUE; - CPDF_Rect rcRefresh = GetPlateRect(); + CFX_FloatRect rcRefresh = GetPlateRect(); m_pNotify->IOnInvalidateRect(&rcRefresh); m_bNotifyFlag = FALSE; } } else { if (!m_bNotifyFlag) { m_bNotifyFlag = TRUE; - CPDF_Rect rcRefresh = GetItemRect(nItemIndex); + CFX_FloatRect rcRefresh = GetItemRect(nItemIndex); rcRefresh.left -= 1.0f; rcRefresh.right += 1.0f; rcRefresh.bottom -= 1.0f; @@ -701,8 +703,8 @@ void CFX_ListCtrl::Select(int32_t nItemIndex) { } FX_BOOL CFX_ListCtrl::IsItemVisible(int32_t nItemIndex) const { - CPDF_Rect rcPlate = GetPlateRect(); - CPDF_Rect rcItem = GetItemRect(nItemIndex); + CFX_FloatRect rcPlate = GetPlateRect(); + CFX_FloatRect rcItem = GetItemRect(nItemIndex); return rcItem.bottom >= rcPlate.bottom && rcItem.top <= rcPlate.top; } @@ -711,9 +713,9 @@ void CFX_ListCtrl::ScrollToListItem(int32_t nItemIndex) { if (!IsValid(nItemIndex)) return; - CPDF_Rect rcPlate = GetPlateRect(); - CPDF_Rect rcItem = CFX_List::GetItemRect(nItemIndex); - CPDF_Rect rcItemCtrl = GetItemRect(nItemIndex); + CFX_FloatRect rcPlate = GetPlateRect(); + CFX_FloatRect rcItem = CFX_List::GetItemRect(nItemIndex); + CFX_FloatRect rcItemCtrl = GetItemRect(nItemIndex); if (FX_EDIT_IsFloatSmaller(rcItemCtrl.bottom, rcPlate.bottom)) { if (FX_EDIT_IsFloatSmaller(rcItemCtrl.top, rcPlate.top)) { @@ -728,8 +730,8 @@ void CFX_ListCtrl::ScrollToListItem(int32_t nItemIndex) { void CFX_ListCtrl::SetScrollInfo() { if (m_pNotify) { - CPDF_Rect rcPlate = GetPlateRect(); - CPDF_Rect rcContent = CFX_List::GetContentRect(); + CFX_FloatRect rcPlate = GetPlateRect(); + CFX_FloatRect rcContent = CFX_List::GetContentRect(); if (!m_bNotifyFlag) { m_bNotifyFlag = TRUE; @@ -741,14 +743,14 @@ void CFX_ListCtrl::SetScrollInfo() { } } -void CFX_ListCtrl::SetScrollPos(const CPDF_Point& point) { +void CFX_ListCtrl::SetScrollPos(const CFX_FloatPoint& point) { SetScrollPosY(point.y); } void CFX_ListCtrl::SetScrollPosY(FX_FLOAT fy) { if (!FX_EDIT_IsFloatEqual(m_ptScrollPos.y, fy)) { - CPDF_Rect rcPlate = GetPlateRect(); - CPDF_Rect rcContent = CFX_List::GetContentRect(); + CFX_FloatRect rcPlate = GetPlateRect(); + CFX_FloatRect rcContent = CFX_List::GetContentRect(); if (rcPlate.Height() > rcContent.Height()) { fy = rcPlate.top; @@ -773,7 +775,7 @@ void CFX_ListCtrl::SetScrollPosY(FX_FLOAT fy) { } } -CPDF_Rect CFX_ListCtrl::GetContentRect() const { +CFX_FloatRect CFX_ListCtrl::GetContentRect() const { return InToOut(CFX_List::GetContentRect()); } @@ -785,7 +787,7 @@ void CFX_ListCtrl::ReArrange(int32_t nItemIndex) { void CFX_ListCtrl::SetTopItem(int32_t nIndex) { if (IsValid(nIndex)) { GetPlateRect(); - CPDF_Rect rcItem = CFX_List::GetItemRect(nIndex); + CFX_FloatRect rcItem = CFX_List::GetItemRect(nIndex); SetScrollPosY(rcItem.top); } } @@ -808,7 +810,7 @@ void CFX_ListCtrl::Cancel() { m_aSelItems.DeselectAll(); } -int32_t CFX_ListCtrl::GetItemIndex(const CPDF_Point& point) const { +int32_t CFX_ListCtrl::GetItemIndex(const CFX_FloatPoint& point) const { return CFX_List::GetItemIndex(OutToIn(point)); } diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp index ed96b96654..752e537099 100644 --- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp @@ -13,22 +13,22 @@ #define FX_EDIT_UNDERLINEHALFWIDTH 0.5f #define FX_EDIT_CROSSOUTHALFWIDTH 0.5f -CPDF_Rect GetUnderLineRect(const CPVT_Word& word) { - return CPDF_Rect(word.ptWord.x, word.ptWord.y + word.fDescent * 0.5f, - word.ptWord.x + word.fWidth, - word.ptWord.y + word.fDescent * 0.25f); +CFX_FloatRect GetUnderLineRect(const CPVT_Word& word) { + return CFX_FloatRect(word.ptWord.x, word.ptWord.y + word.fDescent * 0.5f, + word.ptWord.x + word.fWidth, + word.ptWord.y + word.fDescent * 0.25f); } -CPDF_Rect GetCrossoutRect(const CPVT_Word& word) { - return CPDF_Rect(word.ptWord.x, - word.ptWord.y + (word.fAscent + word.fDescent) * 0.5f + - word.fDescent * 0.25f, - word.ptWord.x + word.fWidth, - word.ptWord.y + (word.fAscent + word.fDescent) * 0.5f); +CFX_FloatRect GetCrossoutRect(const CPVT_Word& word) { + return CFX_FloatRect(word.ptWord.x, + word.ptWord.y + (word.fAscent + word.fDescent) * 0.5f + + word.fDescent * 0.25f, + word.ptWord.x + word.fWidth, + word.ptWord.y + (word.fAscent + word.fDescent) * 0.5f); } static void DrawTextString(CFX_RenderDevice* pDevice, - const CPDF_Point& pt, + const CFX_FloatPoint& pt, CPDF_Font* pFont, FX_FLOAT fFontSize, CFX_Matrix* pUser2Device, @@ -49,7 +49,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice, ro.m_ColorMode = RENDER_COLOR_NORMAL; if (crTextStroke != 0) { - CPDF_Point pt1(0, 0), pt2(1, 0); + CFX_FloatPoint pt1(0, 0), pt2(1, 0); pUser2Device->Transform(pt1.x, pt1.y); pUser2Device->Transform(pt2.x, pt2.y); CFX_GraphStateData gsd; @@ -69,7 +69,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice, ro.m_ColorMode = RENDER_COLOR_NORMAL; if (crTextStroke != 0) { - CPDF_Point pt1(0, 0), pt2(1, 0); + CFX_FloatPoint pt1(0, 0), pt2(1, 0); pUser2Device->Transform(pt1.x, pt1.y); pUser2Device->Transform(pt2.x, pt2.y); CFX_GraphStateData gsd; @@ -92,13 +92,13 @@ void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, IFX_Edit* pEdit, FX_COLORREF color, - const CPDF_Rect& rcClip, - const CPDF_Point& ptOffset, + const CFX_FloatRect& rcClip, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange) { pDevice->SaveState(); if (!rcClip.IsEmpty()) { - CPDF_Rect rcTemp = rcClip; + CFX_FloatRect rcTemp = rcClip; pUser2Device->TransformRect(rcTemp); FX_RECT rcDevClip; rcDevClip.left = (int32_t)rcTemp.left; @@ -123,7 +123,7 @@ void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice, CPVT_Word word; if (pIterator->GetWord(word)) { CFX_PathData pathUnderline; - CPDF_Rect rcUnderline = GetUnderLineRect(word); + CFX_FloatRect rcUnderline = GetUnderLineRect(word); rcUnderline.left += ptOffset.x; rcUnderline.right += ptOffset.x; rcUnderline.top += ptOffset.y; @@ -146,8 +146,8 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, IFX_Edit* pEdit, FX_COLORREF crTextFill, FX_COLORREF crTextStroke, - const CPDF_Rect& rcClip, - const CPDF_Point& ptOffset, + const CFX_FloatRect& rcClip, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange, IFX_SystemHandler* pSystemHandler, void* pFFLData) { @@ -169,12 +169,12 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, CFX_ByteTextBuf sTextBuf; int32_t nFontIndex = -1; - CPDF_Point ptBT(0.0f, 0.0f); + CFX_FloatPoint ptBT(0.0f, 0.0f); pDevice->SaveState(); if (!rcClip.IsEmpty()) { - CPDF_Rect rcTemp = rcClip; + CFX_FloatRect rcTemp = rcClip; pUser2Device->TransformRect(rcTemp); FX_RECT rcDevClip; rcDevClip.left = (int32_t)rcTemp.left; @@ -218,9 +218,9 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, pIterator->GetLine(line); if (pSystemHandler && pSystemHandler->IsSelectionImplemented()) { - CPDF_Rect rc(word.ptWord.x, line.ptLine.y + line.fLineDescent, - word.ptWord.x + word.fWidth, - line.ptLine.y + line.fLineAscent); + CFX_FloatRect rc(word.ptWord.x, line.ptLine.y + line.fLineDescent, + word.ptWord.x + word.fWidth, + line.ptLine.y + line.fLineAscent); rc.Intersect(rcClip); pSystemHandler->OutputSelectedRect(pFFLData, rc); } else { @@ -239,8 +239,8 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, if (place.LineCmp(oldplace) != 0 || word.nFontIndex != nFontIndex || crOldFill != crCurFill) { if (sTextBuf.GetLength() > 0) { - DrawTextString(pDevice, CPDF_Point(ptBT.x + ptOffset.x, - ptBT.y + ptOffset.y), + DrawTextString(pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x, + ptBT.y + ptOffset.y), pFontMap->GetPDFFont(nFontIndex), fFontSize, pUser2Device, sTextBuf.GetByteString(), crOldFill, crTextStroke, nHorzScale); @@ -256,8 +256,8 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, SubWord); } else { DrawTextString( - pDevice, CPDF_Point(word.ptWord.x + ptOffset.x, - word.ptWord.y + ptOffset.y), + pDevice, CFX_FloatPoint(word.ptWord.x + ptOffset.x, + word.ptWord.y + ptOffset.y), pFontMap->GetPDFFont(word.nFontIndex), fFontSize, pUser2Device, GetPDFWordString(pFontMap, word.nFontIndex, word.Word, SubWord), crCurFill, crTextStroke, nHorzScale); @@ -268,7 +268,7 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, if (sTextBuf.GetLength() > 0) { DrawTextString( - pDevice, CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), + pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), pFontMap->GetPDFFont(nFontIndex), fFontSize, pUser2Device, sTextBuf.GetByteString(), crOldFill, crTextStroke, nHorzScale); } @@ -281,8 +281,8 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, IFX_Edit* pEdit, - const CPDF_Rect& rcClip, - const CPDF_Point& ptOffset, + const CFX_FloatRect& rcClip, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange) { CPVT_WordRange wrSelect = pEdit->GetSelectWordRange(); @@ -294,12 +294,12 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, CFX_ByteTextBuf sTextBuf; CPVT_WordProps wp; - CPDF_Point ptBT(0.0f, 0.0f); + CFX_FloatPoint ptBT(0.0f, 0.0f); pDevice->SaveState(); if (!rcClip.IsEmpty()) { - CPDF_Rect rcTemp = rcClip; + CFX_FloatRect rcTemp = rcClip; pUser2Device->TransformRect(rcTemp); FX_RECT rcDevClip; rcDevClip.left = (int32_t)rcTemp.left; @@ -357,11 +357,11 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, FXSYS_memcmp(&word.WordProps, &wp, sizeof(CPVT_WordProps)) != 0 || crOld != crCurText) { if (sTextBuf.GetLength() > 0) { - DrawTextString( - pDevice, CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), - pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize, - pUser2Device, sTextBuf.GetByteString(), crOld, 0, - wp.nHorzScale); + DrawTextString(pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x, + ptBT.y + ptOffset.y), + pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize, + pUser2Device, sTextBuf.GetByteString(), crOld, 0, + wp.nHorzScale); sTextBuf.Clear(); } @@ -375,7 +375,7 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, if (word.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) { CFX_PathData pathUnderline; - CPDF_Rect rcUnderline = GetUnderLineRect(word); + CFX_FloatRect rcUnderline = GetUnderLineRect(word); pathUnderline.AppendRect(rcUnderline.left, rcUnderline.bottom, rcUnderline.right, rcUnderline.top); @@ -385,7 +385,7 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, if (word.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) { CFX_PathData pathCrossout; - CPDF_Rect rcCrossout = GetCrossoutRect(word); + CFX_FloatRect rcCrossout = GetCrossoutRect(word); pathCrossout.AppendRect(rcCrossout.left, rcCrossout.bottom, rcCrossout.right, rcCrossout.top); @@ -399,7 +399,7 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, if (sTextBuf.GetLength() > 0) { DrawTextString( - pDevice, CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), + pDevice, CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize, pUser2Device, sTextBuf.GetByteString(), crOld, 0, wp.nHorzScale); } @@ -411,7 +411,7 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, static void AddRectToPageObjects(CPDF_PageObjectHolder* pObjectHolder, FX_COLORREF crFill, - const CPDF_Rect& rcFill) { + const CFX_FloatRect& rcFill) { std::unique_ptr<CPDF_PathObject> pPathObj(new CPDF_PathObject); CFX_PathData* pPathData = pPathObj->m_Path.GetModify(); pPathData->AppendRect(rcFill.left, rcFill.bottom, rcFill.right, rcFill.top); @@ -435,7 +435,7 @@ static CPDF_TextObject* AddTextObjToPageObjects( FX_FLOAT fFontSize, FX_FLOAT fCharSpace, int32_t nHorzScale, - const CPDF_Point& point, + const CFX_FloatPoint& point, const CFX_ByteString& text) { std::unique_ptr<CPDF_TextObject> pTxtObj(new CPDF_TextObject); CPDF_TextStateData* pTextStateData = pTxtObj->m_TextState.GetModify(); @@ -469,7 +469,7 @@ static CPDF_TextObject* AddTextObjToPageObjects( void IFX_Edit::GeneratePageObjects( CPDF_PageObjectHolder* pObjectHolder, IFX_Edit* pEdit, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange, FX_COLORREF crText, CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) { @@ -478,7 +478,7 @@ void IFX_Edit::GeneratePageObjects( int32_t nOldFontIndex = -1; CFX_ByteTextBuf sTextBuf; - CPDF_Point ptBT(0.0f, 0.0f); + CFX_FloatPoint ptBT(0.0f, 0.0f); ObjArray.RemoveAll(); @@ -504,7 +504,7 @@ void IFX_Edit::GeneratePageObjects( ObjArray.Add(AddTextObjToPageObjects( pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex), fFontSize, 0.0f, 100, - CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), + CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), sTextBuf.GetByteString())); sTextBuf.Clear(); @@ -523,7 +523,7 @@ void IFX_Edit::GeneratePageObjects( ObjArray.Add(AddTextObjToPageObjects( pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex), fFontSize, 0.0f, 100, - CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), + CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), sTextBuf.GetByteString())); } } @@ -533,7 +533,7 @@ void IFX_Edit::GeneratePageObjects( void IFX_Edit::GenerateRichPageObjects( CPDF_PageObjectHolder* pObjectHolder, IFX_Edit* pEdit, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange, CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) { FX_COLORREF crCurText = ArgbEncode(255, 0, 0, 0); @@ -541,7 +541,7 @@ void IFX_Edit::GenerateRichPageObjects( CFX_ByteTextBuf sTextBuf; CPVT_WordProps wp; - CPDF_Point ptBT(0.0f, 0.0f); + CFX_FloatPoint ptBT(0.0f, 0.0f); ObjArray.RemoveAll(); @@ -574,7 +574,7 @@ void IFX_Edit::GenerateRichPageObjects( ObjArray.Add(AddTextObjToPageObjects( pObjectHolder, crOld, pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize, wp.fCharSpace, wp.nHorzScale, - CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), + CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), sTextBuf.GetByteString())); sTextBuf.Clear(); @@ -589,7 +589,7 @@ void IFX_Edit::GenerateRichPageObjects( word.Word, 0); if (word.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) { - CPDF_Rect rcUnderline = GetUnderLineRect(word); + CFX_FloatRect rcUnderline = GetUnderLineRect(word); rcUnderline.left += ptOffset.x; rcUnderline.right += ptOffset.x; rcUnderline.top += ptOffset.y; @@ -599,7 +599,7 @@ void IFX_Edit::GenerateRichPageObjects( } if (word.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) { - CPDF_Rect rcCrossout = GetCrossoutRect(word); + CFX_FloatRect rcCrossout = GetCrossoutRect(word); rcCrossout.left += ptOffset.x; rcCrossout.right += ptOffset.x; rcCrossout.top += ptOffset.y; @@ -616,7 +616,7 @@ void IFX_Edit::GenerateRichPageObjects( ObjArray.Add(AddTextObjToPageObjects( pObjectHolder, crOld, pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize, wp.fCharSpace, wp.nHorzScale, - CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), + CFX_FloatPoint(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y), sTextBuf.GetByteString())); } } @@ -625,7 +625,7 @@ void IFX_Edit::GenerateRichPageObjects( void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjectHolder* pObjectHolder, IFX_Edit* pEdit, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange, FX_COLORREF color) { if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) { @@ -644,7 +644,7 @@ void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjectHolder* pObjectHolder, CPVT_Word word; if (pIterator->GetWord(word)) { - CPDF_Rect rcUnderline = GetUnderLineRect(word); + CFX_FloatRect rcUnderline = GetUnderLineRect(word); rcUnderline.left += ptOffset.x; rcUnderline.right += ptOffset.x; rcUnderline.top += ptOffset.y; diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index c49524d02f..8b2b315ae8 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -494,7 +494,7 @@ FX_BOOL Document::removeField(IJS_Context* cc, return TRUE; for (CPDFSDK_Widget* pWidget : widgets) { - CPDF_Rect rcAnnot = pWidget->GetRect(); + CFX_FloatRect rcAnnot = pWidget->GetRect(); --rcAnnot.left; --rcAnnot.bottom; ++rcAnnot.right; diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 82187c2453..9b6a7facba 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -2095,7 +2095,7 @@ FX_BOOL Field::rect(IJS_Context* cc, pArray[2] = (FX_FLOAT)Lower_Rightx.ToInt(); pArray[3] = (FX_FLOAT)Upper_Lefty.ToInt(); - CPDF_Rect crRect(pArray); + CFX_FloatRect crRect(pArray); if (m_bDelay) { AddDelay_Rect(FP_RECT, crRect); } else { @@ -2133,7 +2133,7 @@ FX_BOOL Field::rect(IJS_Context* cc, void Field::SetRect(CPDFSDK_Document* pDocument, const CFX_WideString& swFieldName, int nControlIndex, - const CPDF_Rect& rect) { + const CFX_FloatRect& rect) { CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm(); std::vector<CPDF_FormField*> FieldArray = @@ -2146,13 +2146,13 @@ void Field::SetRect(CPDFSDK_Document* pDocument, ASSERT(pFormControl); if (CPDFSDK_Widget* pWidget = pInterForm->GetWidget(pFormControl)) { - CPDF_Rect crRect = rect; + CFX_FloatRect crRect = rect; CPDF_Page* pPDFPage = pWidget->GetPDFPage(); crRect.Intersect(pPDFPage->GetPageBBox()); if (!crRect.IsEmpty()) { - CPDF_Rect rcOld = pWidget->GetRect(); + CFX_FloatRect rcOld = pWidget->GetRect(); if (crRect.left != rcOld.left || crRect.right != rcOld.right || crRect.top != rcOld.top || crRect.bottom != rcOld.bottom) { pWidget->SetRect(crRect); @@ -2170,13 +2170,13 @@ void Field::SetRect(CPDFSDK_Document* pDocument, if (CPDF_FormControl* pFormControl = pFormField->GetControl(nControlIndex)) { if (CPDFSDK_Widget* pWidget = pInterForm->GetWidget(pFormControl)) { - CPDF_Rect crRect = rect; + CFX_FloatRect crRect = rect; CPDF_Page* pPDFPage = pWidget->GetPDFPage(); crRect.Intersect(pPDFPage->GetPageBBox()); if (!crRect.IsEmpty()) { - CPDF_Rect rcOld = pWidget->GetRect(); + CFX_FloatRect rcOld = pWidget->GetRect(); if (crRect.left != rcOld.left || crRect.right != rcOld.right || crRect.top != rcOld.top || crRect.bottom != rcOld.bottom) { pWidget->SetRect(crRect); @@ -3402,7 +3402,7 @@ void Field::AddDelay_WideString(enum FIELD_PROP prop, m_pJSDoc->AddDelayData(pNewData); } -void Field::AddDelay_Rect(enum FIELD_PROP prop, const CPDF_Rect& rect) { +void Field::AddDelay_Rect(enum FIELD_PROP prop, const CFX_FloatRect& rect) { CJS_DelayData* pNewData = new CJS_DelayData; pNewData->sFieldName = m_FieldName; pNewData->nControlIndex = m_nFormControlIndex; @@ -3592,6 +3592,6 @@ void Field::AddField(CPDFSDK_Document* pDocument, int nPageIndex, int nFieldType, const CFX_WideString& sName, - const CPDF_Rect& rcCoords) { + const CFX_FloatRect& rcCoords) { // Not supported. } diff --git a/fpdfsdk/src/javascript/Field.h b/fpdfsdk/src/javascript/Field.h index 21552c4ec7..4fba1ddfa1 100644 --- a/fpdfsdk/src/javascript/Field.h +++ b/fpdfsdk/src/javascript/Field.h @@ -81,7 +81,7 @@ struct CJS_DelayData { bool b; CFX_ByteString string; CFX_WideString widestring; - CPDF_Rect rect; + CFX_FloatRect rect; CPWL_Color color; CFX_DWordArray wordarray; CJS_WideStringArray widestringarray; @@ -390,7 +390,7 @@ class Field : public CJS_EmbedObj { static void SetRect(CPDFSDK_Document* pDocument, const CFX_WideString& swFieldName, int nControlIndex, - const CPDF_Rect& rect); + const CFX_FloatRect& rect); static void SetRichText(CPDFSDK_Document* pDocument, const CFX_WideString& swFieldName, int nControlIndex, @@ -435,7 +435,7 @@ class Field : public CJS_EmbedObj { int nPageIndex, int nFieldType, const CFX_WideString& sName, - const CPDF_Rect& rcCoords); + const CFX_FloatRect& rcCoords); static void UpdateFormField(CPDFSDK_Document* pDocument, CPDF_FormField* pFormField, @@ -473,7 +473,7 @@ class Field : public CJS_EmbedObj { void AddDelay_Bool(enum FIELD_PROP prop, bool b); void AddDelay_String(enum FIELD_PROP prop, const CFX_ByteString& string); void AddDelay_WideString(enum FIELD_PROP prop, const CFX_WideString& string); - void AddDelay_Rect(enum FIELD_PROP prop, const CPDF_Rect& rect); + void AddDelay_Rect(enum FIELD_PROP prop, const CFX_FloatRect& rect); void AddDelay_Color(enum FIELD_PROP prop, const CPWL_Color& color); void AddDelay_WordArray(enum FIELD_PROP prop, const CFX_DWordArray& array); void AddDelay_WideStringArray(enum FIELD_PROP prop, diff --git a/fpdfsdk/src/pdfwindow/PWL_Button.cpp b/fpdfsdk/src/pdfwindow/PWL_Button.cpp index 5c78383380..2c6c36c047 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Button.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Button.cpp @@ -21,7 +21,8 @@ void CPWL_Button::OnCreate(PWL_CREATEPARAM& cp) { cp.eCursorType = FXCT_HAND; } -FX_BOOL CPWL_Button::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_Button::OnLButtonDown(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point, nFlag); m_bMouseDown = TRUE; @@ -30,7 +31,7 @@ FX_BOOL CPWL_Button::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_Button::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_Button::OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point, nFlag); ReleaseCapture(); diff --git a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp index 75c951068a..320b2bf62f 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp @@ -24,14 +24,14 @@ CFX_ByteString CPWL_Caret::GetClassName() const { } void CPWL_Caret::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { - GetCaretApp(sAppStream, CPDF_Point(0.0f, 0.0f)); + GetCaretApp(sAppStream, CFX_FloatPoint(0.0f, 0.0f)); } void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { if (IsVisible() && m_bFlash) { - CPDF_Rect rcRect = GetCaretRect(); - CPDF_Rect rcClip = GetClipRect(); + CFX_FloatRect rcRect = GetCaretRect(); + CFX_FloatRect rcClip = GetClipRect(); CFX_PathData path; @@ -65,12 +65,12 @@ void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice, } void CPWL_Caret::GetCaretApp(CFX_ByteTextBuf& sAppStream, - const CPDF_Point& ptOffset) { + const CFX_FloatPoint& ptOffset) { if (IsVisible() && m_bFlash) { CFX_ByteTextBuf sCaret; - CPDF_Rect rcRect = GetCaretRect(); - CPDF_Rect rcClip = GetClipRect(); + CFX_FloatRect rcRect = GetCaretRect(); + CFX_FloatRect rcClip = GetClipRect(); rcRect = CPWL_Utils::OffsetRect(rcRect, ptOffset.x, ptOffset.y); rcClip = CPWL_Utils::OffsetRect(rcClip, ptOffset.x, ptOffset.y); @@ -90,7 +90,7 @@ void CPWL_Caret::GetCaretApp(CFX_ByteTextBuf& sAppStream, } CFX_ByteString CPWL_Caret::GetCaretAppearanceStream( - const CPDF_Point& ptOffset) { + const CFX_FloatPoint& ptOffset) { CFX_ByteTextBuf sCaret; GetCaretApp(sCaret, ptOffset); return sCaret.GetByteString(); @@ -105,13 +105,14 @@ void CPWL_Caret::TimerProc() { } } -CPDF_Rect CPWL_Caret::GetCaretRect() const { - return CPDF_Rect(m_ptFoot.x, m_ptFoot.y, m_ptHead.x + m_fWidth, m_ptHead.y); +CFX_FloatRect CPWL_Caret::GetCaretRect() const { + return CFX_FloatRect(m_ptFoot.x, m_ptFoot.y, m_ptHead.x + m_fWidth, + m_ptHead.y); } void CPWL_Caret::SetCaret(FX_BOOL bVisible, - const CPDF_Point& ptHead, - const CPDF_Point& ptFoot) { + const CFX_FloatPoint& ptHead, + const CFX_FloatPoint& ptFoot) { if (bVisible) { if (IsVisible()) { if (m_ptHead.x != ptHead.x || m_ptHead.y != ptHead.y || @@ -135,8 +136,8 @@ void CPWL_Caret::SetCaret(FX_BOOL bVisible, Move(m_rcInvalid, FALSE, TRUE); } } else { - m_ptHead = CPDF_Point(0, 0); - m_ptFoot = CPDF_Point(0, 0); + m_ptHead = CFX_FloatPoint(0, 0); + m_ptFoot = CFX_FloatPoint(0, 0); m_bFlash = FALSE; if (IsVisible()) { @@ -146,9 +147,9 @@ void CPWL_Caret::SetCaret(FX_BOOL bVisible, } } -void CPWL_Caret::InvalidateRect(CPDF_Rect* pRect) { +void CPWL_Caret::InvalidateRect(CFX_FloatRect* pRect) { if (pRect) { - CPDF_Rect rcRefresh = CPWL_Utils::InflateRect(*pRect, 0.5f); + CFX_FloatRect rcRefresh = CPWL_Utils::InflateRect(*pRect, 0.5f); rcRefresh.top += 1; rcRefresh.bottom -= 1; diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp index 7582ae412b..bdc6724f65 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp @@ -20,7 +20,8 @@ #define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb))) #define IsFloatEqual(fa, fb) IsFloatZero((fa) - (fb)) -FX_BOOL CPWL_CBListBox::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_CBListBox::OnLButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point, nFlag); if (m_bMouseDown) { @@ -110,19 +111,19 @@ FX_BOOL CPWL_CBListBox::OnCharWithExit(FX_WORD nChar, void CPWL_CBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CPWL_Wnd::GetThisAppearanceStream(sAppStream); - CPDF_Rect rectWnd = CPWL_Wnd::GetWindowRect(); + CFX_FloatRect rectWnd = CPWL_Wnd::GetWindowRect(); if (IsVisible() && !rectWnd.IsEmpty()) { CFX_ByteTextBuf sButton; - CPDF_Point ptCenter = GetCenterPoint(); + CFX_FloatPoint ptCenter = GetCenterPoint(); - CPDF_Point pt1(ptCenter.x - PWL_CBBUTTON_TRIANGLE_HALFLEN, - ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt2(ptCenter.x + PWL_CBBUTTON_TRIANGLE_HALFLEN, - ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt3(ptCenter.x, - ptCenter.y - PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt1(ptCenter.x - PWL_CBBUTTON_TRIANGLE_HALFLEN, + ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt2(ptCenter.x + PWL_CBBUTTON_TRIANGLE_HALFLEN, + ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt3(ptCenter.x, + ptCenter.y - PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); if (IsFloatBigger(rectWnd.right - rectWnd.left, PWL_CBBUTTON_TRIANGLE_HALFLEN * 2) && @@ -143,17 +144,17 @@ void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device); - CPDF_Rect rectWnd = CPWL_Wnd::GetWindowRect(); + CFX_FloatRect rectWnd = CPWL_Wnd::GetWindowRect(); if (IsVisible() && !rectWnd.IsEmpty()) { - CPDF_Point ptCenter = GetCenterPoint(); + CFX_FloatPoint ptCenter = GetCenterPoint(); - CPDF_Point pt1(ptCenter.x - PWL_CBBUTTON_TRIANGLE_HALFLEN, - ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt2(ptCenter.x + PWL_CBBUTTON_TRIANGLE_HALFLEN, - ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt3(ptCenter.x, - ptCenter.y - PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt1(ptCenter.x - PWL_CBBUTTON_TRIANGLE_HALFLEN, + ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt2(ptCenter.x + PWL_CBBUTTON_TRIANGLE_HALFLEN, + ptCenter.y + PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt3(ptCenter.x, + ptCenter.y - PWL_CBBUTTON_TRIANGLE_HALFLEN * 0.5f); if (IsFloatBigger(rectWnd.right - rectWnd.left, PWL_CBBUTTON_TRIANGLE_HALFLEN * 2) && @@ -175,7 +176,8 @@ void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, } } -FX_BOOL CPWL_CBButton::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_CBButton::OnLButtonDown(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point, nFlag); SetCapture(); @@ -188,7 +190,8 @@ FX_BOOL CPWL_CBButton::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_CBButton::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_CBButton::OnLButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point, nFlag); ReleaseCapture(); @@ -297,7 +300,7 @@ void CPWL_ComboBox::CreateEdit(const PWL_CREATEPARAM& cp) { if (!HasFlag(PCBS_ALLOWCUSTOMTEXT)) ecp.dwFlags |= PWS_READONLY; - ecp.rcRectWnd = CPDF_Rect(0, 0, 0, 0); + ecp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0); ecp.dwBorderWidth = 0; ecp.nBorderStyle = PBS_SOLID; @@ -333,7 +336,7 @@ void CPWL_ComboBox::CreateListBox(const PWL_CREATEPARAM& cp) { lcp.nBorderStyle = PBS_SOLID; lcp.dwBorderWidth = 1; lcp.eCursorType = FXCT_ARROW; - lcp.rcRectWnd = CPDF_Rect(0, 0, 0, 0); + lcp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0); if (cp.dwFlags & PWS_AUTOFONTSIZE) lcp.fFontSize = PWLCB_DEFAULTFONTSIZE; @@ -351,13 +354,13 @@ void CPWL_ComboBox::CreateListBox(const PWL_CREATEPARAM& cp) { } void CPWL_ComboBox::RePosChildWnd() { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); if (m_bPopup) { - CPDF_Rect rclient = GetClientRect(); - CPDF_Rect rcButton = rclient; - CPDF_Rect rcEdit = rcClient; - CPDF_Rect rcList = CPWL_Wnd::GetWindowRect(); + CFX_FloatRect rclient = GetClientRect(); + CFX_FloatRect rcButton = rclient; + CFX_FloatRect rcEdit = rcClient; + CFX_FloatRect rcList = CPWL_Wnd::GetWindowRect(); FX_FLOAT fOldWindowHeight = m_rcOldWindow.Height(); FX_FLOAT fOldClientHeight = fOldWindowHeight - GetBorderWidth() * 2; @@ -419,7 +422,7 @@ void CPWL_ComboBox::RePosChildWnd() { m_pList->ScrollToListItem(m_nSelectItem); } } else { - CPDF_Rect rcButton = rcClient; + CFX_FloatRect rcButton = rcClient; rcButton.left = rcButton.right - PWL_COMBOBOX_BUTTON_WIDTH; @@ -429,7 +432,7 @@ void CPWL_ComboBox::RePosChildWnd() { if (m_pButton) m_pButton->Move(rcButton, TRUE, FALSE); - CPDF_Rect rcEdit = rcClient; + CFX_FloatRect rcEdit = rcClient; rcEdit.right = rcButton.left - 1.0f; if (rcEdit.left < rcClient.left) @@ -451,8 +454,8 @@ void CPWL_ComboBox::SelectAll() { m_pEdit->SelectAll(); } -CPDF_Rect CPWL_ComboBox::GetFocusRect() const { - return CPDF_Rect(); +CFX_FloatRect CPWL_ComboBox::GetFocusRect() const { + return CFX_FloatRect(); } void CPWL_ComboBox::SetPopup(FX_BOOL bPopup) { @@ -485,7 +488,7 @@ void CPWL_ComboBox::SetPopup(FX_BOOL bPopup) { if (IsFloatBigger(fPopupRet, 0.0f)) { m_bPopup = bPopup; - CPDF_Rect rcWindow = CPWL_Wnd::GetWindowRect(); + CFX_FloatRect rcWindow = CPWL_Wnd::GetWindowRect(); m_rcOldWindow = rcWindow; switch (nWhere) { default: diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp index 7834473ded..0b3887b413 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp @@ -73,10 +73,10 @@ void CPWL_Edit::SetText(const FX_WCHAR* csText) { void CPWL_Edit::RePosChildWnd() { if (CPWL_ScrollBar* pVSB = GetVScrollBar()) { - CPDF_Rect rcWindow = m_rcOldWindow; - CPDF_Rect rcVScroll = - CPDF_Rect(rcWindow.right, rcWindow.bottom, - rcWindow.right + PWL_SCROLLBAR_WIDTH, rcWindow.top); + CFX_FloatRect rcWindow = m_rcOldWindow; + CFX_FloatRect rcVScroll = + CFX_FloatRect(rcWindow.right, rcWindow.bottom, + rcWindow.right + PWL_SCROLLBAR_WIDTH, rcWindow.top); pVSB->Move(rcVScroll, TRUE, FALSE); } @@ -87,8 +87,8 @@ void CPWL_Edit::RePosChildWnd() { CPWL_EditCtrl::RePosChildWnd(); } -CPDF_Rect CPWL_Edit::GetClientRect() const { - CPDF_Rect rcClient = CPWL_Utils::DeflateRect( +CFX_FloatRect CPWL_Edit::GetClientRect() const { + CFX_FloatRect rcClient = CPWL_Utils::DeflateRect( GetWindowRect(), (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth())); if (CPWL_ScrollBar* pVSB = GetVScrollBar()) { @@ -234,7 +234,7 @@ void CPWL_Edit::SetParamByFlag() { m_pEdit->EnableUndo(HasFlag(PES_UNDO)); if (HasFlag(PES_TEXTOVERFLOW)) { - SetClipRect(CPDF_Rect(0.0f, 0.0f, 0.0f, 0.0f)); + SetClipRect(CFX_FloatRect(0.0f, 0.0f, 0.0f, 0.0f)); m_pEdit->SetTextOverflow(TRUE, FALSE); } else { if (m_pEditCaret) { @@ -251,7 +251,7 @@ void CPWL_Edit::SetParamByFlag() { void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CPWL_Wnd::GetThisAppearanceStream(sAppStream); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); CFX_ByteTextBuf sLine; int32_t nCharArray = m_pEdit->GetCharArray(); @@ -299,7 +299,7 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CFX_ByteTextBuf sText; - CPDF_Point ptOffset = CPDF_Point(0.0f, 0.0f); + CFX_FloatPoint ptOffset = CFX_FloatPoint(0.0f, 0.0f); CPVT_WordRange wrWhole = m_pEdit->GetWholeWordRange(); CPVT_WordRange wrSelect = GetSelectWordRange(); @@ -355,7 +355,7 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { } if (sText.GetLength() > 0) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); sAppStream << "q\n/Tx BMC\n"; if (!HasFlag(PES_TEXTOVERFLOW)) @@ -373,7 +373,7 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); CFX_ByteTextBuf sLine; int32_t nCharArray = m_pEdit->GetCharArray(); @@ -441,7 +441,7 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice, } } - CPDF_Rect rcClip; + CFX_FloatRect rcClip; CPVT_WordRange wrRange = m_pEdit->GetVisibleWordRange(); CPVT_WordRange* pRange = NULL; @@ -454,16 +454,16 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice, pDevice, pUser2Device, m_pEdit, CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()), CPWL_Utils::PWLColorToFXColor(GetTextStrokeColor(), GetTransparency()), - rcClip, CPDF_Point(0.0f, 0.0f), pRange, pSysHandler, m_pFormFiller); + rcClip, CFX_FloatPoint(0.0f, 0.0f), pRange, pSysHandler, m_pFormFiller); if (HasFlag(PES_SPELLCHECK)) { CPWL_Utils::DrawEditSpellCheck(pDevice, pUser2Device, m_pEdit, rcClip, - CPDF_Point(0.0f, 0.0f), pRange, + CFX_FloatPoint(0.0f, 0.0f), pRange, GetCreationParam().pSpellCheck); } } -FX_BOOL CPWL_Edit::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_Edit::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point, nFlag); if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) { @@ -479,7 +479,8 @@ FX_BOOL CPWL_Edit::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_Edit::OnLButtonDblClk(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_Edit::OnLButtonDblClk(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDblClk(point, nFlag); if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) { @@ -498,7 +499,7 @@ FX_BOOL CPWL_Edit::OnLButtonDblClk(const CPDF_Point& point, FX_DWORD nFlag) { #define WM_PWLEDIT_SELECTALL 0x07 #define WM_PWLEDIT_SUGGEST 0x08 -FX_BOOL CPWL_Edit::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_Edit::OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) { if (m_bMouseDown) return FALSE; @@ -521,7 +522,7 @@ FX_BOOL CPWL_Edit::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { return FALSE; std::vector<CFX_ByteString> sSuggestWords; - CPDF_Point ptPopup = point; + CFX_FloatPoint ptPopup = point; if (!IsReadOnly()) { if (HasFlag(PES_SPELLCHECK) && !swLatin.IsEmpty()) { @@ -684,7 +685,7 @@ void CPWL_Edit::OnKillFocus() { ShowVScrollBar(FALSE); m_pEdit->SelectNone(); - SetCaret(FALSE, CPDF_Point(0.0f, 0.0f), CPDF_Point(0.0f, 0.0f)); + SetCaret(FALSE, CFX_FloatPoint(0.0f, 0.0f), CFX_FloatPoint(0.0f, 0.0f)); SetCharSet(0); @@ -710,7 +711,7 @@ void CPWL_Edit::SetLineLeading(FX_FLOAT fLineLeading, } CFX_ByteString CPWL_Edit::GetSelectAppearanceStream( - const CPDF_Point& ptOffset) const { + const CFX_FloatPoint& ptOffset) const { CPVT_WordRange wr = GetSelectWordRange(); return CPWL_Utils::GetEditSelAppStream(m_pEdit, ptOffset, &wr); } @@ -732,7 +733,7 @@ CPVT_WordRange CPWL_Edit::GetSelectWordRange() const { } CFX_ByteString CPWL_Edit::GetTextAppearanceStream( - const CPDF_Point& ptOffset) const { + const CFX_FloatPoint& ptOffset) const { CFX_ByteTextBuf sRet; CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(m_pEdit, ptOffset); @@ -745,23 +746,24 @@ CFX_ByteString CPWL_Edit::GetTextAppearanceStream( } CFX_ByteString CPWL_Edit::GetCaretAppearanceStream( - const CPDF_Point& ptOffset) const { + const CFX_FloatPoint& ptOffset) const { if (m_pEditCaret) return m_pEditCaret->GetCaretAppearanceStream(ptOffset); return CFX_ByteString(); } -CPDF_Point CPWL_Edit::GetWordRightBottomPoint(const CPVT_WordPlace& wpWord) { - CPDF_Point pt(0.0f, 0.0f); +CFX_FloatPoint CPWL_Edit::GetWordRightBottomPoint( + const CPVT_WordPlace& wpWord) { + CFX_FloatPoint pt(0.0f, 0.0f); if (IFX_Edit_Iterator* pIterator = m_pEdit->GetIterator()) { CPVT_WordPlace wpOld = pIterator->GetAt(); pIterator->SetAt(wpWord); CPVT_Word word; if (pIterator->GetWord(word)) { - pt = CPDF_Point(word.ptWord.x + word.fWidth, - word.ptWord.y + word.fDescent); + pt = CFX_FloatPoint(word.ptWord.x + word.fWidth, + word.ptWord.y + word.fDescent); } pIterator->SetAt(wpOld); @@ -775,13 +777,13 @@ FX_BOOL CPWL_Edit::IsTextFull() const { } FX_FLOAT CPWL_Edit::GetCharArrayAutoFontSize(CPDF_Font* pFont, - const CPDF_Rect& rcPlate, + const CFX_FloatRect& rcPlate, int32_t nCharArray) { if (pFont && !pFont->IsStandardFont()) { FX_RECT rcBBox; pFont->GetFontBBox(rcBBox); - CPDF_Rect rcCell = rcPlate; + CFX_FloatRect rcCell = rcPlate; FX_FLOAT xdiv = rcCell.Width() / nCharArray * 1000.0f / rcBBox.Width(); FX_FLOAT ydiv = -rcCell.Height() * 1000.0f / rcBBox.Height(); @@ -818,8 +820,8 @@ void CPWL_Edit::ReplaceSel(const FX_WCHAR* csText) { m_pEdit->InsertText(csText); } -CPDF_Rect CPWL_Edit::GetFocusRect() const { - return CPDF_Rect(); +CFX_FloatRect CPWL_Edit::GetFocusRect() const { + return CFX_FloatRect(); } void CPWL_Edit::ShowVScrollBar(FX_BOOL bShow) { @@ -827,7 +829,7 @@ void CPWL_Edit::ShowVScrollBar(FX_BOOL bShow) { if (bShow) { if (!pScroll->IsVisible()) { pScroll->SetVisible(TRUE); - CPDF_Rect rcWindow = GetWindowRect(); + CFX_FloatRect rcWindow = GetWindowRect(); m_rcOldWindow = rcWindow; rcWindow.right += PWL_SCROLLBAR_WIDTH; Move(rcWindow, TRUE, TRUE); @@ -976,10 +978,10 @@ FX_BOOL CPWL_Edit::OnChar(FX_WORD nChar, FX_DWORD nFlag) { } FX_BOOL CPWL_Edit::OnMouseWheel(short zDelta, - const CPDF_Point& point, + const CFX_FloatPoint& point, FX_DWORD nFlag) { if (HasFlag(PES_MULTILINE)) { - CPDF_Point ptScroll = GetScrollPos(); + CFX_FloatPoint ptScroll = GetScrollPos(); if (zDelta > 0) { ptScroll.y += GetFontSize(); @@ -1094,7 +1096,8 @@ CPVT_WordRange CPWL_Edit::CombineWordRange(const CPVT_WordRange& wr1, return wrRet; } -CPVT_WordRange CPWL_Edit::GetLatinWordsRange(const CPDF_Point& point) const { +CPVT_WordRange CPWL_Edit::GetLatinWordsRange( + const CFX_FloatPoint& point) const { return GetSameWordsRange(m_pEdit->SearchWordPlace(point), TRUE, FALSE); } @@ -1167,7 +1170,7 @@ CPVT_WordRange CPWL_Edit::GetSameWordsRange(const CPVT_WordPlace& place, void CPWL_Edit::GeneratePageObjects( CPDF_PageObjectHolder* pObjectHolder, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) { IFX_Edit::GeneratePageObjects( pObjectHolder, m_pEdit, ptOffset, NULL, @@ -1176,7 +1179,7 @@ void CPWL_Edit::GeneratePageObjects( } void CPWL_Edit::GeneratePageObjects(CPDF_PageObjectHolder* pObjectHolder, - const CPDF_Point& ptOffset) { + const CFX_FloatPoint& ptOffset) { CFX_ArrayTemplate<CPDF_TextObject*> ObjArray; IFX_Edit::GeneratePageObjects( pObjectHolder, m_pEdit, ptOffset, NULL, diff --git a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp index c505c7e780..10b5d6c04f 100644 --- a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp @@ -47,8 +47,8 @@ void CPWL_EditCtrl::OnCreated() { FX_BOOL CPWL_EditCtrl::IsWndHorV() { CFX_Matrix mt = GetWindowMatrix(); - CPDF_Point point1(0, 1); - CPDF_Point point2(1, 1); + CFX_FloatPoint point1(0, 1); + CFX_FloatPoint point2(1, 1); mt.Transform(point1.x, point1.y); mt.Transform(point2.x, point2.y); @@ -100,7 +100,8 @@ void CPWL_EditCtrl::OnNotify(CPWL_Wnd* pWnd, FX_FLOAT fPos = *(FX_FLOAT*)lParam; switch (wParam) { case SBT_VSCROLL: - m_pEdit->SetScrollPos(CPDF_Point(m_pEdit->GetScrollPos().x, fPos)); + m_pEdit->SetScrollPos( + CFX_FloatPoint(m_pEdit->GetScrollPos().x, fPos)); break; } } break; @@ -127,7 +128,7 @@ void CPWL_EditCtrl::CreateEditCaret(const PWL_CREATEPARAM& cp) { ecp.dwFlags = PWS_CHILD | PWS_NOREFRESHCLIP; ecp.dwBorderWidth = 0; ecp.nBorderStyle = PBS_SOLID; - ecp.rcRectWnd = CPDF_Rect(0, 0, 0, 0); + ecp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0); m_pEditCaret->Create(ecp); } @@ -290,7 +291,8 @@ FX_BOOL CPWL_EditCtrl::OnChar(FX_WORD nChar, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point, nFlag); if (ClientHitTest(point)) { @@ -306,7 +308,8 @@ FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point, nFlag); if (m_bMouseDown) { @@ -321,7 +324,8 @@ FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_EditCtrl::OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_EditCtrl::OnMouseMove(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnMouseMove(point, nFlag); if (m_bMouseDown) @@ -330,12 +334,12 @@ FX_BOOL CPWL_EditCtrl::OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -CPDF_Rect CPWL_EditCtrl::GetContentRect() const { +CFX_FloatRect CPWL_EditCtrl::GetContentRect() const { return m_pEdit->GetContentRect(); } void CPWL_EditCtrl::SetEditCaret(FX_BOOL bVisible) { - CPDF_Point ptHead(0, 0), ptFoot(0, 0); + CFX_FloatPoint ptHead(0, 0), ptFoot(0, 0); if (bVisible) { GetCaretInfo(ptHead, ptFoot); @@ -345,7 +349,8 @@ void CPWL_EditCtrl::SetEditCaret(FX_BOOL bVisible) { IOnSetCaret(bVisible, ptHead, ptFoot, wpTemp); } -void CPWL_EditCtrl::GetCaretInfo(CPDF_Point& ptHead, CPDF_Point& ptFoot) const { +void CPWL_EditCtrl::GetCaretInfo(CFX_FloatPoint& ptHead, + CFX_FloatPoint& ptFoot) const { if (IFX_Edit_Iterator* pIterator = m_pEdit->GetIterator()) { pIterator->SetAt(m_pEdit->GetCaret()); CPVT_Word word; @@ -365,7 +370,7 @@ void CPWL_EditCtrl::GetCaretInfo(CPDF_Point& ptHead, CPDF_Point& ptFoot) const { } void CPWL_EditCtrl::GetCaretPos(int32_t& x, int32_t& y) const { - CPDF_Point ptHead(0, 0), ptFoot(0, 0); + CFX_FloatPoint ptHead(0, 0), ptFoot(0, 0); GetCaretInfo(ptHead, ptFoot); @@ -373,8 +378,8 @@ void CPWL_EditCtrl::GetCaretPos(int32_t& x, int32_t& y) const { } void CPWL_EditCtrl::SetCaret(FX_BOOL bVisible, - const CPDF_Point& ptHead, - const CPDF_Point& ptFoot) { + const CFX_FloatPoint& ptHead, + const CFX_FloatPoint& ptFoot) { if (m_pEditCaret) { if (!IsFocused() || m_pEdit->IsSelected()) bVisible = FALSE; @@ -433,16 +438,16 @@ int32_t CPWL_EditCtrl::GetTotalWords() const { return 0; } -void CPWL_EditCtrl::SetScrollPos(const CPDF_Point& point) { +void CPWL_EditCtrl::SetScrollPos(const CFX_FloatPoint& point) { if (m_pEdit) m_pEdit->SetScrollPos(point); } -CPDF_Point CPWL_EditCtrl::GetScrollPos() const { +CFX_FloatPoint CPWL_EditCtrl::GetScrollPos() const { if (m_pEdit) return m_pEdit->GetScrollPos(); - return CPDF_Point(0.0f, 0.0f); + return CFX_FloatPoint(0.0f, 0.0f); } CPDF_Font* CPWL_EditCtrl::GetCaretFont() const { @@ -570,8 +575,8 @@ void CPWL_EditCtrl::IOnSetScrollPosY(FX_FLOAT fy) { } void CPWL_EditCtrl::IOnSetCaret(FX_BOOL bVisible, - const CPDF_Point& ptHead, - const CPDF_Point& ptFoot, + const CFX_FloatPoint& ptHead, + const CFX_FloatPoint& ptFoot, const CPVT_WordPlace& place) { PWL_CARET_INFO cInfo; cInfo.bVisible = bVisible; @@ -584,7 +589,7 @@ void CPWL_EditCtrl::IOnSetCaret(FX_BOOL bVisible, void CPWL_EditCtrl::IOnCaretChange(const CPVT_SecProps& secProps, const CPVT_WordProps& wordProps) {} -void CPWL_EditCtrl::IOnContentChange(const CPDF_Rect& rcContent) { +void CPWL_EditCtrl::IOnContentChange(const CFX_FloatRect& rcContent) { if (IsValid()) { if (m_pEditNotify) { m_pEditNotify->OnContentChange(rcContent); @@ -592,7 +597,7 @@ void CPWL_EditCtrl::IOnContentChange(const CPDF_Rect& rcContent) { } } -void CPWL_EditCtrl::IOnInvalidateRect(CPDF_Rect* pRect) { +void CPWL_EditCtrl::IOnInvalidateRect(CFX_FloatRect* pRect) { InvalidateRect(pRect); } @@ -600,13 +605,13 @@ int32_t CPWL_EditCtrl::GetCharSet() const { return m_nCharSet < 0 ? DEFAULT_CHARSET : m_nCharSet; } -void CPWL_EditCtrl::GetTextRange(const CPDF_Rect& rect, +void CPWL_EditCtrl::GetTextRange(const CFX_FloatRect& rect, int32_t& nStartChar, int32_t& nEndChar) const { nStartChar = m_pEdit->WordPlaceToWordIndex( - m_pEdit->SearchWordPlace(CPDF_Point(rect.left, rect.top))); + m_pEdit->SearchWordPlace(CFX_FloatPoint(rect.left, rect.top))); nEndChar = m_pEdit->WordPlaceToWordIndex( - m_pEdit->SearchWordPlace(CPDF_Point(rect.right, rect.bottom))); + m_pEdit->SearchWordPlace(CFX_FloatPoint(rect.right, rect.bottom))); } CFX_WideString CPWL_EditCtrl::GetText(int32_t& nStartChar, diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp index 56c22d1bbd..1bfa1a6d3a 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp @@ -16,7 +16,7 @@ CFX_ByteString CPWL_Image::GetImageAppStream() { CFX_ByteTextBuf sAppStream; CFX_ByteString sAlias = GetImageAlias(); - CPDF_Rect rcPlate = GetClientRect(); + CFX_FloatRect rcPlate = GetClientRect(); CFX_Matrix mt; mt.SetReverse(GetImageMatrix()); @@ -60,7 +60,7 @@ void CPWL_Image::GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) { if (m_pPDFStream) { if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) { - CPDF_Rect rect = pDict->GetRectBy("BBox"); + CFX_FloatRect rect = pDict->GetRectBy("BBox"); fWidth = rect.right - rect.left; fHeight = rect.top - rect.bottom; @@ -157,7 +157,7 @@ void CPWL_Icon::GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) { FX_FLOAT fImageWidth, fImageHeight; FX_FLOAT fPlateWidth, fPlateHeight; - CPDF_Rect rcPlate = GetClientRect(); + CFX_FloatRect rcPlate = GetClientRect(); fPlateWidth = rcPlate.right - rcPlate.left; fPlateHeight = rcPlate.top - rcPlate.bottom; @@ -213,7 +213,7 @@ void CPWL_Icon::GetImageOffset(FX_FLOAT& x, FX_FLOAT& y) { FX_FLOAT fImageFactHeight = fImageHeight * fVScale; FX_FLOAT fPlateWidth, fPlateHeight; - CPDF_Rect rcPlate = GetClientRect(); + CFX_FloatRect rcPlate = GetClientRect(); fPlateWidth = rcPlate.right - rcPlate.left; fPlateHeight = rcPlate.top - rcPlate.bottom; diff --git a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp index c6849d0683..7dc8ba9f44 100644 --- a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp @@ -33,7 +33,7 @@ FX_FLOAT CPWL_IconList_Item::GetItemHeight(FX_FLOAT fLimitWidth) { void CPWL_IconList_Item::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); if (m_bSelected) { if (IsEnabled()) { @@ -49,7 +49,7 @@ void CPWL_IconList_Item::DrawThisAppearance(CFX_RenderDevice* pDevice, } } - CPDF_Rect rcIcon = rcClient; + CFX_FloatRect rcIcon = rcClient; rcIcon.left += PWL_IconList_ITEM_ICON_LEFTMARGIN; rcIcon.right = rcIcon.left + PWL_IconList_ITEM_WIDTH; @@ -99,7 +99,7 @@ CFX_WideString CPWL_IconList_Item::GetText() const { } void CPWL_IconList_Item::RePosChildWnd() { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); rcClient.left += (PWL_IconList_ITEM_ICON_LEFTMARGIN + PWL_IconList_ITEM_WIDTH + @@ -150,7 +150,7 @@ void CPWL_IconList_Content::CreateChildWnd(const PWL_CREATEPARAM& cp) { ResetContent(0); if (CPWL_Wnd* pParent = GetParentWindow()) { - CPDF_Rect rcScroll = GetScrollArea(); + CFX_FloatRect rcScroll = GetScrollArea(); GetScrollPos(); PWL_SCROLL_INFO sInfo; @@ -164,7 +164,7 @@ void CPWL_IconList_Content::CreateChildWnd(const PWL_CREATEPARAM& cp) { } } -FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point& point, +FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) { SetFocus(); @@ -178,7 +178,7 @@ FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point& point, return TRUE; } -FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CPDF_Point& point, +FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) { m_bMouseDown = FALSE; ReleaseCapture(); @@ -186,7 +186,7 @@ FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CPDF_Point& point, return TRUE; } -FX_BOOL CPWL_IconList_Content::OnMouseMove(const CPDF_Point& point, +FX_BOOL CPWL_IconList_Content::OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) { if (m_bMouseDown) { int32_t nItemIndex = FindItemIndex(point); @@ -218,11 +218,11 @@ FX_BOOL CPWL_IconList_Content::OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) { return FALSE; } -int32_t CPWL_IconList_Content::FindItemIndex(const CPDF_Point& point) { +int32_t CPWL_IconList_Content::FindItemIndex(const CFX_FloatPoint& point) { int32_t nIndex = 0; for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) { if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) { - CPDF_Rect rcWnd = pChild->ChildToParent(pChild->GetWindowRect()); + CFX_FloatRect rcWnd = pChild->ChildToParent(pChild->GetWindowRect()); if (point.y < rcWnd.top) { nIndex = i; @@ -234,14 +234,14 @@ int32_t CPWL_IconList_Content::FindItemIndex(const CPDF_Point& point) { } void CPWL_IconList_Content::ScrollToItem(int32_t nItemIndex) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); if (CPWL_IconList_Item* pItem = GetListItem(nItemIndex)) { - CPDF_Rect rcOrigin = pItem->GetWindowRect(); - CPDF_Rect rcWnd = pItem->ChildToParent(rcOrigin); + CFX_FloatRect rcOrigin = pItem->GetWindowRect(); + CFX_FloatRect rcWnd = pItem->ChildToParent(rcOrigin); if (!(rcWnd.bottom > rcClient.bottom && rcWnd.top < rcClient.top)) { - CPDF_Point ptScroll = GetScrollPos(); + CFX_FloatPoint ptScroll = GetScrollPos(); if (rcWnd.top > rcClient.top) { ptScroll.y = rcOrigin.top; @@ -398,7 +398,7 @@ void CPWL_IconList::OnNotify(CPWL_Wnd* pWnd, } if (m_pListContent) - m_pListContent->SetScrollPos(CPDF_Point(0.0f, 0.0f)); + m_pListContent->SetScrollPos(CFX_FloatPoint(0.0f, 0.0f)); } pScrollBar->OnNotify(pWnd, PNM_SETSCROLLINFO, wParam, lParam); @@ -407,7 +407,8 @@ void CPWL_IconList::OnNotify(CPWL_Wnd* pWnd, return; case PNM_SCROLLWINDOW: if (m_pListContent) { - m_pListContent->SetScrollPos(CPDF_Point(0.0f, *(FX_FLOAT*)lParam)); + m_pListContent->SetScrollPos( + CFX_FloatPoint(0.0f, *(FX_FLOAT*)lParam)); m_pListContent->ResetFace(); m_pListContent->InvalidateRect(NULL); } @@ -462,14 +463,14 @@ void CPWL_IconList::SetIconFillColor(const CPWL_Color& color) { } FX_BOOL CPWL_IconList::OnMouseWheel(short zDelta, - const CPDF_Point& point, + const CFX_FloatPoint& point, FX_DWORD nFlag) { - CPDF_Point ptScroll = m_pListContent->GetScrollPos(); - CPDF_Rect rcScroll = m_pListContent->GetScrollArea(); - CPDF_Rect rcContents = m_pListContent->GetClientRect(); + CFX_FloatPoint ptScroll = m_pListContent->GetScrollPos(); + CFX_FloatRect rcScroll = m_pListContent->GetScrollArea(); + CFX_FloatRect rcContents = m_pListContent->GetClientRect(); if (rcScroll.top - rcScroll.bottom > rcContents.Height()) { - CPDF_Point ptNew = ptScroll; + CFX_FloatPoint ptNew = ptScroll; if (zDelta > 0) ptNew.y += 30; diff --git a/fpdfsdk/src/pdfwindow/PWL_Label.cpp b/fpdfsdk/src/pdfwindow/PWL_Label.cpp index 4f8a0dd8ed..5f8d2d8685 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Label.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Label.cpp @@ -29,7 +29,7 @@ void CPWL_Label::OnCreated() { m_pEdit->Initialize(); if (HasFlag(PES_TEXTOVERFLOW)) { - SetClipRect(CPDF_Rect(0.0f, 0.0f, 0.0f, 0.0f)); + SetClipRect(CFX_FloatRect(0.0f, 0.0f, 0.0f, 0.0f)); m_pEdit->SetTextOverflow(TRUE); } } @@ -87,7 +87,7 @@ void CPWL_Label::DrawThisAppearance(CFX_RenderDevice* pDevice, GetClientRect(); - CPDF_Rect rcClip; + CFX_FloatRect rcClip; CPVT_WordRange wrRange = m_pEdit->GetVisibleWordRange(); CPVT_WordRange* pRange = NULL; @@ -100,7 +100,7 @@ void CPWL_Label::DrawThisAppearance(CFX_RenderDevice* pDevice, pDevice, pUser2Device, m_pEdit, CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()), CPWL_Utils::PWLColorToFXColor(GetTextStrokeColor(), GetTransparency()), - rcClip, CPDF_Point(0.0f, 0.0f), pRange, pSysHandler, NULL); + rcClip, CFX_FloatPoint(0.0f, 0.0f), pRange, pSysHandler, NULL); } void CPWL_Label::SetHorzScale(int32_t nHorzScale) { @@ -111,18 +111,18 @@ void CPWL_Label::SetCharSpace(FX_FLOAT fCharSpace) { m_pEdit->SetCharSpace(fCharSpace); } -CPDF_Rect CPWL_Label::GetContentRect() const { +CFX_FloatRect CPWL_Label::GetContentRect() const { return m_pEdit->GetContentRect(); } void CPWL_Label::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CPWL_Wnd::GetThisAppearanceStream(sAppStream); - sAppStream << GetTextAppearanceStream(CPDF_Point(0.0f, 0.0f)); + sAppStream << GetTextAppearanceStream(CFX_FloatPoint(0.0f, 0.0f)); } CFX_ByteString CPWL_Label::GetTextAppearanceStream( - const CPDF_Point& ptOffset) const { + const CFX_FloatPoint& ptOffset) const { CFX_ByteTextBuf sRet; CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(m_pEdit, ptOffset); diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp index e3e83f9c7a..c8e738a7ca 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp @@ -60,7 +60,7 @@ void CPWL_List_Notify::IOnSetScrollPosY(FX_FLOAT fy) { m_pList->OnNotify(m_pList, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&fy); } -void CPWL_List_Notify::IOnInvalidateRect(CPDF_Rect* pRect) { +void CPWL_List_Notify::IOnInvalidateRect(CFX_FloatRect* pRect) { m_pList->InvalidateRect(pRect); } @@ -109,14 +109,14 @@ void CPWL_ListBox::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CFX_ByteTextBuf sListItems; if (m_pList) { - CPDF_Rect rcPlate = m_pList->GetPlateRect(); + CFX_FloatRect rcPlate = m_pList->GetPlateRect(); for (int32_t i = 0, sz = m_pList->GetCount(); i < sz; i++) { - CPDF_Rect rcItem = m_pList->GetItemRect(i); + CFX_FloatRect rcItem = m_pList->GetItemRect(i); if (rcItem.bottom > rcPlate.top || rcItem.top < rcPlate.bottom) continue; - CPDF_Point ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f); + CFX_FloatPoint ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f); if (m_pList->IsItemSelected(i)) { sListItems << CPWL_Utils::GetRectFillAppStream( rcItem, PWL_DEFAULT_SELBACKCOLOR); @@ -140,7 +140,7 @@ void CPWL_ListBox::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { if (sListItems.GetLength() > 0) { CFX_ByteTextBuf sClip; - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); sClip << "q\n"; sClip << rcClient.left << " " << rcClient.bottom << " " @@ -158,18 +158,18 @@ void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice, CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device); if (m_pList) { - CPDF_Rect rcPlate = m_pList->GetPlateRect(); - CPDF_Rect rcList = GetListRect(); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcPlate = m_pList->GetPlateRect(); + CFX_FloatRect rcList = GetListRect(); + CFX_FloatRect rcClient = GetClientRect(); for (int32_t i = 0, sz = m_pList->GetCount(); i < sz; i++) { - CPDF_Rect rcItem = m_pList->GetItemRect(i); + CFX_FloatRect rcItem = m_pList->GetItemRect(i); if (rcItem.bottom > rcPlate.top || rcItem.top < rcPlate.bottom) continue; - CPDF_Point ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f); + CFX_FloatPoint ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f); if (IFX_Edit* pEdit = m_pList->GetItemEdit(i)) { - CPDF_Rect rcContent = pEdit->GetContentRect(); + CFX_FloatRect rcContent = pEdit->GetContentRect(); if (rcContent.Width() > rcClient.Width()) rcItem.Intersect(rcList); else @@ -265,7 +265,8 @@ FX_BOOL CPWL_ListBox::OnChar(FX_WORD nChar, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_ListBox::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_ListBox::OnLButtonDown(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point, nFlag); if (ClientHitTest(point)) { @@ -280,7 +281,7 @@ FX_BOOL CPWL_ListBox::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_ListBox::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_ListBox::OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point, nFlag); if (m_bMouseDown) { @@ -298,7 +299,7 @@ void CPWL_ListBox::SetHoverSel(FX_BOOL bHoverSel) { m_bHoverSel = bHoverSel; } -FX_BOOL CPWL_ListBox::OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) { CPWL_Wnd::OnMouseMove(point, nFlag); if (m_bHoverSel && !IsCaptureMouse() && ClientHitTest(point)) { @@ -346,7 +347,7 @@ void CPWL_ListBox::OnNotify(CPWL_Wnd* pWnd, switch (wParam) { case SBT_VSCROLL: if (m_pList) - m_pList->SetScrollPos(CPDF_Point(0, fPos)); + m_pList->SetScrollPos(CFX_FloatPoint(0, fPos)); break; } break; @@ -380,9 +381,9 @@ void CPWL_ListBox::OnNotifySelChanged(FX_BOOL bKeyDown, nFlag); } -CPDF_Rect CPWL_ListBox::GetFocusRect() const { +CFX_FloatRect CPWL_ListBox::GetFocusRect() const { if (m_pList && m_pList->IsMultipleSel()) { - CPDF_Rect rcCaret = m_pList->GetItemRect(m_pList->GetCaret()); + CFX_FloatRect rcCaret = m_pList->GetItemRect(m_pList->GetCaret()); rcCaret.Intersect(GetClientRect()); return rcCaret; } @@ -495,11 +496,11 @@ int32_t CPWL_ListBox::FindNext(int32_t nIndex, FX_WCHAR nChar) const { return nIndex; } -CPDF_Rect CPWL_ListBox::GetContentRect() const { +CFX_FloatRect CPWL_ListBox::GetContentRect() const { if (m_pList) return m_pList->GetContentRect(); - return CPDF_Rect(); + return CFX_FloatRect(); } FX_FLOAT CPWL_ListBox::GetFirstHeight() const { @@ -509,13 +510,13 @@ FX_FLOAT CPWL_ListBox::GetFirstHeight() const { return 0.0f; } -CPDF_Rect CPWL_ListBox::GetListRect() const { +CFX_FloatRect CPWL_ListBox::GetListRect() const { return CPWL_Utils::DeflateRect( GetWindowRect(), (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth())); } FX_BOOL CPWL_ListBox::OnMouseWheel(short zDelta, - const CPDF_Point& point, + const CFX_FloatPoint& point, FX_DWORD nFlag) { if (!m_pList) return FALSE; diff --git a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp index 6d9627b08a..1c32ceb251 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp @@ -16,7 +16,7 @@ CPWL_ListCtrl::CPWL_ListCtrl() CPWL_ListCtrl::~CPWL_ListCtrl() {} -void CPWL_ListCtrl::SetScrollPos(const CPDF_Point& point) { +void CPWL_ListCtrl::SetScrollPos(const CFX_FloatPoint& point) { m_ptScroll = point; if (m_ptScroll.x < m_rcContent.left) @@ -32,11 +32,11 @@ void CPWL_ListCtrl::SetScrollPos(const CPDF_Point& point) { m_ptScroll.y = m_rcContent.bottom; } -CPDF_Point CPWL_ListCtrl::GetScrollPos() const { +CFX_FloatPoint CPWL_ListCtrl::GetScrollPos() const { return m_ptScroll; } -CPDF_Rect CPWL_ListCtrl::GetScrollArea() const { +CFX_FloatRect CPWL_ListCtrl::GetScrollArea() const { return m_rcContent; } @@ -77,7 +77,7 @@ FX_FLOAT CPWL_ListCtrl::GetContentsHeight(FX_FLOAT fLimitWidth) { } void CPWL_ListCtrl::ResetAll(FX_BOOL bMove, int32_t nStart) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); FX_FLOAT fWidth = rcClient.Width(); @@ -98,8 +98,9 @@ void CPWL_ListCtrl::ResetAll(FX_BOOL bMove, int32_t nStart) { if (bMove) { FX_FLOAT fItemHeight = pChild->GetItemHeight(fWidth - fLeft - fRight); - pChild->Move(CPDF_Rect(fLeft, fy - fItemHeight, fWidth - fRight, fy), - TRUE, FALSE); + pChild->Move( + CFX_FloatRect(fLeft, fy - fItemHeight, fWidth - fRight, fy), TRUE, + FALSE); fy -= fItemHeight; fy -= m_fItemSpace; } @@ -137,8 +138,8 @@ void CPWL_ListCtrl::RePosChildWnd() { void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { pDevice->SaveState(); - CPDF_Rect rcClient = GetClientRect(); - CPDF_Rect rcTemp = rcClient; + CFX_FloatRect rcClient = GetClientRect(); + CFX_FloatRect rcTemp = rcClient; pUser2Device->TransformRect(rcTemp); FX_RECT rcClip((int32_t)rcTemp.left, (int32_t)rcTemp.bottom, (int32_t)rcTemp.right, (int32_t)rcTemp.top); @@ -147,7 +148,7 @@ void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice, for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) { if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) { - CPDF_Rect rcChild = pChild->ChildToParent(pChild->GetWindowRect()); + CFX_FloatRect rcChild = pChild->ChildToParent(pChild->GetWindowRect()); if (!(rcChild.top < rcClient.bottom || rcChild.bottom > rcClient.top)) { CFX_Matrix mt = pChild->GetChildMatrix(); if (mt.IsIdentity()) { @@ -172,34 +173,34 @@ int32_t CPWL_ListCtrl::GetItemIndex(CPWL_Wnd* pItem) { return -1; } -CPDF_Point CPWL_ListCtrl::InToOut(const CPDF_Point& point) const { - CPDF_Rect rcClient = GetClientRect(); +CFX_FloatPoint CPWL_ListCtrl::InToOut(const CFX_FloatPoint& point) const { + CFX_FloatRect rcClient = GetClientRect(); - return CPDF_Point(point.x + rcClient.left - m_ptScroll.x, - point.y + rcClient.top - m_ptScroll.y); + return CFX_FloatPoint(point.x + rcClient.left - m_ptScroll.x, + point.y + rcClient.top - m_ptScroll.y); } -CPDF_Point CPWL_ListCtrl::OutToIn(const CPDF_Point& point) const { - CPDF_Rect rcClient = GetClientRect(); +CFX_FloatPoint CPWL_ListCtrl::OutToIn(const CFX_FloatPoint& point) const { + CFX_FloatRect rcClient = GetClientRect(); - return CPDF_Point(point.x - rcClient.left + m_ptScroll.x, - point.y - rcClient.top + m_ptScroll.y); + return CFX_FloatPoint(point.x - rcClient.left + m_ptScroll.x, + point.y - rcClient.top + m_ptScroll.y); } -CPDF_Rect CPWL_ListCtrl::InToOut(const CPDF_Rect& rect) const { - CPDF_Rect rcClient = GetClientRect(); +CFX_FloatRect CPWL_ListCtrl::InToOut(const CFX_FloatRect& rect) const { + CFX_FloatRect rcClient = GetClientRect(); - return CPDF_Rect(rect.left + rcClient.left - m_ptScroll.x, - rect.bottom + rcClient.top - m_ptScroll.y, - rect.right + rcClient.left - m_ptScroll.x, - rect.top + rcClient.top - m_ptScroll.y); + return CFX_FloatRect(rect.left + rcClient.left - m_ptScroll.x, + rect.bottom + rcClient.top - m_ptScroll.y, + rect.right + rcClient.left - m_ptScroll.x, + rect.top + rcClient.top - m_ptScroll.y); } -CPDF_Rect CPWL_ListCtrl::OutToIn(const CPDF_Rect& rect) const { - CPDF_Rect rcClient = GetClientRect(); +CFX_FloatRect CPWL_ListCtrl::OutToIn(const CFX_FloatRect& rect) const { + CFX_FloatRect rcClient = GetClientRect(); - return CPDF_Rect(rect.left - rcClient.left + m_ptScroll.x, - rect.bottom - rcClient.top + m_ptScroll.y, - rect.right - rcClient.left + m_ptScroll.x, - rect.top - rcClient.top + m_ptScroll.y); + return CFX_FloatRect(rect.left - rcClient.left + m_ptScroll.x, + rect.bottom - rcClient.top + m_ptScroll.y, + rect.right - rcClient.left + m_ptScroll.x, + rect.top - rcClient.top + m_ptScroll.y); } diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp index 760967b6a2..1933d564f4 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp @@ -42,14 +42,14 @@ void CPWL_Note_Options::SetTextColor(const CPWL_Color& color) { void CPWL_Note_Options::RePosChildWnd() { if (IsValid()) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); if (rcClient.Width() > 15.0f) { rcClient.right -= 15.0f; m_pText->Move(rcClient, TRUE, FALSE); m_pText->SetVisible(TRUE); } else { - m_pText->Move(CPDF_Rect(0, 0, 0, 0), TRUE, FALSE); + m_pText->Move(CFX_FloatRect(0, 0, 0, 0), TRUE, FALSE); m_pText->SetVisible(FALSE); } } @@ -71,15 +71,16 @@ void CPWL_Note_Options::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); rcClient.left = rcClient.right - 15.0f; - CPDF_Point ptCenter = CPDF_Point((rcClient.left + rcClient.right) * 0.5f, - (rcClient.top + rcClient.bottom) * 0.5f); + CFX_FloatPoint ptCenter = + CFX_FloatPoint((rcClient.left + rcClient.right) * 0.5f, + (rcClient.top + rcClient.bottom) * 0.5f); - CPDF_Point pt1(ptCenter.x - 2.0f, ptCenter.y + 2.0f * 0.5f); - CPDF_Point pt2(ptCenter.x + 2.0f, ptCenter.y + 2.0f * 0.5f); - CPDF_Point pt3(ptCenter.x, ptCenter.y - 3.0f * 0.5f); + CFX_FloatPoint pt1(ptCenter.x - 2.0f, ptCenter.y + 2.0f * 0.5f); + CFX_FloatPoint pt2(ptCenter.x + 2.0f, ptCenter.y + 2.0f * 0.5f); + CFX_FloatPoint pt3(ptCenter.x, ptCenter.y - 3.0f * 0.5f); CFX_PathData path; @@ -95,8 +96,8 @@ void CPWL_Note_Options::DrawThisAppearance(CFX_RenderDevice* pDevice, FXFILL_ALTERNATE); } -CPDF_Rect CPWL_Note_Options::GetContentRect() const { - CPDF_Rect rcText = m_pText->GetContentRect(); +CFX_FloatRect CPWL_Note_Options::GetContentRect() const { + CFX_FloatRect rcText = m_pText->GetContentRect(); rcText.right += 15.0f; return rcText; } @@ -205,7 +206,7 @@ FX_FLOAT CPWL_Note_Edit::GetItemHeight(FX_FLOAT fLimitWidth) { EnableRefresh(FALSE); m_pEdit->EnableNotify(FALSE); - Move(CPDF_Rect(0, 0, fLimitWidth, 0), TRUE, FALSE); + Move(CFX_FloatRect(0, 0, fLimitWidth, 0), TRUE, FALSE); FX_FLOAT fRet = GetContentRect().Height(); m_pEdit->EnableNotify(TRUE); @@ -232,7 +233,7 @@ CPWL_Note_LBBox::~CPWL_Note_LBBox() {} void CPWL_Note_LBBox::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); CFX_GraphStateData gsd; gsd.m_LineWidth = 1.0f; @@ -259,7 +260,7 @@ CPWL_Note_RBBox::~CPWL_Note_RBBox() {} void CPWL_Note_RBBox::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); CFX_GraphStateData gsd; gsd.m_LineWidth = 1.0f; @@ -303,7 +304,7 @@ void CPWL_Note_CloseBox::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { CPWL_Button::DrawThisAppearance(pDevice, pUser2Device); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); rcClient = CPWL_Utils::DeflateRect(rcClient, 2.0f); CFX_GraphStateData gsd; @@ -330,7 +331,7 @@ void CPWL_Note_CloseBox::DrawThisAppearance(CFX_RenderDevice* pDevice, FXFILL_ALTERNATE); } -FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CPDF_Point& point, +FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) { SetBorderStyle(PBS_INSET); InvalidateRect(NULL); @@ -340,7 +341,7 @@ FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CPDF_Point& point, return CPWL_Button::OnLButtonDown(point, nFlag); } -FX_BOOL CPWL_Note_CloseBox::OnLButtonUp(const CPDF_Point& point, +FX_BOOL CPWL_Note_CloseBox::OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) { m_bMouseDown = FALSE; @@ -448,8 +449,8 @@ void CPWL_Note_Contents::DeleteSubItem(IPWL_NoteItem* pNoteItem) { } } -IPWL_NoteItem* CPWL_Note_Contents::GetHitNoteItem(const CPDF_Point& point) { - CPDF_Point pt = ParentToChild(point); +IPWL_NoteItem* CPWL_Note_Contents::GetHitNoteItem(const CFX_FloatPoint& point) { + CFX_FloatPoint pt = ParentToChild(point); for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) { if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) { @@ -488,7 +489,7 @@ void CPWL_Note_Contents::OnNotify(CPWL_Wnd* pWnd, } return; case PNM_SCROLLWINDOW: - SetScrollPos(CPDF_Point(0.0f, *(FX_FLOAT*)lParam)); + SetScrollPos(CFX_FloatPoint(0.0f, *(FX_FLOAT*)lParam)); ResetFace(); InvalidateRect(NULL); return; @@ -524,7 +525,7 @@ void CPWL_Note_Contents::OnNotify(CPWL_Wnd* pWnd, CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam); } -FX_BOOL CPWL_Note_Contents::OnLButtonDown(const CPDF_Point& point, +FX_BOOL CPWL_Note_Contents::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) { if (CPWL_Wnd::OnLButtonDown(point, nFlag)) return TRUE; @@ -631,9 +632,9 @@ void CPWL_NoteItem::CreateChildWnd(const PWL_CREATEPARAM& cp) { void CPWL_NoteItem::RePosChildWnd() { if (IsValid()) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); - CPDF_Rect rcSubject = rcClient; + CFX_FloatRect rcSubject = rcClient; rcSubject.left += POPUP_ITEM_TEXT_INDENT; rcSubject.top = rcClient.top; rcSubject.right = @@ -644,7 +645,7 @@ void CPWL_NoteItem::RePosChildWnd() { m_pSubject->Move(rcSubject, TRUE, FALSE); m_pSubject->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcSubject)); - CPDF_Rect rcDate = rcClient; + CFX_FloatRect rcDate = rcClient; rcDate.right -= POPUP_ITEM_TEXT_INDENT; rcDate.left = PWL_MAX(rcDate.right - m_pDateTime->GetContentRect().Width() - 1.0f, @@ -654,7 +655,7 @@ void CPWL_NoteItem::RePosChildWnd() { m_pDateTime->Move(rcDate, TRUE, FALSE); m_pDateTime->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcDate)); - CPDF_Rect rcContents = rcClient; + CFX_FloatRect rcContents = rcClient; rcContents.left += 1.0f; rcContents.right -= 1.0f; rcContents.top = rcDate.bottom - POPUP_ITEM_HEAD_BOTTOM; @@ -850,8 +851,8 @@ void CPWL_NoteItem::DeleteSubItem(IPWL_NoteItem* pNoteItem) { m_pContents->DeleteSubItem(pNoteItem); } -IPWL_NoteItem* CPWL_NoteItem::GetHitNoteItem(const CPDF_Point& point) { - CPDF_Point pt = ParentToChild(point); +IPWL_NoteItem* CPWL_NoteItem::GetHitNoteItem(const CFX_FloatPoint& point) { + CFX_FloatPoint pt = ParentToChild(point); if (WndHitTest(pt)) { if (m_pContents) { @@ -909,7 +910,8 @@ FX_FLOAT CPWL_NoteItem::GetItemRightMargin() { return POPUP_ITEM_SIDEMARGIN; } -FX_BOOL CPWL_NoteItem::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_NoteItem::OnLButtonDown(const CFX_FloatPoint& point, + FX_DWORD nFlag) { if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point))) { SetNoteFocus(FALSE); } @@ -919,7 +921,8 @@ FX_BOOL CPWL_NoteItem::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_NoteItem::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_NoteItem::OnRButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point))) { SetNoteFocus(FALSE); PopupNoteItemMenu(point); @@ -964,7 +967,7 @@ void CPWL_NoteItem::OnNotify(CPWL_Wnd* pWnd, CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam); } -void CPWL_NoteItem::PopupNoteItemMenu(const CPDF_Point& point) { +void CPWL_NoteItem::PopupNoteItemMenu(const CFX_FloatPoint& point) { if (IPWL_NoteNotify* pNotify = GetNoteNotify()) { int32_t x, y; PWLtoWnd(point, x, y); @@ -1077,13 +1080,13 @@ FX_BOOL CPWL_Note::ResetScrollBar() { } if (bScrollChanged) { - CPDF_Rect rcNote = GetClientRect(); - CPDF_Rect rcContents = m_pContents->GetWindowRect(); + CFX_FloatRect rcNote = GetClientRect(); + CFX_FloatRect rcContents = m_pContents->GetWindowRect(); rcContents.right = rcNote.right - 3.0f; if (m_pContentsBar->IsVisible()) rcContents.right -= PWL_SCROLLBAR_WIDTH; m_pContents->Move(rcContents, TRUE, TRUE); - m_pContents->SetScrollPos(CPDF_Point(0.0f, 0.0f)); + m_pContents->SetScrollPos(CFX_FloatPoint(0.0f, 0.0f)); m_pContents->InvalidateRect(NULL); } @@ -1091,8 +1094,8 @@ FX_BOOL CPWL_Note::ResetScrollBar() { } FX_BOOL CPWL_Note::ScrollBarShouldVisible() { - CPDF_Rect rcContentsFact = m_pContents->GetScrollArea(); - CPDF_Rect rcContentsClient = m_pContents->GetClientRect(); + CFX_FloatRect rcContentsFact = m_pContents->GetScrollArea(); + CFX_FloatRect rcContentsClient = m_pContents->GetClientRect(); return rcContentsFact.Height() > rcContentsClient.Height(); } @@ -1111,9 +1114,9 @@ void CPWL_Note::RePosNoteChildren() { m_bResizing = TRUE; if (IsValid()) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); - CPDF_Rect rcIcon = rcClient; + CFX_FloatRect rcIcon = rcClient; rcIcon.top -= 2.0f; rcIcon.right = rcIcon.left + 14.0f; rcIcon.bottom = rcIcon.top - 14.0f; @@ -1121,7 +1124,7 @@ void CPWL_Note::RePosNoteChildren() { m_pIcon->Move(rcIcon, TRUE, FALSE); m_pIcon->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcIcon)); - CPDF_Rect rcCloseBox = rcClient; + CFX_FloatRect rcCloseBox = rcClient; rcCloseBox.right -= 1.0f; rcCloseBox.top -= 1.0f; rcCloseBox.left = rcCloseBox.right - 14.0f; @@ -1130,7 +1133,7 @@ void CPWL_Note::RePosNoteChildren() { m_pCloseBox->Move(rcCloseBox, TRUE, FALSE); m_pCloseBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcCloseBox)); - CPDF_Rect rcDate = rcClient; + CFX_FloatRect rcDate = rcClient; rcDate.right = rcCloseBox.left - POPUP_ITEM_TEXT_INDENT; rcDate.left = PWL_MAX(rcDate.right - m_pDateTime->GetContentRect().Width() - 1.0f, @@ -1141,7 +1144,7 @@ void CPWL_Note::RePosNoteChildren() { m_pDateTime->Move(rcDate, TRUE, FALSE); m_pDateTime->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcDate)); - CPDF_Rect rcSubject = rcClient; + CFX_FloatRect rcSubject = rcClient; rcSubject.top = rcClient.top - 2.0f; rcSubject.left = rcIcon.right + POPUP_ITEM_TEXT_INDENT; rcSubject.right = @@ -1152,7 +1155,7 @@ void CPWL_Note::RePosNoteChildren() { m_pSubject->Move(rcSubject, TRUE, FALSE); m_pSubject->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcSubject)); - CPDF_Rect rcOptions = rcClient; + CFX_FloatRect rcOptions = rcClient; rcOptions.left = PWL_MAX(rcOptions.right - m_pOptions->GetContentRect().Width(), rcIcon.right + 1.0f); @@ -1162,7 +1165,7 @@ void CPWL_Note::RePosNoteChildren() { m_pOptions->Move(rcOptions, TRUE, FALSE); m_pOptions->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcOptions)); - CPDF_Rect rcAuthor = rcClient; + CFX_FloatRect rcAuthor = rcClient; rcAuthor.top = rcSubject.bottom - 4.0f; rcAuthor.left = rcSubject.left; rcAuthor.right = @@ -1173,21 +1176,21 @@ void CPWL_Note::RePosNoteChildren() { m_pAuthor->Move(rcAuthor, TRUE, FALSE); m_pAuthor->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcAuthor)); - CPDF_Rect rcLBBox = rcClient; + CFX_FloatRect rcLBBox = rcClient; rcLBBox.top = rcLBBox.bottom + 7.0f; rcLBBox.right = rcLBBox.left + 7.0f; rcLBBox.Normalize(); m_pLBBox->Move(rcLBBox, TRUE, FALSE); m_pLBBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcLBBox)); - CPDF_Rect rcRBBox = rcClient; + CFX_FloatRect rcRBBox = rcClient; rcRBBox.top = rcRBBox.bottom + 7.0f; rcRBBox.left = rcRBBox.right - 7.0f; rcRBBox.Normalize(); m_pRBBox->Move(rcRBBox, TRUE, FALSE); m_pRBBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcRBBox)); - CPDF_Rect rcContents = rcClient; + CFX_FloatRect rcContents = rcClient; rcContents.top = rcAuthor.bottom - POPUP_ITEM_HEAD_BOTTOM; rcContents.left += 3.0f; rcContents.right -= 3.0f; @@ -1198,7 +1201,7 @@ void CPWL_Note::RePosNoteChildren() { m_pContents->Move(rcContents, FALSE, FALSE); m_pContents->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcContents)); - CPDF_Rect rcContentsBar = rcContents; + CFX_FloatRect rcContentsBar = rcContents; rcContentsBar.right = rcClient.right - 3.0f; rcContentsBar.left = rcContentsBar.right - PWL_SCROLLBAR_WIDTH; rcContentsBar.Normalize(); @@ -1297,14 +1300,14 @@ CFX_WideString CPWL_Note::GetAuthorName() const { } FX_BOOL CPWL_Note::OnMouseWheel(short zDelta, - const CPDF_Point& point, + const CFX_FloatPoint& point, FX_DWORD nFlag) { - CPDF_Point ptScroll = m_pContents->GetScrollPos(); - CPDF_Rect rcScroll = m_pContents->GetScrollArea(); - CPDF_Rect rcContents = m_pContents->GetClientRect(); + CFX_FloatPoint ptScroll = m_pContents->GetScrollPos(); + CFX_FloatRect rcScroll = m_pContents->GetScrollArea(); + CFX_FloatRect rcContents = m_pContents->GetClientRect(); if (rcScroll.top - rcScroll.bottom > rcContents.Height()) { - CPDF_Point ptNew = ptScroll; + CFX_FloatPoint ptNew = ptScroll; if (zDelta > 0) ptNew.y += 30; @@ -1338,7 +1341,7 @@ void CPWL_Note::OnNotify(CPWL_Wnd* pWnd, intptr_t lParam) { switch (msg) { case PNM_NOTEEDITCHANGED: { - CPDF_Rect rcScroll = m_pContents->GetScrollArea(); + CFX_FloatRect rcScroll = m_pContents->GetScrollArea(); PWL_SCROLL_INFO sInfo; sInfo.fContentMin = rcScroll.bottom; @@ -1366,8 +1369,8 @@ void CPWL_Note::OnNotify(CPWL_Wnd* pWnd, (intptr_t)&sInfo); m_OldScrollInfo = sInfo; - CPDF_Point ptScroll = m_pContents->GetScrollPos(); - CPDF_Point ptOld = ptScroll; + CFX_FloatPoint ptScroll = m_pContents->GetScrollPos(); + CFX_FloatPoint ptOld = ptScroll; if (ptScroll.y > sInfo.fContentMax) ptScroll.y = sInfo.fContentMax; @@ -1404,13 +1407,13 @@ void CPWL_Note::OnNotify(CPWL_Wnd* pWnd, if (msg == PNM_SETCARETINFO && IsValid()) { if (PWL_CARET_INFO* pInfo = (PWL_CARET_INFO*)wParam) { if (m_pContents) { - CPDF_Rect rcClient = m_pContents->GetClientRect(); + CFX_FloatRect rcClient = m_pContents->GetClientRect(); if (pInfo->ptHead.y > rcClient.top) { - CPDF_Point pt = m_pContents->OutToIn(pInfo->ptHead); + CFX_FloatPoint pt = m_pContents->OutToIn(pInfo->ptHead); m_pContents->OnNotify(this, PNM_SCROLLWINDOW, SBT_VSCROLL, (intptr_t)&pt.y); - CPDF_Point ptScroll = m_pContents->GetScrollPos(); + CFX_FloatPoint ptScroll = m_pContents->GetScrollPos(); m_pContentsBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&ptScroll.y); @@ -1418,12 +1421,12 @@ void CPWL_Note::OnNotify(CPWL_Wnd* pWnd, } if (pInfo->ptFoot.y < rcClient.bottom) { - CPDF_Point pt = m_pContents->OutToIn(pInfo->ptFoot); + CFX_FloatPoint pt = m_pContents->OutToIn(pInfo->ptFoot); pt.y += rcClient.Height(); m_pContents->OnNotify(this, PNM_SCROLLWINDOW, SBT_VSCROLL, (intptr_t)&pt.y); - CPDF_Point ptScroll = m_pContents->GetScrollPos(); + CFX_FloatPoint ptScroll = m_pContents->GetScrollPos(); m_pContentsBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&ptScroll.y); @@ -1458,7 +1461,7 @@ void CPWL_Note::SetBkColor(const CPWL_Color& color) { m_pRBBox->SetTextColor(sTextColor); } -FX_BOOL CPWL_Note::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_Note::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) { if (m_pOptions->WndHitTest(m_pOptions->ParentToChild(point))) { if (IPWL_NoteNotify* pNotify = GetNoteNotify()) { int32_t x, y; @@ -1475,7 +1478,7 @@ FX_BOOL CPWL_Note::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return CPWL_Wnd::OnLButtonDown(point, nFlag); } -FX_BOOL CPWL_Note::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_Note::OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) { return CPWL_Wnd::OnRButtonUp(point, nFlag); } diff --git a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp index c48052da9a..03bf3238fa 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp @@ -132,24 +132,25 @@ void CPWL_SBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CFX_ByteTextBuf sButton; - CPDF_Rect rectWnd = GetWindowRect(); + CFX_FloatRect rectWnd = GetWindowRect(); if (rectWnd.IsEmpty()) return; sAppStream << "q\n"; - CPDF_Point ptCenter = GetCenterPoint(); + CFX_FloatPoint ptCenter = GetCenterPoint(); switch (m_eScrollBarType) { case SBT_HSCROLL: switch (m_eSBButtonType) { case PSBT_MIN: { - CPDF_Point pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, ptCenter.y); - CPDF_Point pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y + PWL_TRIANGLE_HALFLEN); - CPDF_Point pt3(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y - PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y); + CFX_FloatPoint pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y + PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt3(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y - PWL_TRIANGLE_HALFLEN); if (rectWnd.right - rectWnd.left > PWL_TRIANGLE_HALFLEN * 2 && rectWnd.top - rectWnd.bottom > PWL_TRIANGLE_HALFLEN) { @@ -163,11 +164,12 @@ void CPWL_SBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { } } break; case PSBT_MAX: { - CPDF_Point pt1(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, ptCenter.y); - CPDF_Point pt2(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y + PWL_TRIANGLE_HALFLEN); - CPDF_Point pt3(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y - PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt1(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y); + CFX_FloatPoint pt2(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y + PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt3(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y - PWL_TRIANGLE_HALFLEN); if (rectWnd.right - rectWnd.left > PWL_TRIANGLE_HALFLEN * 2 && rectWnd.top - rectWnd.bottom > PWL_TRIANGLE_HALFLEN) { @@ -187,11 +189,12 @@ void CPWL_SBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { case SBT_VSCROLL: switch (m_eSBButtonType) { case PSBT_MIN: { - CPDF_Point pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN, - ptCenter.y - PWL_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN, - ptCenter.y - PWL_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt3(ptCenter.x, ptCenter.y + PWL_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN, + ptCenter.y - PWL_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN, + ptCenter.y - PWL_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt3(ptCenter.x, + ptCenter.y + PWL_TRIANGLE_HALFLEN * 0.5f); if (rectWnd.right - rectWnd.left > PWL_TRIANGLE_HALFLEN * 2 && rectWnd.top - rectWnd.bottom > PWL_TRIANGLE_HALFLEN) { @@ -205,11 +208,12 @@ void CPWL_SBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { } } break; case PSBT_MAX: { - CPDF_Point pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN, - ptCenter.y + PWL_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN, - ptCenter.y + PWL_TRIANGLE_HALFLEN * 0.5f); - CPDF_Point pt3(ptCenter.x, ptCenter.y - PWL_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN, + ptCenter.y + PWL_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN, + ptCenter.y + PWL_TRIANGLE_HALFLEN * 0.5f); + CFX_FloatPoint pt3(ptCenter.x, + ptCenter.y - PWL_TRIANGLE_HALFLEN * 0.5f); if (rectWnd.right - rectWnd.left > PWL_TRIANGLE_HALFLEN * 2 && rectWnd.top - rectWnd.bottom > PWL_TRIANGLE_HALFLEN) { @@ -238,11 +242,11 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, if (!IsVisible()) return; - CPDF_Rect rectWnd = GetWindowRect(); + CFX_FloatRect rectWnd = GetWindowRect(); if (rectWnd.IsEmpty()) return; - CPDF_Point ptCenter = GetCenterPoint(); + CFX_FloatPoint ptCenter = GetCenterPoint(); int32_t nTransparancy = GetTransparency(); switch (m_eScrollBarType) { @@ -250,11 +254,12 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device); switch (m_eSBButtonType) { case PSBT_MIN: { - CPDF_Point pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, ptCenter.y); - CPDF_Point pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y + PWL_TRIANGLE_HALFLEN); - CPDF_Point pt3(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y - PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt1(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y); + CFX_FloatPoint pt2(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y + PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt3(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y - PWL_TRIANGLE_HALFLEN); if (rectWnd.right - rectWnd.left > PWL_TRIANGLE_HALFLEN * 2 && rectWnd.top - rectWnd.bottom > PWL_TRIANGLE_HALFLEN) { @@ -273,11 +278,12 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, } } break; case PSBT_MAX: { - CPDF_Point pt1(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, ptCenter.y); - CPDF_Point pt2(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y + PWL_TRIANGLE_HALFLEN); - CPDF_Point pt3(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, - ptCenter.y - PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt1(ptCenter.x + PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y); + CFX_FloatPoint pt2(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y + PWL_TRIANGLE_HALFLEN); + CFX_FloatPoint pt3(ptCenter.x - PWL_TRIANGLE_HALFLEN * 0.5f, + ptCenter.y - PWL_TRIANGLE_HALFLEN); if (rectWnd.right - rectWnd.left > PWL_TRIANGLE_HALFLEN * 2 && rectWnd.top - rectWnd.bottom > PWL_TRIANGLE_HALFLEN) { @@ -303,7 +309,7 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, switch (m_eSBButtonType) { case PSBT_MIN: { // draw border - CPDF_Rect rcDraw = rectWnd; + CFX_FloatRect rcDraw = rectWnd; CPWL_Utils::DrawStrokeRect(pDevice, pUser2Device, rcDraw, ArgbEncode(nTransparancy, 100, 100, 100), 0.0f); @@ -330,13 +336,13 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, if (rectWnd.top - rectWnd.bottom > 6.0f) { FX_FLOAT fX = rectWnd.left + 1.5f; FX_FLOAT fY = rectWnd.bottom; - CPDF_Point pts[7] = {CPDF_Point(fX + 2.5f, fY + 4.0f), - CPDF_Point(fX + 2.5f, fY + 3.0f), - CPDF_Point(fX + 4.5f, fY + 5.0f), - CPDF_Point(fX + 6.5f, fY + 3.0f), - CPDF_Point(fX + 6.5f, fY + 4.0f), - CPDF_Point(fX + 4.5f, fY + 6.0f), - CPDF_Point(fX + 2.5f, fY + 4.0f)}; + CFX_FloatPoint pts[7] = {CFX_FloatPoint(fX + 2.5f, fY + 4.0f), + CFX_FloatPoint(fX + 2.5f, fY + 3.0f), + CFX_FloatPoint(fX + 4.5f, fY + 5.0f), + CFX_FloatPoint(fX + 6.5f, fY + 3.0f), + CFX_FloatPoint(fX + 6.5f, fY + 4.0f), + CFX_FloatPoint(fX + 4.5f, fY + 6.0f), + CFX_FloatPoint(fX + 2.5f, fY + 4.0f)}; if (IsEnabled()) CPWL_Utils::DrawFillArea( @@ -350,7 +356,7 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, } break; case PSBT_MAX: { // draw border - CPDF_Rect rcDraw = rectWnd; + CFX_FloatRect rcDraw = rectWnd; CPWL_Utils::DrawStrokeRect(pDevice, pUser2Device, rcDraw, ArgbEncode(nTransparancy, 100, 100, 100), 0.0f); @@ -376,13 +382,13 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, FX_FLOAT fX = rectWnd.left + 1.5f; FX_FLOAT fY = rectWnd.bottom; - CPDF_Point pts[7] = {CPDF_Point(fX + 2.5f, fY + 5.0f), - CPDF_Point(fX + 2.5f, fY + 6.0f), - CPDF_Point(fX + 4.5f, fY + 4.0f), - CPDF_Point(fX + 6.5f, fY + 6.0f), - CPDF_Point(fX + 6.5f, fY + 5.0f), - CPDF_Point(fX + 4.5f, fY + 3.0f), - CPDF_Point(fX + 2.5f, fY + 5.0f)}; + CFX_FloatPoint pts[7] = {CFX_FloatPoint(fX + 2.5f, fY + 5.0f), + CFX_FloatPoint(fX + 2.5f, fY + 6.0f), + CFX_FloatPoint(fX + 4.5f, fY + 4.0f), + CFX_FloatPoint(fX + 6.5f, fY + 6.0f), + CFX_FloatPoint(fX + 6.5f, fY + 5.0f), + CFX_FloatPoint(fX + 4.5f, fY + 3.0f), + CFX_FloatPoint(fX + 2.5f, fY + 5.0f)}; if (IsEnabled()) CPWL_Utils::DrawFillArea( @@ -396,7 +402,7 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, } break; case PSBT_POS: { // draw border - CPDF_Rect rcDraw = rectWnd; + CFX_FloatRect rcDraw = rectWnd; CPWL_Utils::DrawStrokeRect(pDevice, pUser2Device, rcDraw, ArgbEncode(nTransparancy, 100, 100, 100), 0.0f); @@ -410,9 +416,10 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, if (IsEnabled()) { // draw shadow effect - CPDF_Point ptTop = CPDF_Point(rectWnd.left, rectWnd.top - 1.0f); - CPDF_Point ptBottom = - CPDF_Point(rectWnd.left, rectWnd.bottom + 1.0f); + CFX_FloatPoint ptTop = + CFX_FloatPoint(rectWnd.left, rectWnd.top - 1.0f); + CFX_FloatPoint ptBottom = + CFX_FloatPoint(rectWnd.left, rectWnd.bottom + 1.0f); ptTop.x += 1.5f; ptBottom.x += 1.5f; @@ -499,12 +506,12 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, FX_FLOAT nFrictionWidth = 5.0f; FX_FLOAT nFrictionHeight = 5.5f; - CPDF_Point ptLeft = - CPDF_Point(ptCenter.x - nFrictionWidth / 2.0f, - ptCenter.y - nFrictionHeight / 2.0f + 0.5f); - CPDF_Point ptRight = - CPDF_Point(ptCenter.x + nFrictionWidth / 2.0f, - ptCenter.y - nFrictionHeight / 2.0f + 0.5f); + CFX_FloatPoint ptLeft = + CFX_FloatPoint(ptCenter.x - nFrictionWidth / 2.0f, + ptCenter.y - nFrictionHeight / 2.0f + 0.5f); + CFX_FloatPoint ptRight = + CFX_FloatPoint(ptCenter.x + nFrictionWidth / 2.0f, + ptCenter.y - nFrictionHeight / 2.0f + 0.5f); CPWL_Utils::DrawStrokeLine(pDevice, pUser2Device, ptLeft, ptRight, crStroke, 1.0f); @@ -531,7 +538,8 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, } } -FX_BOOL CPWL_SBButton::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_SBButton::OnLButtonDown(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point, nFlag); if (CPWL_Wnd* pParent = GetParentWindow()) @@ -543,7 +551,8 @@ FX_BOOL CPWL_SBButton::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_SBButton::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_SBButton::OnLButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point, nFlag); if (CPWL_Wnd* pParent = GetParentWindow()) @@ -555,7 +564,8 @@ FX_BOOL CPWL_SBButton::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_SBButton::OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_SBButton::OnMouseMove(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnMouseMove(point, nFlag); if (CPWL_Wnd* pParent = GetParentWindow()) { @@ -585,8 +595,8 @@ void CPWL_ScrollBar::OnCreate(PWL_CREATEPARAM& cp) { } void CPWL_ScrollBar::RePosChildWnd() { - CPDF_Rect rcClient = GetClientRect(); - CPDF_Rect rcMinButton, rcMaxButton; + CFX_FloatRect rcClient = GetClientRect(); + CFX_FloatRect rcMinButton, rcMaxButton; FX_FLOAT fBWidth = 0; switch (m_sbType) { @@ -594,21 +604,22 @@ void CPWL_ScrollBar::RePosChildWnd() { if (rcClient.right - rcClient.left > PWL_SCROLLBAR_BUTTON_WIDTH * 2 + PWL_SCROLLBAR_POSBUTTON_MINWIDTH + 2) { - rcMinButton = - CPDF_Rect(rcClient.left, rcClient.bottom, - rcClient.left + PWL_SCROLLBAR_BUTTON_WIDTH, rcClient.top); - rcMaxButton = CPDF_Rect(rcClient.right - PWL_SCROLLBAR_BUTTON_WIDTH, - rcClient.bottom, rcClient.right, rcClient.top); + rcMinButton = CFX_FloatRect(rcClient.left, rcClient.bottom, + rcClient.left + PWL_SCROLLBAR_BUTTON_WIDTH, + rcClient.top); + rcMaxButton = + CFX_FloatRect(rcClient.right - PWL_SCROLLBAR_BUTTON_WIDTH, + rcClient.bottom, rcClient.right, rcClient.top); } else { fBWidth = (rcClient.right - rcClient.left - PWL_SCROLLBAR_POSBUTTON_MINWIDTH - 2) / 2; if (fBWidth > 0) { - rcMinButton = CPDF_Rect(rcClient.left, rcClient.bottom, - rcClient.left + fBWidth, rcClient.top); - rcMaxButton = CPDF_Rect(rcClient.right - fBWidth, rcClient.bottom, - rcClient.right, rcClient.top); + rcMinButton = CFX_FloatRect(rcClient.left, rcClient.bottom, + rcClient.left + fBWidth, rcClient.top); + rcMaxButton = CFX_FloatRect(rcClient.right - fBWidth, rcClient.bottom, + rcClient.right, rcClient.top); } else { SetVisible(FALSE); } @@ -618,21 +629,23 @@ void CPWL_ScrollBar::RePosChildWnd() { if (IsFloatBigger(rcClient.top - rcClient.bottom, PWL_SCROLLBAR_BUTTON_WIDTH * 2 + PWL_SCROLLBAR_POSBUTTON_MINWIDTH + 2)) { - rcMinButton = - CPDF_Rect(rcClient.left, rcClient.top - PWL_SCROLLBAR_BUTTON_WIDTH, - rcClient.right, rcClient.top); - rcMaxButton = CPDF_Rect(rcClient.left, rcClient.bottom, rcClient.right, - rcClient.bottom + PWL_SCROLLBAR_BUTTON_WIDTH); + rcMinButton = CFX_FloatRect(rcClient.left, + rcClient.top - PWL_SCROLLBAR_BUTTON_WIDTH, + rcClient.right, rcClient.top); + rcMaxButton = + CFX_FloatRect(rcClient.left, rcClient.bottom, rcClient.right, + rcClient.bottom + PWL_SCROLLBAR_BUTTON_WIDTH); } else { fBWidth = (rcClient.top - rcClient.bottom - PWL_SCROLLBAR_POSBUTTON_MINWIDTH - 2) / 2; if (IsFloatBigger(fBWidth, 0)) { - rcMinButton = CPDF_Rect(rcClient.left, rcClient.top - fBWidth, - rcClient.right, rcClient.top); - rcMaxButton = CPDF_Rect(rcClient.left, rcClient.bottom, - rcClient.right, rcClient.bottom + fBWidth); + rcMinButton = CFX_FloatRect(rcClient.left, rcClient.top - fBWidth, + rcClient.right, rcClient.top); + rcMaxButton = + CFX_FloatRect(rcClient.left, rcClient.bottom, rcClient.right, + rcClient.bottom + fBWidth); } else { SetVisible(FALSE); } @@ -648,7 +661,7 @@ void CPWL_ScrollBar::RePosChildWnd() { } void CPWL_ScrollBar::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { - CPDF_Rect rectWnd = GetWindowRect(); + CFX_FloatRect rectWnd = GetWindowRect(); if (IsVisible() && !rectWnd.IsEmpty()) { CFX_ByteTextBuf sButton; @@ -666,7 +679,7 @@ void CPWL_ScrollBar::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { void CPWL_ScrollBar::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { - CPDF_Rect rectWnd = GetWindowRect(); + CFX_FloatRect rectWnd = GetWindowRect(); if (IsVisible() && !rectWnd.IsEmpty()) { CPWL_Utils::DrawFillRect(pDevice, pUser2Device, rectWnd, @@ -674,19 +687,20 @@ void CPWL_ScrollBar::DrawThisAppearance(CFX_RenderDevice* pDevice, CPWL_Utils::DrawStrokeLine( pDevice, pUser2Device, - CPDF_Point(rectWnd.left + 2.0f, rectWnd.top - 2.0f), - CPDF_Point(rectWnd.left + 2.0f, rectWnd.bottom + 2.0f), + CFX_FloatPoint(rectWnd.left + 2.0f, rectWnd.top - 2.0f), + CFX_FloatPoint(rectWnd.left + 2.0f, rectWnd.bottom + 2.0f), ArgbEncode(GetTransparency(), 100, 100, 100), 1.0f); CPWL_Utils::DrawStrokeLine( pDevice, pUser2Device, - CPDF_Point(rectWnd.right - 2.0f, rectWnd.top - 2.0f), - CPDF_Point(rectWnd.right - 2.0f, rectWnd.bottom + 2.0f), + CFX_FloatPoint(rectWnd.right - 2.0f, rectWnd.top - 2.0f), + CFX_FloatPoint(rectWnd.right - 2.0f, rectWnd.bottom + 2.0f), ArgbEncode(GetTransparency(), 100, 100, 100), 1.0f); } } -FX_BOOL CPWL_ScrollBar::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_ScrollBar::OnLButtonDown(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonDown(point, nFlag); if (HasFlag(PWS_AUTOTRANSPARENT)) { @@ -696,27 +710,29 @@ FX_BOOL CPWL_ScrollBar::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { } } - CPDF_Rect rcMinArea, rcMaxArea; + CFX_FloatRect rcMinArea, rcMaxArea; if (m_pPosButton && m_pPosButton->IsVisible()) { - CPDF_Rect rcClient = GetClientRect(); - CPDF_Rect rcPosButton = m_pPosButton->GetWindowRect(); + CFX_FloatRect rcClient = GetClientRect(); + CFX_FloatRect rcPosButton = m_pPosButton->GetWindowRect(); switch (m_sbType) { case SBT_HSCROLL: - rcMinArea = CPDF_Rect(rcClient.left + PWL_SCROLLBAR_BUTTON_WIDTH, - rcClient.bottom, rcPosButton.left, rcClient.top); - rcMaxArea = CPDF_Rect(rcPosButton.right, rcClient.bottom, - rcClient.right - PWL_SCROLLBAR_BUTTON_WIDTH, - rcClient.top); + rcMinArea = + CFX_FloatRect(rcClient.left + PWL_SCROLLBAR_BUTTON_WIDTH, + rcClient.bottom, rcPosButton.left, rcClient.top); + rcMaxArea = CFX_FloatRect(rcPosButton.right, rcClient.bottom, + rcClient.right - PWL_SCROLLBAR_BUTTON_WIDTH, + rcClient.top); break; case SBT_VSCROLL: - rcMinArea = CPDF_Rect(rcClient.left, rcPosButton.top, rcClient.right, - rcClient.top - PWL_SCROLLBAR_BUTTON_WIDTH); - rcMaxArea = CPDF_Rect(rcClient.left, - rcClient.bottom + PWL_SCROLLBAR_BUTTON_WIDTH, - rcClient.right, rcPosButton.bottom); + rcMinArea = + CFX_FloatRect(rcClient.left, rcPosButton.top, rcClient.right, + rcClient.top - PWL_SCROLLBAR_BUTTON_WIDTH); + rcMaxArea = CFX_FloatRect(rcClient.left, + rcClient.bottom + PWL_SCROLLBAR_BUTTON_WIDTH, + rcClient.right, rcPosButton.bottom); break; } @@ -739,7 +755,8 @@ FX_BOOL CPWL_ScrollBar::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) { return TRUE; } -FX_BOOL CPWL_ScrollBar::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_ScrollBar::OnLButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { CPWL_Wnd::OnLButtonUp(point, nFlag); if (HasFlag(PWS_AUTOTRANSPARENT)) { @@ -764,41 +781,41 @@ void CPWL_ScrollBar::OnNotify(CPWL_Wnd* pWnd, switch (msg) { case PNM_LBUTTONDOWN: if (pWnd == m_pMinButton) { - OnMinButtonLBDown(*(CPDF_Point*)lParam); + OnMinButtonLBDown(*(CFX_FloatPoint*)lParam); } if (pWnd == m_pMaxButton) { - OnMaxButtonLBDown(*(CPDF_Point*)lParam); + OnMaxButtonLBDown(*(CFX_FloatPoint*)lParam); } if (pWnd == m_pPosButton) { - OnPosButtonLBDown(*(CPDF_Point*)lParam); + OnPosButtonLBDown(*(CFX_FloatPoint*)lParam); } break; case PNM_LBUTTONUP: if (pWnd == m_pMinButton) { - OnMinButtonLBUp(*(CPDF_Point*)lParam); + OnMinButtonLBUp(*(CFX_FloatPoint*)lParam); } if (pWnd == m_pMaxButton) { - OnMaxButtonLBUp(*(CPDF_Point*)lParam); + OnMaxButtonLBUp(*(CFX_FloatPoint*)lParam); } if (pWnd == m_pPosButton) { - OnPosButtonLBUp(*(CPDF_Point*)lParam); + OnPosButtonLBUp(*(CFX_FloatPoint*)lParam); } break; case PNM_MOUSEMOVE: if (pWnd == m_pMinButton) { - OnMinButtonMouseMove(*(CPDF_Point*)lParam); + OnMinButtonMouseMove(*(CFX_FloatPoint*)lParam); } if (pWnd == m_pMaxButton) { - OnMaxButtonMouseMove(*(CPDF_Point*)lParam); + OnMaxButtonMouseMove(*(CFX_FloatPoint*)lParam); } if (pWnd == m_pPosButton) { - OnPosButtonMouseMove(*(CPDF_Point*)lParam); + OnPosButtonMouseMove(*(CFX_FloatPoint*)lParam); } break; case PNM_SETSCROLLINFO: { @@ -896,8 +913,8 @@ void CPWL_ScrollBar::MovePosButton(FX_BOOL bRefresh) { ASSERT(m_pMaxButton); if (m_pPosButton->IsVisible()) { - CPDF_Rect rcClient; - CPDF_Rect rcPosArea, rcPosButton; + CFX_FloatRect rcClient; + CFX_FloatRect rcPosArea, rcPosButton; rcClient = GetClientRect(); rcPosArea = GetScrollArea(); @@ -917,7 +934,8 @@ void CPWL_ScrollBar::MovePosButton(FX_BOOL bRefresh) { fLeft = fRight - PWL_SCROLLBAR_POSBUTTON_MINWIDTH; } - rcPosButton = CPDF_Rect(fLeft, rcPosArea.bottom, fRight, rcPosArea.top); + rcPosButton = + CFX_FloatRect(fLeft, rcPosArea.bottom, fRight, rcPosArea.top); break; case SBT_VSCROLL: @@ -932,7 +950,8 @@ void CPWL_ScrollBar::MovePosButton(FX_BOOL bRefresh) { fTop = fBottom + PWL_SCROLLBAR_POSBUTTON_MINWIDTH; } - rcPosButton = CPDF_Rect(rcPosArea.left, fBottom, rcPosArea.right, fTop); + rcPosButton = + CFX_FloatRect(rcPosArea.left, fBottom, rcPosArea.right, fTop); break; } @@ -941,7 +960,7 @@ void CPWL_ScrollBar::MovePosButton(FX_BOOL bRefresh) { } } -void CPWL_ScrollBar::OnMinButtonLBDown(const CPDF_Point& point) { +void CPWL_ScrollBar::OnMinButtonLBDown(const CFX_FloatPoint& point) { m_sData.SubSmall(); MovePosButton(TRUE); NotifyScrollWindow(); @@ -952,11 +971,11 @@ void CPWL_ScrollBar::OnMinButtonLBDown(const CPDF_Point& point) { BeginTimer(100); } -void CPWL_ScrollBar::OnMinButtonLBUp(const CPDF_Point& point) {} +void CPWL_ScrollBar::OnMinButtonLBUp(const CFX_FloatPoint& point) {} -void CPWL_ScrollBar::OnMinButtonMouseMove(const CPDF_Point& point) {} +void CPWL_ScrollBar::OnMinButtonMouseMove(const CFX_FloatPoint& point) {} -void CPWL_ScrollBar::OnMaxButtonLBDown(const CPDF_Point& point) { +void CPWL_ScrollBar::OnMaxButtonLBDown(const CFX_FloatPoint& point) { m_sData.AddSmall(); MovePosButton(TRUE); NotifyScrollWindow(); @@ -967,15 +986,15 @@ void CPWL_ScrollBar::OnMaxButtonLBDown(const CPDF_Point& point) { BeginTimer(100); } -void CPWL_ScrollBar::OnMaxButtonLBUp(const CPDF_Point& point) {} +void CPWL_ScrollBar::OnMaxButtonLBUp(const CFX_FloatPoint& point) {} -void CPWL_ScrollBar::OnMaxButtonMouseMove(const CPDF_Point& point) {} +void CPWL_ScrollBar::OnMaxButtonMouseMove(const CFX_FloatPoint& point) {} -void CPWL_ScrollBar::OnPosButtonLBDown(const CPDF_Point& point) { +void CPWL_ScrollBar::OnPosButtonLBDown(const CFX_FloatPoint& point) { m_bMouseDown = TRUE; if (m_pPosButton) { - CPDF_Rect rcPosButton = m_pPosButton->GetWindowRect(); + CFX_FloatRect rcPosButton = m_pPosButton->GetWindowRect(); switch (m_sbType) { case SBT_HSCROLL: @@ -990,7 +1009,7 @@ void CPWL_ScrollBar::OnPosButtonLBDown(const CPDF_Point& point) { } } -void CPWL_ScrollBar::OnPosButtonLBUp(const CPDF_Point& point) { +void CPWL_ScrollBar::OnPosButtonLBUp(const CFX_FloatPoint& point) { if (m_bMouseDown) { if (!m_bNotifyForever) NotifyScrollWindow(); @@ -998,7 +1017,7 @@ void CPWL_ScrollBar::OnPosButtonLBUp(const CPDF_Point& point) { m_bMouseDown = FALSE; } -void CPWL_ScrollBar::OnPosButtonMouseMove(const CPDF_Point& point) { +void CPWL_ScrollBar::OnPosButtonMouseMove(const CFX_FloatPoint& point) { FX_FLOAT fOldScrollPos = m_sData.fScrollPos; FX_FLOAT fNewPos = 0; @@ -1071,15 +1090,15 @@ void CPWL_ScrollBar::NotifyScrollWindow() { } } -CPDF_Rect CPWL_ScrollBar::GetScrollArea() const { - CPDF_Rect rcClient = GetClientRect(); - CPDF_Rect rcArea; +CFX_FloatRect CPWL_ScrollBar::GetScrollArea() const { + CFX_FloatRect rcClient = GetClientRect(); + CFX_FloatRect rcArea; if (!m_pMinButton || !m_pMaxButton) return rcClient; - CPDF_Rect rcMin = m_pMinButton->GetWindowRect(); - CPDF_Rect rcMax = m_pMaxButton->GetWindowRect(); + CFX_FloatRect rcMin = m_pMinButton->GetWindowRect(); + CFX_FloatRect rcMax = m_pMaxButton->GetWindowRect(); FX_FLOAT fMinWidth = rcMin.right - rcMin.left; FX_FLOAT fMinHeight = rcMin.top - rcMin.bottom; @@ -1089,20 +1108,21 @@ CPDF_Rect CPWL_ScrollBar::GetScrollArea() const { switch (m_sbType) { case SBT_HSCROLL: if (rcClient.right - rcClient.left > fMinWidth + fMaxWidth + 2) { - rcArea = CPDF_Rect(rcClient.left + fMinWidth + 1, rcClient.bottom, - rcClient.right - fMaxWidth - 1, rcClient.top); + rcArea = CFX_FloatRect(rcClient.left + fMinWidth + 1, rcClient.bottom, + rcClient.right - fMaxWidth - 1, rcClient.top); } else { - rcArea = CPDF_Rect(rcClient.left + fMinWidth + 1, rcClient.bottom, - rcClient.left + fMinWidth + 1, rcClient.top); + rcArea = CFX_FloatRect(rcClient.left + fMinWidth + 1, rcClient.bottom, + rcClient.left + fMinWidth + 1, rcClient.top); } break; case SBT_VSCROLL: if (rcClient.top - rcClient.bottom > fMinHeight + fMaxHeight + 2) { - rcArea = CPDF_Rect(rcClient.left, rcClient.bottom + fMinHeight + 1, - rcClient.right, rcClient.top - fMaxHeight - 1); + rcArea = CFX_FloatRect(rcClient.left, rcClient.bottom + fMinHeight + 1, + rcClient.right, rcClient.top - fMaxHeight - 1); } else { - rcArea = CPDF_Rect(rcClient.left, rcClient.bottom + fMinHeight + 1, - rcClient.right, rcClient.bottom + fMinHeight + 1); + rcArea = + CFX_FloatRect(rcClient.left, rcClient.bottom + fMinHeight + 1, + rcClient.right, rcClient.bottom + fMinHeight + 1); } break; } @@ -1113,7 +1133,7 @@ CPDF_Rect CPWL_ScrollBar::GetScrollArea() const { } FX_FLOAT CPWL_ScrollBar::TrueToFace(FX_FLOAT fTrue) { - CPDF_Rect rcPosArea; + CFX_FloatRect rcPosArea; rcPosArea = GetScrollArea(); FX_FLOAT fFactWidth = m_sData.ScrollRange.GetWidth() + m_sData.fClientWidth; @@ -1136,7 +1156,7 @@ FX_FLOAT CPWL_ScrollBar::TrueToFace(FX_FLOAT fTrue) { } FX_FLOAT CPWL_ScrollBar::FaceToTrue(FX_FLOAT fFace) { - CPDF_Rect rcPosArea; + CFX_FloatRect rcPosArea; rcPosArea = GetScrollArea(); FX_FLOAT fFactWidth = m_sData.ScrollRange.GetWidth() + m_sData.fClientWidth; diff --git a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp index f7c73d0a7d..6b3940de28 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp @@ -27,7 +27,7 @@ void CPWL_Signature_Image::DrawThisAppearance(CFX_RenderDevice* pDevice, CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device); if (m_pImage) { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); FX_FLOAT x, y; pUser2Device->Transform(rcClient.left, rcClient.top, x, y); @@ -48,7 +48,7 @@ void CPWL_Signature_Image::GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) { GetImageSize(fImageW, fImageH); - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); fHScale = rcClient.Width() / fImageW; fVScale = rcClient.Height() / fImageH; @@ -107,10 +107,10 @@ void CPWL_Signature::SetImageStream(CPDF_Stream* pStream, } void CPWL_Signature::RePosChildWnd() { - CPDF_Rect rcClient = GetClientRect(); + CFX_FloatRect rcClient = GetClientRect(); - CPDF_Rect rcText = rcClient; - CPDF_Rect rcDescription = rcClient; + CFX_FloatRect rcText = rcClient; + CFX_FloatRect rcDescription = rcClient; FX_BOOL bTextVisible = m_bTextExist && m_pText->GetText().GetLength() > 0; diff --git a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp b/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp index 52f25fcd84..44c3ec8a94 100644 --- a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp @@ -17,7 +17,7 @@ CFX_ByteString CPWL_PushButton::GetClassName() const { return "CPWL_PushButton"; } -CPDF_Rect CPWL_PushButton::GetFocusRect() const { +CFX_FloatRect CPWL_PushButton::GetFocusRect() const { return CPWL_Utils::DeflateRect(GetWindowRect(), (FX_FLOAT)GetBorderWidth()); } @@ -37,7 +37,8 @@ FX_BOOL CPWL_CheckBox::IsChecked() const { return m_bChecked; } -FX_BOOL CPWL_CheckBox::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_CheckBox::OnLButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { if (IsReadOnly()) return FALSE; @@ -58,7 +59,8 @@ CFX_ByteString CPWL_RadioButton::GetClassName() const { return "CPWL_RadioButton"; } -FX_BOOL CPWL_RadioButton::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) { +FX_BOOL CPWL_RadioButton::OnLButtonUp(const CFX_FloatPoint& point, + FX_DWORD nFlag) { if (IsReadOnly()) return FALSE; diff --git a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp index 64ba43dd6b..6cd5786e2e 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp @@ -69,8 +69,9 @@ void CPWL_Utils::GetPathDataFromArray(CFX_PathData& path, } } -CPDF_Rect CPWL_Utils::MaxRect(const CPDF_Rect& rect1, const CPDF_Rect& rect2) { - CPDF_Rect rcRet; +CFX_FloatRect CPWL_Utils::MaxRect(const CFX_FloatRect& rect1, + const CFX_FloatRect& rect2) { + CFX_FloatRect rcRet; rcRet.left = PWL_MIN(rect1.left, rect2.left); rcRet.bottom = PWL_MIN(rect1.bottom, rect2.bottom); @@ -80,21 +81,21 @@ CPDF_Rect CPWL_Utils::MaxRect(const CPDF_Rect& rect1, const CPDF_Rect& rect2) { return rcRet; } -CPDF_Rect CPWL_Utils::OffsetRect(const CPDF_Rect& rect, - FX_FLOAT x, - FX_FLOAT y) { - return CPDF_Rect(rect.left + x, rect.bottom + y, rect.right + x, - rect.top + y); +CFX_FloatRect CPWL_Utils::OffsetRect(const CFX_FloatRect& rect, + FX_FLOAT x, + FX_FLOAT y) { + return CFX_FloatRect(rect.left + x, rect.bottom + y, rect.right + x, + rect.top + y); } -FX_BOOL CPWL_Utils::ContainsRect(const CPDF_Rect& rcParent, - const CPDF_Rect& rcChild) { +FX_BOOL CPWL_Utils::ContainsRect(const CFX_FloatRect& rcParent, + const CFX_FloatRect& rcChild) { return rcChild.left >= rcParent.left && rcChild.bottom >= rcParent.bottom && rcChild.right <= rcParent.right && rcChild.top <= rcParent.top; } -FX_BOOL CPWL_Utils::IntersectRect(const CPDF_Rect& rect1, - const CPDF_Rect& rect2) { +FX_BOOL CPWL_Utils::IntersectRect(const CFX_FloatRect& rect1, + const CFX_FloatRect& rect2) { FX_FLOAT left = rect1.left > rect2.left ? rect1.left : rect2.left; FX_FLOAT right = rect1.right < rect2.right ? rect1.right : rect2.right; FX_FLOAT bottom = rect1.bottom > rect2.bottom ? rect1.bottom : rect2.bottom; @@ -103,10 +104,10 @@ FX_BOOL CPWL_Utils::IntersectRect(const CPDF_Rect& rect1, return left < right && bottom < top; } -CPDF_Point CPWL_Utils::OffsetPoint(const CPDF_Point& point, - FX_FLOAT x, - FX_FLOAT y) { - return CPDF_Point(point.x + x, point.y + y); +CFX_FloatPoint CPWL_Utils::OffsetPoint(const CFX_FloatPoint& point, + FX_FLOAT x, + FX_FLOAT y) { + return CFX_FloatPoint(point.x + x, point.y + y); } CPVT_WordRange CPWL_Utils::OverlapWordRange(const CPVT_WordRange& wr1, @@ -135,7 +136,7 @@ CPVT_WordRange CPWL_Utils::OverlapWordRange(const CPVT_WordRange& wr1, return wrRet; } -CFX_ByteString CPWL_Utils::GetAP_Check(const CPDF_Rect& crBBox) { +CFX_ByteString CPWL_Utils::GetAP_Check(const CFX_FloatRect& crBBox) { const FX_FLOAT fWidth = crBBox.right - crBBox.left; const FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -184,16 +185,16 @@ CFX_ByteString CPWL_Utils::GetAP_Check(const CPDF_Rect& crBBox) { return csAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAP_Circle(const CPDF_Rect& crBBox) { +CFX_ByteString CPWL_Utils::GetAP_Circle(const CFX_FloatRect& crBBox) { CFX_ByteTextBuf csAP; FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; - CPDF_Point pt1(crBBox.left, crBBox.bottom + fHeight / 2); - CPDF_Point pt2(crBBox.left + fWidth / 2, crBBox.top); - CPDF_Point pt3(crBBox.right, crBBox.bottom + fHeight / 2); - CPDF_Point pt4(crBBox.left + fWidth / 2, crBBox.bottom); + CFX_FloatPoint pt1(crBBox.left, crBBox.bottom + fHeight / 2); + CFX_FloatPoint pt2(crBBox.left + fWidth / 2, crBBox.top); + CFX_FloatPoint pt3(crBBox.right, crBBox.bottom + fHeight / 2); + CFX_FloatPoint pt4(crBBox.left + fWidth / 2, crBBox.bottom); csAP << pt1.x << " " << pt1.y << " m\n"; @@ -226,7 +227,7 @@ CFX_ByteString CPWL_Utils::GetAP_Circle(const CPDF_Rect& crBBox) { return csAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAP_Cross(const CPDF_Rect& crBBox) { +CFX_ByteString CPWL_Utils::GetAP_Cross(const CFX_FloatRect& crBBox) { CFX_ByteTextBuf csAP; csAP << crBBox.left << " " << crBBox.top << " m\n"; @@ -237,16 +238,16 @@ CFX_ByteString CPWL_Utils::GetAP_Cross(const CPDF_Rect& crBBox) { return csAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAP_Diamond(const CPDF_Rect& crBBox) { +CFX_ByteString CPWL_Utils::GetAP_Diamond(const CFX_FloatRect& crBBox) { CFX_ByteTextBuf csAP; FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; - CPDF_Point pt1(crBBox.left, crBBox.bottom + fHeight / 2); - CPDF_Point pt2(crBBox.left + fWidth / 2, crBBox.top); - CPDF_Point pt3(crBBox.right, crBBox.bottom + fHeight / 2); - CPDF_Point pt4(crBBox.left + fWidth / 2, crBBox.bottom); + CFX_FloatPoint pt1(crBBox.left, crBBox.bottom + fHeight / 2); + CFX_FloatPoint pt2(crBBox.left + fWidth / 2, crBBox.top); + CFX_FloatPoint pt3(crBBox.right, crBBox.bottom + fHeight / 2); + CFX_FloatPoint pt4(crBBox.left + fWidth / 2, crBBox.bottom); csAP << pt1.x << " " << pt1.y << " m\n"; csAP << pt2.x << " " << pt2.y << " l\n"; @@ -257,7 +258,7 @@ CFX_ByteString CPWL_Utils::GetAP_Diamond(const CPDF_Rect& crBBox) { return csAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAP_Square(const CPDF_Rect& crBBox) { +CFX_ByteString CPWL_Utils::GetAP_Square(const CFX_FloatRect& crBBox) { CFX_ByteTextBuf csAP; csAP << crBBox.left << " " << crBBox.top << " m\n"; @@ -269,13 +270,13 @@ CFX_ByteString CPWL_Utils::GetAP_Square(const CPDF_Rect& crBBox) { return csAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAP_Star(const CPDF_Rect& crBBox) { +CFX_ByteString CPWL_Utils::GetAP_Star(const CFX_FloatRect& crBBox) { CFX_ByteTextBuf csAP; FX_FLOAT fRadius = (crBBox.top - crBBox.bottom) / (1 + (FX_FLOAT)cos(FX_PI / 5.0f)); - CPDF_Point ptCenter = CPDF_Point((crBBox.left + crBBox.right) / 2.0f, - (crBBox.top + crBBox.bottom) / 2.0f); + CFX_FloatPoint ptCenter = CFX_FloatPoint((crBBox.left + crBBox.right) / 2.0f, + (crBBox.top + crBBox.bottom) / 2.0f); FX_FLOAT px[5], py[5]; @@ -301,16 +302,16 @@ CFX_ByteString CPWL_Utils::GetAP_Star(const CPDF_Rect& crBBox) { return csAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAP_HalfCircle(const CPDF_Rect& crBBox, +CFX_ByteString CPWL_Utils::GetAP_HalfCircle(const CFX_FloatRect& crBBox, FX_FLOAT fRotate) { CFX_ByteTextBuf csAP; FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; - CPDF_Point pt1(-fWidth / 2, 0); - CPDF_Point pt2(0, fHeight / 2); - CPDF_Point pt3(fWidth / 2, 0); + CFX_FloatPoint pt1(-fWidth / 2, 0); + CFX_FloatPoint pt2(0, fHeight / 2); + CFX_FloatPoint pt3(fWidth / 2, 0); FX_FLOAT px, py; @@ -336,39 +337,42 @@ CFX_ByteString CPWL_Utils::GetAP_HalfCircle(const CPDF_Rect& crBBox, return csAP.GetByteString(); } -CPDF_Rect CPWL_Utils::InflateRect(const CPDF_Rect& rcRect, FX_FLOAT fSize) { +CFX_FloatRect CPWL_Utils::InflateRect(const CFX_FloatRect& rcRect, + FX_FLOAT fSize) { if (rcRect.IsEmpty()) return rcRect; - CPDF_Rect rcNew(rcRect.left - fSize, rcRect.bottom - fSize, - rcRect.right + fSize, rcRect.top + fSize); + CFX_FloatRect rcNew(rcRect.left - fSize, rcRect.bottom - fSize, + rcRect.right + fSize, rcRect.top + fSize); rcNew.Normalize(); return rcNew; } -CPDF_Rect CPWL_Utils::DeflateRect(const CPDF_Rect& rcRect, FX_FLOAT fSize) { +CFX_FloatRect CPWL_Utils::DeflateRect(const CFX_FloatRect& rcRect, + FX_FLOAT fSize) { if (rcRect.IsEmpty()) return rcRect; - CPDF_Rect rcNew(rcRect.left + fSize, rcRect.bottom + fSize, - rcRect.right - fSize, rcRect.top - fSize); + CFX_FloatRect rcNew(rcRect.left + fSize, rcRect.bottom + fSize, + rcRect.right - fSize, rcRect.top - fSize); rcNew.Normalize(); return rcNew; } -CPDF_Rect CPWL_Utils::ScaleRect(const CPDF_Rect& rcRect, FX_FLOAT fScale) { +CFX_FloatRect CPWL_Utils::ScaleRect(const CFX_FloatRect& rcRect, + FX_FLOAT fScale) { FX_FLOAT fHalfWidth = (rcRect.right - rcRect.left) / 2.0f; FX_FLOAT fHalfHeight = (rcRect.top - rcRect.bottom) / 2.0f; - CPDF_Point ptCenter = CPDF_Point((rcRect.left + rcRect.right) / 2, - (rcRect.top + rcRect.bottom) / 2); + CFX_FloatPoint ptCenter = CFX_FloatPoint((rcRect.left + rcRect.right) / 2, + (rcRect.top + rcRect.bottom) / 2); - return CPDF_Rect( + return CFX_FloatRect( ptCenter.x - fHalfWidth * fScale, ptCenter.y - fHalfHeight * fScale, ptCenter.x + fHalfWidth * fScale, ptCenter.y + fHalfHeight * fScale); } -CFX_ByteString CPWL_Utils::GetRectFillAppStream(const CPDF_Rect& rect, +CFX_ByteString CPWL_Utils::GetRectFillAppStream(const CFX_FloatRect& rect, const CPWL_Color& color) { CFX_ByteTextBuf sAppStream; @@ -383,7 +387,7 @@ CFX_ByteString CPWL_Utils::GetRectFillAppStream(const CPDF_Rect& rect, return sAppStream.GetByteString(); } -CFX_ByteString CPWL_Utils::GetCircleFillAppStream(const CPDF_Rect& rect, +CFX_ByteString CPWL_Utils::GetCircleFillAppStream(const CFX_FloatRect& rect, const CPWL_Color& color) { CFX_ByteTextBuf sAppStream; @@ -395,7 +399,7 @@ CFX_ByteString CPWL_Utils::GetCircleFillAppStream(const CPDF_Rect& rect, return sAppStream.GetByteString(); } -CPDF_Rect CPWL_Utils::GetCenterSquare(const CPDF_Rect& rect) { +CFX_FloatRect CPWL_Utils::GetCenterSquare(const CFX_FloatRect& rect) { FX_FLOAT fWidth = rect.right - rect.left; FX_FLOAT fHeight = rect.top - rect.bottom; @@ -404,12 +408,12 @@ CPDF_Rect CPWL_Utils::GetCenterSquare(const CPDF_Rect& rect) { FX_FLOAT fRadius = (fWidth > fHeight) ? fHeight / 2 : fWidth / 2; - return CPDF_Rect(fCenterX - fRadius, fCenterY - fRadius, fCenterX + fRadius, - fCenterY + fRadius); + return CFX_FloatRect(fCenterX - fRadius, fCenterY - fRadius, + fCenterX + fRadius, fCenterY + fRadius); } CFX_ByteString CPWL_Utils::GetEditAppStream(IFX_Edit* pEdit, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange, FX_BOOL bContinuous, FX_WORD SubWord) { @@ -418,7 +422,7 @@ CFX_ByteString CPWL_Utils::GetEditAppStream(IFX_Edit* pEdit, } CFX_ByteString CPWL_Utils::GetEditSelAppStream(IFX_Edit* pEdit, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange) { return IFX_Edit::GetSelectAppearanceStream(pEdit, ptOffset, pRange); } @@ -445,7 +449,7 @@ static CFX_ByteString GetSquigglyAppearanceStream(FX_FLOAT fStartX, static CFX_ByteString GetWordSpellCheckAppearanceStream( IFX_Edit_Iterator* pIterator, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange& wrWord) { CFX_ByteTextBuf sRet; @@ -504,7 +508,7 @@ static CFX_ByteString GetWordSpellCheckAppearanceStream( CFX_ByteString CPWL_Utils::GetSpellCheckAppStream( IFX_Edit* pEdit, IPWL_SpellCheck* pSpellCheck, - const CPDF_Point& ptOffset, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange) { CFX_ByteTextBuf sRet; @@ -569,7 +573,7 @@ CFX_ByteString CPWL_Utils::GetSpellCheckAppStream( return sRet.GetByteString(); } -CFX_ByteString CPWL_Utils::GetTextAppStream(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetTextAppStream(const CFX_FloatRect& rcBBox, IFX_Edit_FontMap* pFontMap, const CFX_WideString& sText, int32_t nAlignmentH, @@ -596,7 +600,7 @@ CFX_ByteString CPWL_Utils::GetTextAppStream(const CPDF_Rect& rcBBox, pEdit->SetText(sText.c_str()); CFX_ByteString sEdit = - CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, 0.0f)); + CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f)); if (sEdit.GetLength() > 0) { sRet << "BT\n" << CPWL_Utils::GetColorAppStream(crText) << sEdit << "ET\n"; @@ -607,7 +611,7 @@ CFX_ByteString CPWL_Utils::GetTextAppStream(const CPDF_Rect& rcBBox, return sRet.GetByteString(); } -CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, IFX_Edit_FontMap* pFontMap, CPDF_Stream* pIconStream, CPDF_IconFit& IconFit, @@ -631,7 +635,7 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, pEdit->Initialize(); pEdit->SetText(sLabel.c_str()); - CPDF_Rect rcLabelContent = pEdit->GetContentRect(); + CFX_FloatRect rcLabelContent = pEdit->GetContentRect(); CPWL_Icon Icon; PWL_CREATEPARAM cp; cp.dwFlags = PWS_VISIBLE; @@ -639,45 +643,45 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, Icon.SetIconFit(&IconFit); Icon.SetPDFStream(pIconStream); - CPDF_Rect rcLabel = CPDF_Rect(0, 0, 0, 0); - CPDF_Rect rcIcon = CPDF_Rect(0, 0, 0, 0); + CFX_FloatRect rcLabel = CFX_FloatRect(0, 0, 0, 0); + CFX_FloatRect rcIcon = CFX_FloatRect(0, 0, 0, 0); FX_FLOAT fWidth = 0.0f; FX_FLOAT fHeight = 0.0f; switch (nLayOut) { case PPBL_LABEL: rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); break; case PPBL_ICON: rcIcon = rcBBox; - rcLabel = CPDF_Rect(0, 0, 0, 0); + rcLabel = CFX_FloatRect(0, 0, 0, 0); break; case PPBL_ICONTOPLABELBOTTOM: if (pIconStream) { if (IsFloatZero(fFontSize)) { fHeight = rcBBox.top - rcBBox.bottom; - rcLabel = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right, - rcBBox.bottom + fHeight * fAutoFontScale); - rcIcon = - CPDF_Rect(rcBBox.left, rcLabel.top, rcBBox.right, rcBBox.top); + rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right, + rcBBox.bottom + fHeight * fAutoFontScale); + rcIcon = CFX_FloatRect(rcBBox.left, rcLabel.top, rcBBox.right, + rcBBox.top); } else { fHeight = rcLabelContent.Height(); if (rcBBox.bottom + fHeight > rcBBox.top) { - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); rcLabel = rcBBox; } else { - rcLabel = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right, - rcBBox.bottom + fHeight); - rcIcon = - CPDF_Rect(rcBBox.left, rcLabel.top, rcBBox.right, rcBBox.top); + rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right, + rcBBox.bottom + fHeight); + rcIcon = CFX_FloatRect(rcBBox.left, rcLabel.top, rcBBox.right, + rcBBox.top); } } } else { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } break; @@ -686,27 +690,27 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, if (pIconStream) { if (IsFloatZero(fFontSize)) { fHeight = rcBBox.top - rcBBox.bottom; - rcLabel = - CPDF_Rect(rcBBox.left, rcBBox.top - fHeight * fAutoFontScale, - rcBBox.right, rcBBox.top); - rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right, - rcLabel.bottom); + rcLabel = CFX_FloatRect(rcBBox.left, + rcBBox.top - fHeight * fAutoFontScale, + rcBBox.right, rcBBox.top); + rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right, + rcLabel.bottom); } else { fHeight = rcLabelContent.Height(); if (rcBBox.bottom + fHeight > rcBBox.top) { - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); rcLabel = rcBBox; } else { - rcLabel = CPDF_Rect(rcBBox.left, rcBBox.top - fHeight, - rcBBox.right, rcBBox.top); - rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right, - rcLabel.bottom); + rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.top - fHeight, + rcBBox.right, rcBBox.top); + rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right, + rcLabel.bottom); } } } else { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } break; @@ -715,21 +719,22 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, if (pIconStream) { if (IsFloatZero(fFontSize)) { fWidth = rcBBox.right - rcBBox.left; - rcLabel = CPDF_Rect(rcBBox.right - fWidth * fAutoFontScale, - rcBBox.bottom, rcBBox.right, rcBBox.top); - rcIcon = - CPDF_Rect(rcBBox.left, rcBBox.bottom, rcLabel.left, rcBBox.top); + rcLabel = CFX_FloatRect(rcBBox.right - fWidth * fAutoFontScale, + rcBBox.bottom, rcBBox.right, rcBBox.top); + rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left, + rcBBox.top); if (rcLabelContent.Width() < fWidth * fAutoFontScale) { } else { if (rcLabelContent.Width() < fWidth) { - rcLabel = CPDF_Rect(rcBBox.right - rcLabelContent.Width(), - rcBBox.bottom, rcBBox.right, rcBBox.top); - rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcLabel.left, - rcBBox.top); + rcLabel = + CFX_FloatRect(rcBBox.right - rcLabelContent.Width(), + rcBBox.bottom, rcBBox.right, rcBBox.top); + rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left, + rcBBox.top); } else { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } } } else { @@ -737,17 +742,17 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, if (rcBBox.left + fWidth > rcBBox.right) { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } else { - rcLabel = CPDF_Rect(rcBBox.right - fWidth, rcBBox.bottom, - rcBBox.right, rcBBox.top); - rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcLabel.left, - rcBBox.top); + rcLabel = CFX_FloatRect(rcBBox.right - fWidth, rcBBox.bottom, + rcBBox.right, rcBBox.top); + rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left, + rcBBox.top); } } } else { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } break; @@ -756,23 +761,23 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, if (pIconStream) { if (IsFloatZero(fFontSize)) { fWidth = rcBBox.right - rcBBox.left; - rcLabel = - CPDF_Rect(rcBBox.left, rcBBox.bottom, - rcBBox.left + fWidth * fAutoFontScale, rcBBox.top); - rcIcon = CPDF_Rect(rcLabel.right, rcBBox.bottom, rcBBox.right, - rcBBox.top); + rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, + rcBBox.left + fWidth * fAutoFontScale, + rcBBox.top); + rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom, rcBBox.right, + rcBBox.top); if (rcLabelContent.Width() < fWidth * fAutoFontScale) { } else { if (rcLabelContent.Width() < fWidth) { - rcLabel = - CPDF_Rect(rcBBox.left, rcBBox.bottom, - rcBBox.left + rcLabelContent.Width(), rcBBox.top); - rcIcon = CPDF_Rect(rcLabel.right, rcBBox.bottom, rcBBox.right, - rcBBox.top); + rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, + rcBBox.left + rcLabelContent.Width(), + rcBBox.top); + rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom, + rcBBox.right, rcBBox.top); } else { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } } } else { @@ -780,17 +785,17 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, if (rcBBox.left + fWidth > rcBBox.right) { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } else { - rcLabel = CPDF_Rect(rcBBox.left, rcBBox.bottom, - rcBBox.left + fWidth, rcBBox.top); - rcIcon = CPDF_Rect(rcLabel.right, rcBBox.bottom, rcBBox.right, - rcBBox.top); + rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, + rcBBox.left + fWidth, rcBBox.top); + rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom, rcBBox.right, + rcBBox.top); } } } else { rcLabel = rcBBox; - rcIcon = CPDF_Rect(0, 0, 0, 0); + rcIcon = CFX_FloatRect(0, 0, 0, 0); } break; @@ -812,7 +817,7 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox, if (!rcLabel.IsEmpty()) { pEdit->SetPlateRect(rcLabel); CFX_ByteString sEdit = - CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, 0.0f)); + CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f)); if (sEdit.GetLength() > 0) { sTemp << "BT\n" << CPWL_Utils::GetColorAppStream(crText) << sEdit << "ET\n"; @@ -858,7 +863,7 @@ CFX_ByteString CPWL_Utils::GetColorAppStream(const CPWL_Color& color, return sColorStream.GetByteString(); } -CFX_ByteString CPWL_Utils::GetBorderAppStream(const CPDF_Rect& rect, +CFX_ByteString CPWL_Utils::GetBorderAppStream(const CFX_FloatRect& rect, FX_FLOAT fWidth, const CPWL_Color& color, const CPWL_Color& crLeftTop, @@ -975,7 +980,7 @@ CFX_ByteString CPWL_Utils::GetBorderAppStream(const CPDF_Rect& rect, } CFX_ByteString CPWL_Utils::GetCircleBorderAppStream( - const CPDF_Rect& rect, + const CFX_FloatRect& rect, FX_FLOAT fWidth, const CPWL_Color& color, const CPWL_Color& crLeftTop, @@ -1124,7 +1129,7 @@ CPWL_Color CPWL_Utils::DevideColor(const CPWL_Color& sColor, return sRet; } -CFX_ByteString CPWL_Utils::GetAppStream_Check(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetAppStream_Check(const CFX_FloatRect& rcBBox, const CPWL_Color& crText) { CFX_ByteTextBuf sAP; sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE) @@ -1132,7 +1137,7 @@ CFX_ByteString CPWL_Utils::GetAppStream_Check(const CPDF_Rect& rcBBox, return sAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAppStream_Circle(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetAppStream_Circle(const CFX_FloatRect& rcBBox, const CPWL_Color& crText) { CFX_ByteTextBuf sAP; sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE) @@ -1140,7 +1145,7 @@ CFX_ByteString CPWL_Utils::GetAppStream_Circle(const CPDF_Rect& rcBBox, return sAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAppStream_Cross(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetAppStream_Cross(const CFX_FloatRect& rcBBox, const CPWL_Color& crText) { CFX_ByteTextBuf sAP; sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, FALSE) @@ -1148,7 +1153,7 @@ CFX_ByteString CPWL_Utils::GetAppStream_Cross(const CPDF_Rect& rcBBox, return sAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAppStream_Diamond(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetAppStream_Diamond(const CFX_FloatRect& rcBBox, const CPWL_Color& crText) { CFX_ByteTextBuf sAP; sAP << "q\n1 w\n" << CPWL_Utils::GetColorAppStream(crText, TRUE) @@ -1156,7 +1161,7 @@ CFX_ByteString CPWL_Utils::GetAppStream_Diamond(const CPDF_Rect& rcBBox, return sAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAppStream_Square(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetAppStream_Square(const CFX_FloatRect& rcBBox, const CPWL_Color& crText) { CFX_ByteTextBuf sAP; sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE) @@ -1164,7 +1169,7 @@ CFX_ByteString CPWL_Utils::GetAppStream_Square(const CPDF_Rect& rcBBox, return sAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetAppStream_Star(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetAppStream_Star(const CFX_FloatRect& rcBBox, const CPWL_Color& crText) { CFX_ByteTextBuf sAP; sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE) @@ -1172,10 +1177,10 @@ CFX_ByteString CPWL_Utils::GetAppStream_Star(const CPDF_Rect& rcBBox, return sAP.GetByteString(); } -CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CFX_FloatRect& rcBBox, int32_t nStyle, const CPWL_Color& crText) { - CPDF_Rect rcCenter = GetCenterSquare(rcBBox); + CFX_FloatRect rcCenter = GetCenterSquare(rcBBox); switch (nStyle) { default: case PCS_CHECK: @@ -1193,10 +1198,10 @@ CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CPDF_Rect& rcBBox, } } -CFX_ByteString CPWL_Utils::GetRadioButtonAppStream(const CPDF_Rect& rcBBox, +CFX_ByteString CPWL_Utils::GetRadioButtonAppStream(const CFX_FloatRect& rcBBox, int32_t nStyle, const CPWL_Color& crText) { - CPDF_Rect rcCenter = GetCenterSquare(rcBBox); + CFX_FloatRect rcCenter = GetCenterSquare(rcBBox); switch (nStyle) { default: case PCS_CHECK: @@ -1214,7 +1219,7 @@ CFX_ByteString CPWL_Utils::GetRadioButtonAppStream(const CPDF_Rect& rcBBox, } } -CFX_ByteString CPWL_Utils::GetDropButtonAppStream(const CPDF_Rect& rcBBox) { +CFX_ByteString CPWL_Utils::GetDropButtonAppStream(const CFX_FloatRect& rcBBox) { CFX_ByteTextBuf sAppStream; if (!rcBBox.IsEmpty()) { @@ -1234,8 +1239,8 @@ CFX_ByteString CPWL_Utils::GetDropButtonAppStream(const CPDF_Rect& rcBBox) { CPWL_Dash(3, 0, 0)) << "Q\n"; - CPDF_Point ptCenter = CPDF_Point((rcBBox.left + rcBBox.right) / 2, - (rcBBox.top + rcBBox.bottom) / 2); + CFX_FloatPoint ptCenter = CFX_FloatPoint((rcBBox.left + rcBBox.right) / 2, + (rcBBox.top + rcBBox.bottom) / 2); if (IsFloatBigger(rcBBox.right - rcBBox.left, 6) && IsFloatBigger(rcBBox.top - rcBBox.bottom, 6)) { sAppStream << "q\n" @@ -1365,17 +1370,17 @@ FX_COLORREF CPWL_Utils::PWLColorToFXColor(const CPWL_Color& color, void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CPDF_Rect& rect, + const CFX_FloatRect& rect, const FX_COLORREF& color) { CFX_PathData path; - CPDF_Rect rcTemp(rect); + CFX_FloatRect rcTemp(rect); path.AppendRect(rcTemp.left, rcTemp.bottom, rcTemp.right, rcTemp.top); pDevice->DrawPath(&path, pUser2Device, NULL, color, 0, FXFILL_WINDING); } void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CPDF_Point* pPts, + const CFX_FloatPoint* pPts, int32_t nCount, const FX_COLORREF& color) { CFX_PathData path; @@ -1390,11 +1395,11 @@ void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice, void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CPDF_Rect& rect, + const CFX_FloatRect& rect, const FX_COLORREF& color, FX_FLOAT fWidth) { CFX_PathData path; - CPDF_Rect rcTemp(rect); + CFX_FloatRect rcTemp(rect); path.AppendRect(rcTemp.left, rcTemp.bottom, rcTemp.right, rcTemp.top); CFX_GraphStateData gsd; @@ -1405,8 +1410,8 @@ void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice, void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CPDF_Point& ptMoveTo, - const CPDF_Point& ptLineTo, + const CFX_FloatPoint& ptMoveTo, + const CFX_FloatPoint& ptLineTo, const FX_COLORREF& color, FX_FLOAT fWidth) { CFX_PathData path; @@ -1422,7 +1427,7 @@ void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice, void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CPDF_Rect& rect, + const CFX_FloatRect& rect, const CPWL_Color& color, int32_t nTransparancy) { CPWL_Utils::DrawFillRect(pDevice, pUser2Device, rect, @@ -1433,7 +1438,7 @@ void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, FX_BOOL bVertical, FX_BOOL bHorizontal, - CPDF_Rect rect, + CFX_FloatRect rect, int32_t nTransparancy, int32_t nStartGray, int32_t nEndGray) { @@ -1445,8 +1450,8 @@ void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice, for (FX_FLOAT fy = rect.bottom + 0.5f; fy <= rect.top - 0.5f; fy += 1.0f) { int32_t nGray = nStartGray + (int32_t)(fStepGray * (fy - rect.bottom)); CPWL_Utils::DrawStrokeLine( - pDevice, pUser2Device, CPDF_Point(rect.left, fy), - CPDF_Point(rect.right, fy), + pDevice, pUser2Device, CFX_FloatPoint(rect.left, fy), + CFX_FloatPoint(rect.right, fy), ArgbEncode(nTransparancy, nGray, nGray, nGray), 1.5f); } } @@ -1457,8 +1462,8 @@ void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice, for (FX_FLOAT fx = rect.left + 0.5f; fx <= rect.right - 0.5f; fx += 1.0f) { int32_t nGray = nStartGray + (int32_t)(fStepGray * (fx - rect.left)); CPWL_Utils::DrawStrokeLine( - pDevice, pUser2Device, CPDF_Point(fx, rect.bottom), - CPDF_Point(fx, rect.top), + pDevice, pUser2Device, CFX_FloatPoint(fx, rect.bottom), + CFX_FloatPoint(fx, rect.top), ArgbEncode(nTransparancy, nGray, nGray, nGray), 1.5f); } } @@ -1466,7 +1471,7 @@ void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice, void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CPDF_Rect& rect, + const CFX_FloatRect& rect, FX_FLOAT fWidth, const CPWL_Color& color, const CPWL_Color& crLeftTop, @@ -1673,8 +1678,8 @@ static void AddSpellCheckObj(CFX_PathData& PathData, void CPWL_Utils::DrawEditSpellCheck(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, IFX_Edit* pEdit, - const CPDF_Rect& rcClip, - const CPDF_Point& ptOffset, + const CFX_FloatRect& rcClip, + const CFX_FloatPoint& ptOffset, const CPVT_WordRange* pRange, IPWL_SpellCheck* pSpellCheck) { const FX_COLORREF crSpell = ArgbEncode(255, 255, 0, 0); @@ -1689,7 +1694,7 @@ void CPWL_Utils::DrawEditSpellCheck(CFX_RenderDevice* pDevice, pDevice->SaveState(); if (!rcClip.IsEmpty()) { - CPDF_Rect rcTemp = rcClip; + CFX_FloatRect rcTemp = rcClip; pUser2Device->TransformRect(rcTemp); FX_RECT rcDevClip; rcDevClip.left = (int32_t)rcTemp.left; @@ -1812,7 +1817,7 @@ CPWL_Color CPWL_Utils::GetReverseColor(const CPWL_Color& color) { } CFX_ByteString CPWL_Utils::GetIconAppStream(int32_t nType, - const CPDF_Rect& rect, + const CFX_FloatRect& rect, const CPWL_Color& crFill, const CPWL_Color& crStroke) { CFX_ByteString sAppStream = CPWL_Utils::GetColorAppStream(crStroke, FALSE); @@ -1896,7 +1901,7 @@ CFX_ByteString CPWL_Utils::GetIconAppStream(int32_t nType, void CPWL_Utils::DrawIconAppStream(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, int32_t nType, - const CPDF_Rect& rect, + const CFX_FloatRect& rect, const CPWL_Color& crFill, const CPWL_Color& crStroke, const int32_t nTransparancy) { @@ -1978,7 +1983,7 @@ void CPWL_Utils::DrawIconAppStream(CFX_RenderDevice* pDevice, void CPWL_Utils::GetGraphics_Checkmark(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2065,7 +2070,7 @@ void CPWL_Utils::GetGraphics_Checkmark(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Circle(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2188,7 +2193,7 @@ void CPWL_Utils::GetGraphics_Circle(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Comment(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2307,7 +2312,7 @@ void CPWL_Utils::GetGraphics_Comment(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Cross(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2364,7 +2369,7 @@ void CPWL_Utils::GetGraphics_Cross(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Help(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2594,7 +2599,7 @@ void CPWL_Utils::GetGraphics_Help(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_InsertText(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2621,7 +2626,7 @@ void CPWL_Utils::GetGraphics_InsertText(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Key(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2752,7 +2757,7 @@ void CPWL_Utils::GetGraphics_Key(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_NewParagraph(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2856,7 +2861,7 @@ void CPWL_Utils::GetGraphics_NewParagraph(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_TextNote(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2922,7 +2927,7 @@ void CPWL_Utils::GetGraphics_TextNote(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Paragraph(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -2973,7 +2978,7 @@ void CPWL_Utils::GetGraphics_Paragraph(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_RightArrow(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3018,7 +3023,7 @@ void CPWL_Utils::GetGraphics_RightArrow(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_RightPointer(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3048,14 +3053,14 @@ void CPWL_Utils::GetGraphics_RightPointer(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Star(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fLongRadius = (crBBox.top - crBBox.bottom) / (1 + (FX_FLOAT)cos(FX_PI / 5.0f)); fLongRadius = fLongRadius * 0.7f; FX_FLOAT fShortRadius = fLongRadius * 0.55f; - CPDF_Point ptCenter = CPDF_Point((crBBox.left + crBBox.right) / 2.0f, - (crBBox.top + crBBox.bottom) / 2.0f); + CFX_FloatPoint ptCenter = CFX_FloatPoint((crBBox.left + crBBox.right) / 2.0f, + (crBBox.top + crBBox.bottom) / 2.0f); FX_FLOAT px1[5], py1[5]; FX_FLOAT px2[5], py2[5]; @@ -3099,7 +3104,7 @@ void CPWL_Utils::GetGraphics_Star(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_UpArrow(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3138,7 +3143,7 @@ void CPWL_Utils::GetGraphics_UpArrow(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_UpLeftArrow(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3193,7 +3198,7 @@ void CPWL_Utils::GetGraphics_UpLeftArrow(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Graph(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3271,7 +3276,7 @@ void CPWL_Utils::GetGraphics_Graph(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Paperclip(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3414,7 +3419,7 @@ void CPWL_Utils::GetGraphics_Paperclip(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Attachment(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3510,7 +3515,7 @@ void CPWL_Utils::GetGraphics_Attachment(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Tag(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fWidth = crBBox.right - crBBox.left; FX_FLOAT fHeight = crBBox.top - crBBox.bottom; @@ -3561,12 +3566,12 @@ void CPWL_Utils::GetGraphics_Tag(CFX_ByteString& sPathData, void CPWL_Utils::GetGraphics_Foxit(CFX_ByteString& sPathData, CFX_PathData& path, - const CPDF_Rect& crBBox, + const CFX_FloatRect& crBBox, const PWL_PATH_TYPE type) { FX_FLOAT fOutWidth = crBBox.right - crBBox.left; FX_FLOAT fOutHeight = crBBox.top - crBBox.bottom; - CPDF_Rect crInBox = crBBox; + CFX_FloatRect crInBox = crBBox; crInBox.left = crBBox.left + fOutWidth * 0.08f; crInBox.right = crBBox.right - fOutWidth * 0.08f; crInBox.top = crBBox.top - fOutHeight * 0.08f; diff --git a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp index d0aaa78ea4..28bd0e04ed 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp @@ -273,9 +273,11 @@ void CPWL_Wnd::Destroy() { m_pVScrollBar = NULL; } -void CPWL_Wnd::Move(const CPDF_Rect& rcNew, FX_BOOL bReset, FX_BOOL bRefresh) { +void CPWL_Wnd::Move(const CFX_FloatRect& rcNew, + FX_BOOL bReset, + FX_BOOL bRefresh) { if (IsValid()) { - CPDF_Rect rcOld = GetWindowRect(); + CFX_FloatRect rcOld = GetWindowRect(); m_rcWindow = rcNew; m_rcWindow.Normalize(); @@ -294,9 +296,9 @@ void CPWL_Wnd::Move(const CPDF_Rect& rcNew, FX_BOOL bReset, FX_BOOL bRefresh) { } } -void CPWL_Wnd::InvalidateRectMove(const CPDF_Rect& rcOld, - const CPDF_Rect& rcNew) { - CPDF_Rect rcUnion = rcOld; +void CPWL_Wnd::InvalidateRectMove(const CFX_FloatRect& rcOld, + const CFX_FloatRect& rcNew) { + CFX_FloatRect rcUnion = rcOld; rcUnion.Union(rcNew); InvalidateRect(&rcUnion); @@ -311,7 +313,7 @@ void CPWL_Wnd::GetAppearanceStream(CFX_ByteTextBuf& sAppStream) { // if don't set,Get default apperance stream void CPWL_Wnd::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { - CPDF_Rect rectWnd = GetWindowRect(); + CFX_FloatRect rectWnd = GetWindowRect(); if (!rectWnd.IsEmpty()) { CFX_ByteTextBuf sThis; @@ -348,10 +350,10 @@ void CPWL_Wnd::DrawAppearance(CFX_RenderDevice* pDevice, void CPWL_Wnd::DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { - CPDF_Rect rectWnd = GetWindowRect(); + CFX_FloatRect rectWnd = GetWindowRect(); if (!rectWnd.IsEmpty()) { if (HasFlag(PWS_BACKGROUND)) { - CPDF_Rect rcClient = CPWL_Utils::DeflateRect( + CFX_FloatRect rcClient = CPWL_Utils::DeflateRect( rectWnd, (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth())); CPWL_Utils::DrawFillRect(pDevice, pUser2Device, rcClient, GetBackgroundColor(), GetTransparency()); @@ -381,12 +383,12 @@ void CPWL_Wnd::DrawChildAppearance(CFX_RenderDevice* pDevice, } } -void CPWL_Wnd::InvalidateRect(CPDF_Rect* pRect) { +void CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) { if (IsValid()) { - CPDF_Rect rcRefresh = pRect ? *pRect : GetWindowRect(); + CFX_FloatRect rcRefresh = pRect ? *pRect : GetWindowRect(); if (!HasFlag(PWS_NOREFRESHCLIP)) { - CPDF_Rect rcClip = GetClipRect(); + CFX_FloatRect rcClip = GetClipRect(); if (!rcClip.IsEmpty()) { rcRefresh.Intersect(rcClip); } @@ -423,7 +425,7 @@ void CPWL_Wnd::InvalidateRect(CPDF_Rect* pRect) { } #define PWL_IMPLEMENT_MOUSE_METHOD(mouse_method_name) \ - FX_BOOL CPWL_Wnd::mouse_method_name(const CPDF_Point& point, \ + FX_BOOL CPWL_Wnd::mouse_method_name(const CFX_FloatPoint& point, \ FX_DWORD nFlag) { \ if (IsValid() && IsVisible() && IsEnabled()) { \ if (IsWndCaptureMouse(this)) { \ @@ -467,7 +469,7 @@ PWL_IMPLEMENT_MOUSE_METHOD(OnRButtonUp) PWL_IMPLEMENT_MOUSE_METHOD(OnMouseMove) FX_BOOL CPWL_Wnd::OnMouseWheel(short zDelta, - const CPDF_Point& point, + const CFX_FloatPoint& point, FX_DWORD nFlag) { if (IsValid() && IsVisible() && IsEnabled()) { SetCursor(); @@ -528,25 +530,25 @@ CPWL_Wnd* CPWL_Wnd::GetParentWindow() const { return m_sPrivateParam.pParentWnd; } -CPDF_Rect CPWL_Wnd::GetWindowRect() const { +CFX_FloatRect CPWL_Wnd::GetWindowRect() const { return m_rcWindow; } -CPDF_Rect CPWL_Wnd::GetClientRect() const { - CPDF_Rect rcWindow = GetWindowRect(); - CPDF_Rect rcClient = CPWL_Utils::DeflateRect( +CFX_FloatRect CPWL_Wnd::GetClientRect() const { + CFX_FloatRect rcWindow = GetWindowRect(); + CFX_FloatRect rcClient = CPWL_Utils::DeflateRect( rcWindow, (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth())); if (CPWL_ScrollBar* pVSB = GetVScrollBar()) rcClient.right -= pVSB->GetScrollBarWidth(); rcClient.Normalize(); - return rcWindow.Contains(rcClient) ? rcClient : CPDF_Rect(); + return rcWindow.Contains(rcClient) ? rcClient : CFX_FloatRect(); } -CPDF_Point CPWL_Wnd::GetCenterPoint() const { - CPDF_Rect rcClient = GetClientRect(); - return CPDF_Point((rcClient.left + rcClient.right) * 0.5f, - (rcClient.top + rcClient.bottom) * 0.5f); +CFX_FloatPoint CPWL_Wnd::GetCenterPoint() const { + CFX_FloatRect rcClient = GetClientRect(); + return CFX_FloatPoint((rcClient.left + rcClient.right) * 0.5f, + (rcClient.top + rcClient.bottom) * 0.5f); } FX_BOOL CPWL_Wnd::HasFlag(FX_DWORD dwFlags) const { @@ -682,11 +684,11 @@ void CPWL_Wnd::OnSetFocus() {} void CPWL_Wnd::OnKillFocus() {} -FX_BOOL CPWL_Wnd::WndHitTest(const CPDF_Point& point) const { +FX_BOOL CPWL_Wnd::WndHitTest(const CFX_FloatPoint& point) const { return IsValid() && IsVisible() && GetWindowRect().Contains(point.x, point.y); } -FX_BOOL CPWL_Wnd::ClientHitTest(const CPDF_Point& point) const { +FX_BOOL CPWL_Wnd::ClientHitTest(const CFX_FloatPoint& point) const { return IsValid() && IsVisible() && GetClientRect().Contains(point.x, point.y); } @@ -713,12 +715,12 @@ void CPWL_Wnd::SetVisible(FX_BOOL bVisible) { } } -void CPWL_Wnd::SetClipRect(const CPDF_Rect& rect) { +void CPWL_Wnd::SetClipRect(const CFX_FloatRect& rect) { m_rcClip = rect; m_rcClip.Normalize(); } -const CPDF_Rect& CPWL_Wnd::GetClipRect() const { +const CFX_FloatRect& CPWL_Wnd::GetClipRect() const { return m_rcClip; } @@ -727,14 +729,14 @@ FX_BOOL CPWL_Wnd::IsReadOnly() const { } void CPWL_Wnd::RePosChildWnd() { - CPDF_Rect rcContent = CPWL_Utils::DeflateRect( + CFX_FloatRect rcContent = CPWL_Utils::DeflateRect( GetWindowRect(), (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth())); CPWL_ScrollBar* pVSB = GetVScrollBar(); - CPDF_Rect rcVScroll = - CPDF_Rect(rcContent.right - PWL_SCROLLBAR_WIDTH, rcContent.bottom, - rcContent.right - 1.0f, rcContent.top); + CFX_FloatRect rcVScroll = + CFX_FloatRect(rcContent.right - PWL_SCROLLBAR_WIDTH, rcContent.bottom, + rcContent.right - 1.0f, rcContent.top); if (pVSB) pVSB->Move(rcVScroll, TRUE, FALSE); @@ -791,7 +793,7 @@ FX_BOOL CPWL_Wnd::IsFocused() const { return FALSE; } -CPDF_Rect CPWL_Wnd::GetFocusRect() const { +CFX_FloatRect CPWL_Wnd::GetFocusRect() const { return CPWL_Utils::InflateRect(GetWindowRect(), 1); } @@ -886,16 +888,18 @@ CFX_Matrix CPWL_Wnd::GetWindowMatrix() const { return mt; } -void CPWL_Wnd::PWLtoWnd(const CPDF_Point& point, int32_t& x, int32_t& y) const { +void CPWL_Wnd::PWLtoWnd(const CFX_FloatPoint& point, + int32_t& x, + int32_t& y) const { CFX_Matrix mt = GetWindowMatrix(); - CPDF_Point pt = point; + CFX_FloatPoint pt = point; mt.Transform(pt.x, pt.y); x = (int32_t)(pt.x + 0.5); y = (int32_t)(pt.y + 0.5); } -FX_RECT CPWL_Wnd::PWLtoWnd(const CPDF_Rect& rect) const { - CPDF_Rect rcTemp = rect; +FX_RECT CPWL_Wnd::PWLtoWnd(const CFX_FloatRect& rect) const { + CFX_FloatRect rcTemp = rect; CFX_Matrix mt = GetWindowMatrix(); mt.TransformRect(rcTemp); return FX_RECT((int32_t)(rcTemp.left + 0.5), (int32_t)(rcTemp.bottom + 0.5), @@ -906,44 +910,44 @@ FX_HWND CPWL_Wnd::GetAttachedHWnd() const { return m_sPrivateParam.hAttachedWnd; } -CPDF_Point CPWL_Wnd::ChildToParent(const CPDF_Point& point) const { +CFX_FloatPoint CPWL_Wnd::ChildToParent(const CFX_FloatPoint& point) const { CFX_Matrix mt = GetChildMatrix(); if (mt.IsIdentity()) return point; - CPDF_Point pt = point; + CFX_FloatPoint pt = point; mt.Transform(pt.x, pt.y); return pt; } -CPDF_Rect CPWL_Wnd::ChildToParent(const CPDF_Rect& rect) const { +CFX_FloatRect CPWL_Wnd::ChildToParent(const CFX_FloatRect& rect) const { CFX_Matrix mt = GetChildMatrix(); if (mt.IsIdentity()) return rect; - CPDF_Rect rc = rect; + CFX_FloatRect rc = rect; mt.TransformRect(rc); return rc; } -CPDF_Point CPWL_Wnd::ParentToChild(const CPDF_Point& point) const { +CFX_FloatPoint CPWL_Wnd::ParentToChild(const CFX_FloatPoint& point) const { CFX_Matrix mt = GetChildMatrix(); if (mt.IsIdentity()) return point; mt.SetReverse(mt); - CPDF_Point pt = point; + CFX_FloatPoint pt = point; mt.Transform(pt.x, pt.y); return pt; } -CPDF_Rect CPWL_Wnd::ParentToChild(const CPDF_Rect& rect) const { +CFX_FloatRect CPWL_Wnd::ParentToChild(const CFX_FloatRect& rect) const { CFX_Matrix mt = GetChildMatrix(); if (mt.IsIdentity()) return rect; mt.SetReverse(mt); - CPDF_Rect rc = rect; + CFX_FloatRect rc = rect; mt.TransformRect(rc); return rc; } |