IFWL method and param cleanup

xfa/fwl/core/ifwl_form.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 "xfa/fwl/core/ifwl_form.h"
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
@@ skipping 23 matching lines @@
 }  // namespace
 
 RestoreInfo::RestoreInfo() {}
 
 RestoreInfo::~RestoreInfo() {}
 
 IFWL_Form::IFWL_Form(const IFWL_App* app,
                      std::unique_ptr<CFWL_WidgetProperties> properties,
                      IFWL_Widget* pOuter)
     : IFWL_Widget(app, std::move(properties), pOuter),
+#if (_FX_OS_ == _FX_MACOSX_)
+      m_bMouseIn(false),
+#endif
       m_pCloseBox(nullptr),
       m_pMinBox(nullptr),
       m_pMaxBox(nullptr),
       m_pCaptionBox(nullptr),
       m_pSubFocus(nullptr),
       m_fCXBorder(0),
       m_fCYBorder(0),
       m_iCaptureBtn(-1),
       m_iSysBox(0),
       m_eResizeType(FORM_RESIZETYPE_None),
       m_bLButtonDown(false),
       m_bMaximized(false),
       m_bSetMaximize(false),
       m_bCustomizeLayout(false),
-      m_eFormSize(FWL_FORMSIZE_Manual),
       m_bDoModalFlag(false),
       m_pBigIcon(nullptr),
-      m_pSmallIcon(nullptr),
-      m_bMouseIn(false) {
+      m_pSmallIcon(nullptr) {
   m_rtRelative.Reset();
   m_rtCaption.Reset();
   m_rtRestore.Reset();
   m_rtCaptionText.Reset();
   m_rtIcon.Reset();
 
   RegisterForm();
   RegisterEventTarget();
 }
 
@@ skipping 239 matching lines @@
     if (m_pMinBox) {
       param.m_iPart = CFWL_Part::MinimizeBox;
       param.m_dwStates = m_pMinBox->GetPartState();
       param.m_rtPart = m_pMinBox->m_rtBtn;
       pTheme->DrawBackground(&param);
     }
   }
 #endif
 }
 
-FWL_FORMSIZE IFWL_Form::GetFormSize() {
-  return m_eFormSize;
-}
-
-FWL_Error IFWL_Form::SetFormSize(FWL_FORMSIZE eFormSize) {
-  m_eFormSize = eFormSize;
-  return FWL_Error::Succeeded;
-}
-
 IFWL_Widget* IFWL_Form::DoModal() {
   const IFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return nullptr;
 
   CFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
   if (!pDriver)
     return nullptr;
 
   m_pNoteLoop.reset(new CFWL_NoteLoop(this));
   pDriver->PushNoteLoop(m_pNoteLoop.get());
   m_bDoModalFlag = true;
   SetStates(FWL_WGTSTATE_Invisible, false);
   pDriver->Run();
 #if (_FX_OS_ == _FX_MACOSX_)
 #else
   pDriver->PopNoteLoop();
 #endif
   m_pNoteLoop.reset();
   return nullptr;
 }
 
