Re-land "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_IconList.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_IconList.h"
 
 #include "fpdfsdk/include/pdfwindow/PWL_Label.h"
 #include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
@@ skipping 15 matching lines @@
 CFX_ByteString CPWL_IconList_Item::GetClassName() const {
   return "CPWL_IconList_Item";
 }
 
 FX_FLOAT CPWL_IconList_Item::GetItemHeight(FX_FLOAT fLimitWidth) {
   return PWL_IconList_ITEM_HEIGHT;
 }
 
 void CPWL_IconList_Item::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                             CFX_Matrix* pUser2Device) {
-  CPDF_Rect rcClient = GetClientRect();
+  CFX_FloatRect rcClient = GetClientRect();
 
   if (m_bSelected) {
     if (IsEnabled()) {
       CPWL_Utils::DrawFillRect(
           pDevice, pUser2Device, rcClient,
           CPWL_Utils::PWLColorToFXColor(PWL_DEFAULT_SELBACKCOLOR,
                                         GetTransparency()));
     } else {
       CPWL_Utils::DrawFillRect(
           pDevice, pUser2Device, rcClient,
           CPWL_Utils::PWLColorToFXColor(PWL_DEFAULT_LIGHTGRAYCOLOR,
                                         GetTransparency()));
     }
   }
 
-  CPDF_Rect rcIcon = rcClient;
+  CFX_FloatRect rcIcon = rcClient;
   rcIcon.left += PWL_IconList_ITEM_ICON_LEFTMARGIN;
   rcIcon.right = rcIcon.left + PWL_IconList_ITEM_WIDTH;
 
   CPWL_Utils::DrawIconAppStream(pDevice, pUser2Device, m_nIconIndex, rcIcon,
                                 m_crIcon, m_pText->GetTextColor(),
                                 GetTransparency());
 }
 
 void CPWL_IconList_Item::SetSelect(FX_BOOL bSelected) {
   m_bSelected = bSelected;
@@ skipping 29 matching lines @@
 
 void CPWL_IconList_Item::SetText(const CFX_WideString& str) {
   m_pText->SetText(str.c_str());
 }
 
 CFX_WideString CPWL_IconList_Item::GetText() const {
   return m_pText->GetText();
 }
 
 void CPWL_IconList_Item::RePosChildWnd() {
-  CPDF_Rect rcClient = GetClientRect();
+  CFX_FloatRect rcClient = GetClientRect();
 
   rcClient.left +=
       (PWL_IconList_ITEM_ICON_LEFTMARGIN + PWL_IconList_ITEM_WIDTH +
        PWL_IconList_ITEM_ICON_LEFTMARGIN);
 
   m_pText->Move(rcClient, TRUE, FALSE);
 }
 
 void CPWL_IconList_Item::SetIconFillColor(const CPWL_Color& color) {
   m_crIcon = color;
@@ skipping 30 matching lines @@
     PWL_CREATEPARAM icp = cp;
     icp.pParentWnd = this;
     icp.dwFlags = PWS_CHILD | PWS_VISIBLE | PWS_NOREFRESHCLIP;
     pNewItem->Create(icp);
   }
 
   SetItemSpace(PWL_IconList_ITEM_SPACE);
   ResetContent(0);
 
   if (CPWL_Wnd* pParent = GetParentWindow()) {
-    CPDF_Rect rcScroll = GetScrollArea();
+    CFX_FloatRect rcScroll = GetScrollArea();
     GetScrollPos();
 
     PWL_SCROLL_INFO sInfo;
     sInfo.fContentMin = rcScroll.bottom;
     sInfo.fContentMax = rcScroll.top;
     sInfo.fPlateWidth = GetClientRect().Height();
     sInfo.fSmallStep = 13.0f;
     sInfo.fBigStep = sInfo.fPlateWidth;
 
     pParent->OnNotify(this, PNM_SETSCROLLINFO, SBT_VSCROLL, (intptr_t)&sInfo);
   }
 }
 
-FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CPDF_Point& point,
+FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CFX_FloatPoint& point,
                                              FX_DWORD nFlag) {
   SetFocus();
 
   SetCapture();
   m_bMouseDown = TRUE;
 
   int32_t nItemIndex = FindItemIndex(point);
   SetSelect(nItemIndex);
   ScrollToItem(nItemIndex);
 
   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();
 
   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);
     SetSelect(nItemIndex);
     ScrollToItem(nItemIndex);
   }
 
   return TRUE;
 }
 
@@ skipping 11 matching lines @@
         int32_t nItemIndex = m_nSelectIndex + 1;
         SetSelect(nItemIndex);
         ScrollToItem(nItemIndex);
       }
       return TRUE;
   }
 
   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;
       }
     }
   }
 
   return nIndex;
 }
 
 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;
       } else if (rcWnd.bottom < rcClient.bottom) {
         ptScroll.y = rcOrigin.bottom + rcClient.Height();
       }
 
       SetScrollPos(ptScroll);
       ResetFace();
       InvalidateRect();
@@ skipping 136 matching lines @@
                 RePosChildWnd();
               } else {
               }
             } else {
               if (pScrollBar->IsVisible()) {
                 pScrollBar->SetVisible(FALSE);
                 RePosChildWnd();
               }
 
               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);
           }
         }
         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);
         }
         return;
       case PNM_SETSCROLLPOS:
         if (CPWL_ScrollBar* pScrollBar = GetVScrollBar())
           pScrollBar->OnNotify(pWnd, PNM_SETSCROLLPOS, wParam, lParam);
         return;
     }
   }
@@ skipping 34 matching lines @@
 
 CFX_WideString CPWL_IconList::GetListString(int32_t nItemIndex) const {
   return m_pListContent->GetListString(nItemIndex);
 }
 
 void CPWL_IconList::SetIconFillColor(const CPWL_Color& color) {
   m_pListContent->SetIconFillColor(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;
     else
       ptNew.y -= 30;
 
     if (ptNew.y > rcScroll.top)
       ptNew.y = rcScroll.top;
     if (ptNew.y < rcScroll.bottom + rcContents.Height())
       ptNew.y = rcScroll.bottom + rcContents.Height();
     if (ptNew.y < rcScroll.bottom)
       ptNew.y = rcScroll.bottom;
 
     if (ptNew.y != ptScroll.y) {
       m_pListContent->SetScrollPos(ptNew);
       m_pListContent->ResetFace();
       m_pListContent->InvalidateRect(NULL);
 
       if (CPWL_ScrollBar* pScrollBar = GetVScrollBar())
         pScrollBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL,
                              (intptr_t)&ptNew.y);
 
       return TRUE;
     }
   }
 
   return FALSE;
 }