Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/pdfwindow/PWL_ComboBox.h"
 
 #include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
 #include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
 #include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 #define PWLCB_DEFAULTFONTSIZE 12.0f
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatEqual(fa, fb) IsFloatZero((fa) - (fb))
 
-FX_BOOL CPWL_CBListBox::OnLButtonUp(const CFX_FloatPoint& point,
-                                    FX_DWORD nFlag) {
+FX_BOOL CPWL_CBListBox::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonUp(point, nFlag);
 
   if (m_bMouseDown) {
     ReleaseCapture();
     m_bMouseDown = FALSE;
 
     if (ClientHitTest(point)) {
       if (CPWL_Wnd* pParent = GetParentWindow()) {
         pParent->OnNotify(this, PNM_LBUTTONUP, 0,
                           PWL_MAKEDWORD(point.x, point.y));
@@ skipping 69 matching lines @@
   }
 
   OnNotifySelChanged(TRUE, bExit, nFlag);
 
   return TRUE;
 }
 
 void CPWL_CBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
   CPWL_Wnd::GetThisAppearanceStream(sAppStream);
 
-  CFX_FloatRect rectWnd = CPWL_Wnd::GetWindowRect();
+  CPDF_Rect rectWnd = CPWL_Wnd::GetWindowRect();
 
   if (IsVisible() && !rectWnd.IsEmpty()) {
     CFX_ByteTextBuf sButton;
 
-    CFX_FloatPoint ptCenter = GetCenterPoint();
+    CPDF_Point ptCenter = GetCenterPoint();
 
-    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);
+    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);
 
     if (IsFloatBigger(rectWnd.right - rectWnd.left,
                       PWL_CBBUTTON_TRIANGLE_HALFLEN * 2) &&
         IsFloatBigger(rectWnd.top - rectWnd.bottom,
                       PWL_CBBUTTON_TRIANGLE_HALFLEN)) {
       sButton << "0 g\n";
       sButton << pt1.x << " " << pt1.y << " m\n";
       sButton << pt2.x << " " << pt2.y << " l\n";
       sButton << pt3.x << " " << pt3.y << " l\n";
       sButton << pt1.x << " " << pt1.y << " l f\n";
 
       sAppStream << "q\n" << sButton << "Q\n";
     }
   }
 }
 
 void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                        CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
-  CFX_FloatRect rectWnd = CPWL_Wnd::GetWindowRect();
+  CPDF_Rect rectWnd = CPWL_Wnd::GetWindowRect();
 
   if (IsVisible() && !rectWnd.IsEmpty()) {
-    CFX_FloatPoint ptCenter = GetCenterPoint();
+    CPDF_Point ptCenter = GetCenterPoint();
 
-    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);
+    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);
 
     if (IsFloatBigger(rectWnd.right - rectWnd.left,
                       PWL_CBBUTTON_TRIANGLE_HALFLEN * 2) &&
         IsFloatBigger(rectWnd.top - rectWnd.bottom,
                       PWL_CBBUTTON_TRIANGLE_HALFLEN)) {
       CFX_PathData path;
 
       path.SetPointCount(4);
       path.SetPoint(0, pt1.x, pt1.y, FXPT_MOVETO);
       path.SetPoint(1, pt2.x, pt2.y, FXPT_LINETO);
       path.SetPoint(2, pt3.x, pt3.y, FXPT_LINETO);
       path.SetPoint(3, pt1.x, pt1.y, FXPT_LINETO);
 
       pDevice->DrawPath(&path, pUser2Device, NULL,
                         CPWL_Utils::PWLColorToFXColor(PWL_DEFAULT_BLACKCOLOR,
                                                       GetTransparency()),
                         0, FXFILL_ALTERNATE);
     }
   }
 }
 
-FX_BOOL CPWL_CBButton::OnLButtonDown(const CFX_FloatPoint& point,
-                                     FX_DWORD nFlag) {
+FX_BOOL CPWL_CBButton::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonDown(point, nFlag);
 
   SetCapture();
 
   if (CPWL_Wnd* pParent = GetParentWindow()) {
     pParent->OnNotify(this, PNM_LBUTTONDOWN, 0,
                       PWL_MAKEDWORD(point.x, point.y));
   }
 
   return TRUE;
 }
 
-FX_BOOL CPWL_CBButton::OnLButtonUp(const CFX_FloatPoint& point,
-                                   FX_DWORD nFlag) {
+FX_BOOL CPWL_CBButton::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonUp(point, nFlag);
 
   ReleaseCapture();
 
   return TRUE;
 }
 
 CPWL_ComboBox::CPWL_ComboBox()
     : m_pEdit(NULL),
       m_pButton(NULL),
@@ skipping 88 matching lines @@
     ecp.pParentWnd = this;
     ecp.dwFlags = PWS_VISIBLE | PWS_CHILD | PWS_BORDER | PES_CENTER |
                   PES_AUTOSCROLL | PES_UNDO;
 
     if (HasFlag(PWS_AUTOFONTSIZE))
       ecp.dwFlags |= PWS_AUTOFONTSIZE;
 
     if (!HasFlag(PCBS_ALLOWCUSTOMTEXT))
       ecp.dwFlags |= PWS_READONLY;
 