-IFWL_Widget* IFWL_Form::DoModal(uint32_t& dwCommandID) {
-  return DoModal();
-}
-
-FWL_Error IFWL_Form::EndDoModal() {
+void IFWL_Form::EndDoModal() {
   if (!m_pNoteLoop)
-    return FWL_Error::Indefinite;
+    return;
   m_bDoModalFlag = false;
 #if (_FX_OS_ == _FX_MACOSX_)
   m_pNoteLoop->EndModalLoop();
   const IFWL_App* pApp = GetOwnerApp();
   if (!pApp)
-    return FWL_Error::Indefinite;
+    return;
 
   CFWL_NoteDriver* pDriver =
       static_cast<CFWL_NoteDriver*>(pApp->GetNoteDriver());
   if (!pDriver)
-    return FWL_Error::Indefinite;
+    return;
 
   pDriver->PopNoteLoop();
   SetStates(FWL_WGTSTATE_Invisible, true);
-  return FWL_Error::Succeeded;
 #else
   SetStates(FWL_WGTSTATE_Invisible, true);
-  return m_pNoteLoop->EndModalLoop();
+  m_pNoteLoop->EndModalLoop();
 #endif
 }
 
-FWL_Error IFWL_Form::SetBorderRegion(CFX_Path* pPath) {
-  return FWL_Error::Succeeded;
-}
 void IFWL_Form::DrawBackground(CFX_Graphics* pGraphics,
                                IFWL_ThemeProvider* pTheme) {
   CFWL_ThemeBackground param;
   param.m_pWidget = this;
   param.m_iPart = CFWL_Part::Background;
   param.m_pGraphics = pGraphics;
   param.m_rtPart = m_rtRelative;
   param.m_rtPart.Deflate(m_fCYBorder, m_rtCaption.height, m_fCYBorder,
                          m_fCXBorder);
   pTheme->DrawBackground(&param);
 }
-IFWL_Widget* IFWL_Form::GetSubFocus() {
-  return m_pSubFocus;
-}
-void IFWL_Form::SetSubFocus(IFWL_Widget* pWidget) {
-  m_pSubFocus = pWidget;
-}
-
-void IFWL_Form::ShowChildWidget(IFWL_Widget* pParent) {
-  const IFWL_App* pApp = pParent->GetOwnerApp();
-  if (!pApp)
-    return;
-
-  CFWL_WidgetMgr* pWidgetMgr = pApp->GetWidgetMgr();
-  if (!pWidgetMgr)
-    return;
-
-  IFWL_Widget* pChild = pWidgetMgr->GetFirstChildWidget(pParent);
-  while (pChild) {
-    ShowChildWidget(pChild);
-    pChild = pWidgetMgr->GetNextSiblingWidget(pChild);
-  }
-}
 
 void IFWL_Form::RemoveSysButtons() {
   m_rtCaption.Reset();
   delete m_pCloseBox;
   m_pCloseBox = nullptr;
   delete m_pMinBox;
   m_pMinBox = nullptr;
   delete m_pMaxBox;
   m_pMaxBox = nullptr;
   delete m_pCaptionBox;
   m_pCaptionBox = nullptr;
 }
 
-void IFWL_Form::CalcContentRect(CFX_RectF& rtContent) {
-#ifdef FWL_UseMacSystemBorder
-  rtContent = m_rtRelative;
-#else
-  GetEdgeRect(rtContent);
-  if (HasEdge()) {
-    FX_FLOAT fEdge = GetEdgeWidth();
-    rtContent.Deflate(fEdge, fEdge);
-  }
-#endif
-}
 CFWL_SysBtn* IFWL_Form::GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_pCloseBox && m_pCloseBox->m_rtBtn.Contains(fx, fy)) {
     return m_pCloseBox;
   }
   if (m_pMaxBox && m_pMaxBox->m_rtBtn.Contains(fx, fy)) {
     return m_pMaxBox;
   }
   if (m_pMinBox && m_pMinBox->m_rtBtn.Contains(fx, fy)) {
     return m_pMinBox;
   }
@@ skipping 120 matching lines @@
   }
 }
 void IFWL_Form::SetWorkAreaRect() {
   m_rtRestore = m_pProperties->m_rtWidget;
   CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr();
   if (!pWidgetMgr)
     return;
   m_bSetMaximize = true;
   Repaint(&m_rtRelative);
 }
-void IFWL_Form::SetCursor(FX_FLOAT fx, FX_FLOAT fy) {}
+
 void IFWL_Form::Layout() {
   GetRelativeRect(m_rtRelative);
 #ifndef FWL_UseMacSystemBorder
-  ReSetSysBtn();
+  ResetSysBtn();
 #endif
 }
