Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/fxedit/fxet_list.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/fxedit/fxet_edit.h"
 #include "fpdfsdk/include/fxedit/fxet_list.h"
 
 CFX_ListItem::CFX_ListItem()
@@ skipping 137 matching lines @@
     return pListItem->GetEdit();
   }
 
   return NULL;
 }
 
 int32_t CFX_List::GetCount() const {
   return m_aListItems.GetSize();
 }
 
-CFX_FloatRect CFX_List::GetPlateRect() const {
+CPDF_Rect CFX_List::GetPlateRect() const {
   return CFX_ListContainer::GetPlateRect();
 }
 
-CFX_FloatRect CFX_List::GetContentRect() const {
+CPDF_Rect CFX_List::GetContentRect() const {
   return InnerToOuter(CFX_ListContainer::GetContentRect());
 }
 
 FX_FLOAT CFX_List::GetFontSize() const {
   return m_fFontSize;
 }
 
-int32_t CFX_List::GetItemIndex(const CFX_FloatPoint& point) const {
-  CFX_FloatPoint pt = OuterToInner(point);
+int32_t CFX_List::GetItemIndex(const CPDF_Point& point) const {
+  CPDF_Point pt = OuterToInner(point);
 
   FX_BOOL bFirst = TRUE;
   FX_BOOL bLast = TRUE;
 
   for (int32_t i = 0, sz = m_aListItems.GetSize(); i < sz; i++) {
     if (CFX_ListItem* pListItem = m_aListItems.GetAt(i)) {
       CLST_Rect rcListItem = pListItem->GetRect();
 
       if (FX_EDIT_IsFloatBigger(pt.y, rcListItem.top)) {
         bFirst = FALSE;
@@ skipping 61 matching lines @@
 
     if (CFX_ListItem* pListItem = m_aListItems.GetAt(nCircleIndex)) {
       if (Toupper(pListItem->GetFirstChar()) == Toupper(nChar))
         return nCircleIndex;
     }
   }
 
   return nCircleIndex;
 }
 
-CFX_FloatRect CFX_List::GetItemRect(int32_t nIndex) const {
+CPDF_Rect CFX_List::GetItemRect(int32_t nIndex) const {
   if (CFX_ListItem* pListItem = m_aListItems.GetAt(nIndex)) {
-    CFX_FloatRect rcItem = pListItem->GetRect();
+    CPDF_Rect rcItem = pListItem->GetRect();
     rcItem.left = 0.0f;
     rcItem.right = GetPlateRect().Width();
     return InnerToOuter(rcItem);
   }
 
-  return CFX_FloatRect();
+  return CPDF_Rect();
 }
 
 FX_BOOL CFX_List::IsItemSelected(int32_t nIndex) const {
   if (CFX_ListItem* pListItem = m_aListItems.GetAt(nIndex)) {
     return pListItem->IsSelected();
   }
 
   return FALSE;
 }
 
@@ skipping 144 matching lines @@
       m_nFootIndex(-1),
       m_bCtrlSel(FALSE),
       m_nCaretIndex(-1) {}
 
 CFX_ListCtrl::~CFX_ListCtrl() {}
 
 void CFX_ListCtrl::SetNotify(IFX_List_Notify* pNotify) {
   m_pNotify = pNotify;
 }
 
-CFX_FloatPoint CFX_ListCtrl::InToOut(const CFX_FloatPoint& point) const {
-  CFX_FloatRect rcPlate = GetPlateRect();
+CPDF_Point CFX_ListCtrl::InToOut(const CPDF_Point& point) const {
+  CPDF_Rect rcPlate = GetPlateRect();
 
-  return CFX_FloatPoint(point.x - (m_ptScrollPos.x - rcPlate.left),
-                        point.y - (m_ptScrollPos.y - rcPlate.top));
+  return CPDF_Point(point.x - (m_ptScrollPos.x - rcPlate.left),
+                    point.y - (m_ptScrollPos.y - rcPlate.top));
 }
 
-CFX_FloatPoint CFX_ListCtrl::OutToIn(const CFX_FloatPoint& point) const {
-  CFX_FloatRect rcPlate = GetPlateRect();
+CPDF_Point CFX_ListCtrl::OutToIn(const CPDF_Point& point) const {
+  CPDF_Rect rcPlate = GetPlateRect();
 
-  return CFX_FloatPoint(point.x + (m_ptScrollPos.x - rcPlate.left),
-                        point.y + (m_ptScrollPos.y - rcPlate.top));
+  return CPDF_Point(point.x + (m_ptScrollPos.x - rcPlate.left),
+                    point.y + (m_ptScrollPos.y - rcPlate.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));
+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));
 
-  return CFX_FloatRect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x,
-                       ptRightTop.y);
+  return CPDF_Rect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, ptRightTop.y);
 }
 
-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));
+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));
 
-  return CFX_FloatRect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x,
-                       ptRightTop.y);
+  return CPDF_Rect(ptLeftBottom.x, ptLeftBottom.y, ptRightTop.x, ptRightTop.y);
 }
 