-    ecp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0);
+    ecp.rcRectWnd = CPDF_Rect(0, 0, 0, 0);
     ecp.dwBorderWidth = 0;
     ecp.nBorderStyle = PBS_SOLID;
 
     m_pEdit->Create(ecp);
   }
 }
 
 void CPWL_ComboBox::CreateButton(const PWL_CREATEPARAM& cp) {
   if (!m_pButton) {
     m_pButton = new CPWL_CBButton;
@@ skipping 15 matching lines @@
   if (!m_pList) {
     m_pList = new CPWL_CBListBox;
     m_pList->AttachFFLData(m_pFormFiller);
     PWL_CREATEPARAM lcp = cp;
     lcp.pParentWnd = this;
     lcp.dwFlags =
         PWS_CHILD | PWS_BORDER | PWS_BACKGROUND | PLBS_HOVERSEL | PWS_VSCROLL;
     lcp.nBorderStyle = PBS_SOLID;
     lcp.dwBorderWidth = 1;
     lcp.eCursorType = FXCT_ARROW;
-    lcp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0);
+    lcp.rcRectWnd = CPDF_Rect(0, 0, 0, 0);
 
     if (cp.dwFlags & PWS_AUTOFONTSIZE)
       lcp.fFontSize = PWLCB_DEFAULTFONTSIZE;
     else
       lcp.fFontSize = cp.fFontSize;
 
     if (cp.sBorderColor.nColorType == COLORTYPE_TRANSPARENT)
       lcp.sBorderColor = PWL_DEFAULT_BLACKCOLOR;
 
     if (cp.sBackgroundColor.nColorType == COLORTYPE_TRANSPARENT)
       lcp.sBackgroundColor = PWL_DEFAULT_WHITECOLOR;
 
     m_pList->Create(lcp);
   }
 }
 
 void CPWL_ComboBox::RePosChildWnd() {
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
 
   if (m_bPopup) {
-    CFX_FloatRect rclient = GetClientRect();
-    CFX_FloatRect rcButton = rclient;
-    CFX_FloatRect rcEdit = rcClient;
-    CFX_FloatRect rcList = CPWL_Wnd::GetWindowRect();
+    CPDF_Rect rclient = GetClientRect();
+    CPDF_Rect rcButton = rclient;
+    CPDF_Rect rcEdit = rcClient;
+    CPDF_Rect rcList = CPWL_Wnd::GetWindowRect();
 
     FX_FLOAT fOldWindowHeight = m_rcOldWindow.Height();
     FX_FLOAT fOldClientHeight = fOldWindowHeight - GetBorderWidth() * 2;
 
     switch (m_nPopupWhere) {
       case 0:
         rcButton.left = rcButton.right - PWL_COMBOBOX_BUTTON_WIDTH;
 
         if (rcButton.left < rclient.left)
           rcButton.left = rclient.left;
@@ skipping 41 matching lines @@
 
     if (m_pEdit)
       m_pEdit->Move(rcEdit, TRUE, FALSE);
 
     if (m_pList) {
       m_pList->SetVisible(TRUE);
       m_pList->Move(rcList, TRUE, FALSE);
       m_pList->ScrollToListItem(m_nSelectItem);
     }
   } else {
-    CFX_FloatRect rcButton = rcClient;
+    CPDF_Rect rcButton = rcClient;
 
     rcButton.left = rcButton.right - PWL_COMBOBOX_BUTTON_WIDTH;
 
     if (rcButton.left < rcClient.left)
       rcButton.left = rcClient.left;
 
     if (m_pButton)
       m_pButton->Move(rcButton, TRUE, FALSE);
 
-    CFX_FloatRect rcEdit = rcClient;
+    CPDF_Rect rcEdit = rcClient;
     rcEdit.right = rcButton.left - 1.0f;
 
     if (rcEdit.left < rcClient.left)
       rcEdit.left = rcClient.left;
 
     if (rcEdit.right < rcEdit.left)
       rcEdit.right = rcEdit.left;
 
     if (m_pEdit)
       m_pEdit->Move(rcEdit, TRUE, FALSE);
 
     if (m_pList)
       m_pList->SetVisible(FALSE);
   }
 }
 
 void CPWL_ComboBox::SelectAll() {
   if (m_pEdit && HasFlag(PCBS_ALLOWCUSTOMTEXT))
     m_pEdit->SelectAll();
 }
 
-CFX_FloatRect CPWL_ComboBox::GetFocusRect() const {
-  return CFX_FloatRect();
+CPDF_Rect CPWL_ComboBox::GetFocusRect() const {
+  return CPDF_Rect();
 }
 
 void CPWL_ComboBox::SetPopup(FX_BOOL bPopup) {
   if (!m_pList)
     return;
   if (bPopup == m_bPopup)
     return;
   FX_FLOAT fListHeight = m_pList->GetContentRect().Height();
   if (!IsFloatBigger(fListHeight, 0.0f))
     return;
@@ skipping 12 matching lines @@
       if (m_pList->GetCount() > 3)
         fPopupMin =
             m_pList->GetFirstHeight() * 3 + m_pList->GetBorderWidth() * 2;
       FX_FLOAT fPopupMax = fListHeight + m_pList->GetBorderWidth() * 2;
       m_pFillerNotify->QueryWherePopup(GetAttachedData(), fPopupMin, fPopupMax,
                                        nWhere, fPopupRet);
 
       if (IsFloatBigger(fPopupRet, 0.0f)) {
         m_bPopup = bPopup;
 
-        CFX_FloatRect rcWindow = CPWL_Wnd::GetWindowRect();
+        CPDF_Rect rcWindow = CPWL_Wnd::GetWindowRect();
         m_rcOldWindow = rcWindow;
         switch (nWhere) {
           default:
           case 0:
             rcWindow.bottom -= fPopupRet;
             break;
           case 1:
             rcWindow.top += fPopupRet;
             break;
         }
@@ skipping 140 matching lines @@
 
 void CPWL_ComboBox::SetFillerNotify(IPWL_Filler_Notify* pNotify) {
   m_pFillerNotify = pNotify;
 
   if (m_pEdit)
     m_pEdit->SetFillerNotify(pNotify);
 
   if (m_pList)
     m_pList->SetFillerNotify(pNotify);
 }