-void IFWL_Form::ReSetSysBtn() {
+void IFWL_Form::ResetSysBtn() {
   m_fCXBorder =
       *static_cast<FX_FLOAT*>(GetThemeCapacity(CFWL_WidgetCapacity::CXBorder));
   m_fCYBorder =
       *static_cast<FX_FLOAT*>(GetThemeCapacity(CFWL_WidgetCapacity::CYBorder));
   RemoveSysButtons();
   IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider;
   m_bCustomizeLayout = pTheme->IsCustomizedLayout(this);
   FX_FLOAT fCapHeight = GetCaptionHeight();
   if (fCapHeight > 0) {
     m_rtCaption = m_rtRelative;
@@ skipping 70 matching lines @@
   if (!pApp)
     return;
 
   CFWL_NoteDriver* pDriver =
       static_cast<CFWL_NoteDriver*>(pApp->GetNoteDriver());
   if (!pDriver)
     return;
 
   pDriver->UnRegisterForm(this);
 }
-bool IFWL_Form::IsDoModal() {
-  return m_bDoModalFlag;
-}
+
 void IFWL_Form::SetThemeData() {
   m_fSmallIconSz =
       *static_cast<FX_FLOAT*>(GetThemeCapacity(CFWL_WidgetCapacity::SmallIcon));
   m_fBigIconSz =
       *static_cast<FX_FLOAT*>(GetThemeCapacity(CFWL_WidgetCapacity::BigIcon));
 }
 bool IFWL_Form::HasIcon() {
   IFWL_FormDP* pData =
       static_cast<IFWL_FormDP*>(m_pProperties->m_pDataProvider);
   return !!pData->GetIcon(this, false);
@@ skipping 14 matching lines @@
 void IFWL_Form::UpdateCaption() {
   CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr();
   if (!pWidgetMgr)
     return;
   IFWL_DataProvider* pData = m_pProperties->m_pDataProvider;
   if (!pData)
     return;
   CFX_WideString text;
   pData->GetCaption(this, text);
 }
-void IFWL_Form::DoWidthLimit(FX_FLOAT& fLeft,
-                             FX_FLOAT& fWidth,
-                             FX_FLOAT fCurX,
-                             FX_FLOAT fSpace,
-                             FX_FLOAT fLimitMin,
-                             FX_FLOAT fLimitMax,
-                             bool bLeft) {
-  FX_FLOAT fx = fCurX;
-  FX_FLOAT fy = 0;
-  TransformTo(nullptr, fx, fy);
-  FX_FLOAT fTemp =
-      bLeft ? (fWidth - fx + fLeft + fSpace) : (fx - fLeft + fSpace);
-  if (fTemp >= fLimitMin && fTemp <= fLimitMax) {
-    fWidth = fTemp;
-    fLeft += bLeft ? (fx - fLeft - fSpace) : 0;
-  } else {
-    if (fTemp < fLimitMin && fWidth > fLimitMin) {
-      fLeft += bLeft ? (fWidth - fLimitMin) : 0;
-      fWidth = fLimitMin;
-    } else if (fTemp > fLimitMax && fWidth < fLimitMax) {
-      fLeft -= bLeft ? (fLimitMax - fWidth) : 0;
-      fWidth = fLimitMax;
-    }
-  }
-}
-void IFWL_Form::DoHeightLimit(FX_FLOAT& fTop,
-                              FX_FLOAT& fHeight,
-                              FX_FLOAT fCurY,
-                              FX_FLOAT fSpace,
-                              FX_FLOAT fLimitMin,
-                              FX_FLOAT fLimitMax,
-                              bool bTop) {
-  FX_FLOAT fx = 0;
-  FX_FLOAT fy = fCurY;
-  TransformTo(nullptr, fx, fy);
-  FX_FLOAT fTemp = bTop ? (fHeight - fy + fTop + fSpace) : (fy - fTop + fSpace);
-  if (fTemp >= fLimitMin && fTemp <= fLimitMax) {
-    fHeight = fTemp;
-    fTop += bTop ? (fy - fTop - fSpace) : 0;
-  } else {
-    if (fTemp < fLimitMin && fHeight > fLimitMin) {
-      fTop += bTop ? (fHeight - fLimitMin) : 0;
-      fHeight = fLimitMin;
-    } else if (fTemp > fLimitMax && fHeight < fLimitMax) {
-      fTop -= bTop ? (fLimitMax - fHeight) : 0;
-      fHeight = fLimitMax;
-    }
-  }
-}
 
 #ifdef FWL_UseMacSystemBorder
 void IFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
   switch (pMessage->GetClassID()) {
     case CFWL_MessageType::Activate: {
       m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;
       Repaint(&m_rtRelative);
@@ skipping 50 matching lines @@
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
           break;
         case FWL_MouseCommand::LeftButtonUp:
           OnLButtonUp(pMsg);
           break;
         case FWL_MouseCommand::Move:
           OnMouseMove(pMsg);
           break;
-        case FWL_MouseCommand::Hover:
-          OnMouseHover(pMsg);
-          break;
         case FWL_MouseCommand::Leave:
           OnMouseLeave(pMsg);
           break;
         case FWL_MouseCommand::LeftButtonDblClk:
           OnLButtonDblClk(pMsg);
           break;
         default:
           break;
       }
       break;
@@ skipping 42 matching lines @@
   CFX_RectF rtCap;
   rtCap.Set(m_rtCaption.left + m_fCYBorder, m_rtCaption.top + m_fCXBorder,
             m_rtCaption.width - kSystemButtonSize * m_iSysBox - 2 * m_fCYBorder,
             m_rtCaption.height - m_fCXBorder);
 
   if (pPressBtn) {
     pPressBtn->SetPressed();
     Repaint(&pPressBtn->m_rtBtn);
   } else if (rtCap.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_eResizeType = FORM_RESIZETYPE_Cap;
-  } else if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_Border) &&
-             (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_Resize) &&
-             !m_bMaximized) {
-    SetCursor(pMsg->m_fx, pMsg->m_fy);
   }
   m_InfoStart.m_ptStart = CFX_PointF(pMsg->m_fx, pMsg->m_fy);
   m_InfoStart.m_szStart = CFX_SizeF(m_pProperties->m_rtWidget.width,
                                     m_pProperties->m_rtWidget.height);
 }
 
 void IFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   SetGrab(false);
   m_bLButtonDown = false;
   CFWL_SysBtn* pPointBtn = GetSysBtnAtPoint(pMsg->m_fx, pMsg->m_fy);
@@ skipping 16 matching lines @@
     CFWL_EvtClose eClose;
     eClose.m_pSrcTarget = this;
     DispatchEvent(&eClose);
   }
 }
 
 void IFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
   if (m_bLButtonDown)
     return;
 