-void CFX_ListCtrl::OnMouseDown(const CFX_FloatPoint& point,
+void CFX_ListCtrl::OnMouseDown(const CPDF_Point& point,
                                FX_BOOL bShift,
                                FX_BOOL bCtrl) {
   int32_t nHitIndex = GetItemIndex(point);
 
   if (IsMultipleSel()) {
     if (bCtrl) {
       if (IsItemSelected(nHitIndex)) {
         m_aSelItems.Sub(nHitIndex);
         SelectItems();
         m_bCtrlSel = FALSE;
@@ skipping 18 matching lines @@
 
     SetCaret(nHitIndex);
   } else {
     SetSingleSelect(nHitIndex);
   }
 
   if (!IsItemVisible(nHitIndex))
     ScrollToListItem(nHitIndex);
 }
 
-void CFX_ListCtrl::OnMouseMove(const CFX_FloatPoint& point,
+void CFX_ListCtrl::OnMouseMove(const CPDF_Point& point,
                                FX_BOOL bShift,
                                FX_BOOL bCtrl) {
   int32_t nHitIndex = GetItemIndex(point);
 
   if (IsMultipleSel()) {
     if (bCtrl) {
       if (m_bCtrlSel)
         m_aSelItems.Add(m_nFootIndex, nHitIndex);
       else
         m_aSelItems.Sub(m_nFootIndex, nHitIndex);
@@ skipping 67 matching lines @@
   int32_t nIndex = GetLastSelected();
   int32_t nFindIndex = FindNext(nIndex, nChar);
 
   if (nFindIndex != nIndex) {
     OnVK(nFindIndex, bShift, bCtrl);
     return TRUE;
   }
   return FALSE;
 }
 
-void CFX_ListCtrl::SetPlateRect(const CFX_FloatRect& rect) {
+void CFX_ListCtrl::SetPlateRect(const CPDF_Rect& rect) {
   CFX_ListContainer::SetPlateRect(rect);
   m_ptScrollPos.x = rect.left;
-  SetScrollPos(CFX_FloatPoint(rect.left, rect.top));
+  SetScrollPos(CPDF_Point(rect.left, rect.top));
   ReArrange(0);
   InvalidateItem(-1);
 }
 
-CFX_FloatRect CFX_ListCtrl::GetItemRect(int32_t nIndex) const {
+CPDF_Rect CFX_ListCtrl::GetItemRect(int32_t nIndex) const {
   return InToOut(CFX_List::GetItemRect(nIndex));
 }
 
 void CFX_ListCtrl::AddString(const FX_WCHAR* string) {
   AddItem(string);
   ReArrange(GetCount() - 1);
 }
 
 void CFX_ListCtrl::SetMultipleSelect(int32_t nItemIndex, FX_BOOL bSelected) {
   if (!IsValid(nItemIndex))
@@ skipping 43 matching lines @@
       InvalidateItem(nItemIndex);
     }
   }
 }
 
 void CFX_ListCtrl::InvalidateItem(int32_t nItemIndex) {
   if (m_pNotify) {
     if (nItemIndex == -1) {
       if (!m_bNotifyFlag) {
         m_bNotifyFlag = TRUE;
-        CFX_FloatRect rcRefresh = GetPlateRect();
+        CPDF_Rect rcRefresh = GetPlateRect();
         m_pNotify->IOnInvalidateRect(&rcRefresh);
         m_bNotifyFlag = FALSE;
       }
     } else {
       if (!m_bNotifyFlag) {
         m_bNotifyFlag = TRUE;
-        CFX_FloatRect rcRefresh = GetItemRect(nItemIndex);
+        CPDF_Rect rcRefresh = GetItemRect(nItemIndex);
         rcRefresh.left -= 1.0f;
         rcRefresh.right += 1.0f;
         rcRefresh.bottom -= 1.0f;
         rcRefresh.top += 1.0f;
 
         m_pNotify->IOnInvalidateRect(&rcRefresh);
         m_bNotifyFlag = FALSE;
       }
     }
   }
@@ skipping 23 matching lines @@
 
   if (IsMultipleSel()) {
     m_aSelItems.Add(nItemIndex);
     SelectItems();
   } else {
     SetSingleSelect(nItemIndex);
   }
 }
 
 FX_BOOL CFX_ListCtrl::IsItemVisible(int32_t nItemIndex) const {
-  CFX_FloatRect rcPlate = GetPlateRect();
-  CFX_FloatRect rcItem = GetItemRect(nItemIndex);
+  CPDF_Rect rcPlate = GetPlateRect();
+  CPDF_Rect rcItem = GetItemRect(nItemIndex);
 
   return rcItem.bottom >= rcPlate.bottom && rcItem.top <= rcPlate.top;
 }
 
 void CFX_ListCtrl::ScrollToListItem(int32_t nItemIndex) {
   if (!IsValid(nItemIndex))
     return;
 
-  CFX_FloatRect rcPlate = GetPlateRect();
-  CFX_FloatRect rcItem = CFX_List::GetItemRect(nItemIndex);
-  CFX_FloatRect rcItemCtrl = GetItemRect(nItemIndex);
+  CPDF_Rect rcPlate = GetPlateRect();
+  CPDF_Rect rcItem = CFX_List::GetItemRect(nItemIndex);
+  CPDF_Rect rcItemCtrl = GetItemRect(nItemIndex);
 
   if (FX_EDIT_IsFloatSmaller(rcItemCtrl.bottom, rcPlate.bottom)) {
     if (FX_EDIT_IsFloatSmaller(rcItemCtrl.top, rcPlate.top)) {
       SetScrollPosY(rcItem.bottom + rcPlate.Height());
     }
   } else if (FX_EDIT_IsFloatBigger(rcItemCtrl.top, rcPlate.top)) {
     if (FX_EDIT_IsFloatBigger(rcItemCtrl.bottom, rcPlate.bottom)) {
       SetScrollPosY(rcItem.top);
     }
   }
 }
 
 void CFX_ListCtrl::SetScrollInfo() {
   if (m_pNotify) {
-    CFX_FloatRect rcPlate = GetPlateRect();
-    CFX_FloatRect rcContent = CFX_List::GetContentRect();
+    CPDF_Rect rcPlate = GetPlateRect();
+    CPDF_Rect rcContent = CFX_List::GetContentRect();
 
     if (!m_bNotifyFlag) {
       m_bNotifyFlag = TRUE;
       m_pNotify->IOnSetScrollInfoY(rcPlate.bottom, rcPlate.top,
                                    rcContent.bottom, rcContent.top,
                                    GetFirstHeight(), rcPlate.Height());
       m_bNotifyFlag = FALSE;
     }
   }
 }
 
-void CFX_ListCtrl::SetScrollPos(const CFX_FloatPoint& point) {
+void CFX_ListCtrl::SetScrollPos(const CPDF_Point& point) {
   SetScrollPosY(point.y);
 }
 
 void CFX_ListCtrl::SetScrollPosY(FX_FLOAT fy) {
   if (!FX_EDIT_IsFloatEqual(m_ptScrollPos.y, fy)) {
-    CFX_FloatRect rcPlate = GetPlateRect();
-    CFX_FloatRect rcContent = CFX_List::GetContentRect();
+    CPDF_Rect rcPlate = GetPlateRect();
+    CPDF_Rect rcContent = CFX_List::GetContentRect();
 
     if (rcPlate.Height() > rcContent.Height()) {
       fy = rcPlate.top;
     } else {
       if (FX_EDIT_IsFloatSmaller(fy - rcPlate.Height(), rcContent.bottom)) {
         fy = rcContent.bottom + rcPlate.Height();
       } else if (FX_EDIT_IsFloatBigger(fy, rcContent.top)) {
         fy = rcContent.top;
       }
     }
 
     m_ptScrollPos.y = fy;
     InvalidateItem(-1);
 
     if (m_pNotify) {
       if (!m_bNotifyFlag) {
         m_bNotifyFlag = TRUE;
         m_pNotify->IOnSetScrollPosY(fy);
         m_bNotifyFlag = FALSE;
       }
     }
   }
 }
 
-CFX_FloatRect CFX_ListCtrl::GetContentRect() const {
+CPDF_Rect CFX_ListCtrl::GetContentRect() const {
   return InToOut(CFX_List::GetContentRect());
 }
 
 void CFX_ListCtrl::ReArrange(int32_t nItemIndex) {
   CFX_List::ReArrange(nItemIndex);
   SetScrollInfo();
 }
 
 void CFX_ListCtrl::SetTopItem(int32_t nIndex) {
   if (IsValid(nIndex)) {
     GetPlateRect();
-    CFX_FloatRect rcItem = CFX_List::GetItemRect(nIndex);
+    CPDF_Rect rcItem = CFX_List::GetItemRect(nIndex);
     SetScrollPosY(rcItem.top);
   }
 }
 
 int32_t CFX_ListCtrl::GetTopItem() const {
   int32_t nItemIndex = GetItemIndex(GetBTPoint());
 
   if (!IsItemVisible(nItemIndex) && IsItemVisible(nItemIndex + 1))
     nItemIndex += 1;
 
   return nItemIndex;
 }
 
 void CFX_ListCtrl::Empty() {
   CFX_List::Empty();
   InvalidateItem(-1);
 }
 
 void CFX_ListCtrl::Cancel() {
   m_aSelItems.DeselectAll();
 }
 
-int32_t CFX_ListCtrl::GetItemIndex(const CFX_FloatPoint& point) const {
+int32_t CFX_ListCtrl::GetItemIndex(const CPDF_Point& point) const {
   return CFX_List::GetItemIndex(OutToIn(point));
 }
 
 CFX_WideString CFX_ListCtrl::GetText() const {
   if (IsMultipleSel())
     return GetItemText(m_nCaretIndex);
   return GetItemText(m_nSelItem);
 }