-  if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_Border) &&
-      (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_Resize) &&
-      !m_bMaximized) {
-    SetCursor(pMsg->m_fx, pMsg->m_fy);
-  }
   CFX_RectF rtInvalidate;
   rtInvalidate.Reset();
   CFWL_SysBtn* pPointBtn = GetSysBtnAtPoint(pMsg->m_fx, pMsg->m_fy);
   CFWL_SysBtn* pOldHover = GetSysBtnByState(FWL_SYSBUTTONSTATE_Hover);
 #if (_FX_OS_ == _FX_MACOSX_)
   {
     if (pOldHover && pPointBtn != pOldHover)
       pOldHover->SetNormal();
     if (pPointBtn && pPointBtn != pOldHover)
       pPointBtn->SetHover();
@@ skipping 28 matching lines @@
         rtInvalidate = pPointBtn->m_rtBtn;
       else
         rtInvalidate.Union(pPointBtn->m_rtBtn);
     }
   }
 #endif
   if (!rtInvalidate.IsEmpty())
     Repaint(&rtInvalidate);
 }
 
-void IFWL_Form::OnMouseHover(CFWL_MsgMouse* pMsg) {
-  SetCursor(pMsg->m_fx, pMsg->m_fy);
-}
-
 void IFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   CFWL_SysBtn* pHover = GetSysBtnByState(FWL_SYSBUTTONSTATE_Hover);
   if (pHover) {
     pHover->SetNormal();
     Repaint(&pHover->m_rtBtn);
   }
-  if (pMsg->m_dwCmd == FWL_MouseCommand::Leave && !m_bLButtonDown)
-    SetCursor(pMsg->m_fx, pMsg->m_fy);
 }
 
 void IFWL_Form::OnLButtonDblClk(CFWL_MsgMouse* pMsg) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_Resize) &&
       HitTest(pMsg->m_fx, pMsg->m_fy) == FWL_WidgetHit::Titlebar) {
     if (m_bMaximized)
       SetWidgetRect(m_rtRestore);
     else
       SetWorkAreaRect();
 
@@ skipping 43 matching lines @@
 
 uint32_t CFWL_SysBtn::GetPartState() const {
   if (IsDisabled())
     return CFWL_PartState_Disabled;
   if (m_dwState & FWL_SYSBUTTONSTATE_Pressed)
     return CFWL_PartState_Pressed;
   if (m_dwState & FWL_SYSBUTTONSTATE_Hover)
     return CFWL_PartState_Hovered;
   return CFWL_PartState_Normal;
 }