Cleanup default FWL params part I

xfa/fwl/core/cfwl_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 "xfa/fwl/core/cfwl_combobox.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 106 matching lines @@
   }
 
   bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
   bool bRemoveDropDown = !!(dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown);
   if (bAddDropDown && !m_pEdit) {
     m_pEdit = pdfium::MakeUnique<CFWL_ComboEdit>(
         m_pOwnerApp, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
     m_pEdit->SetOuter(this);
     m_pEdit->SetParent(this);
   } else if (bRemoveDropDown && m_pEdit) {
-    m_pEdit->SetStates(FWL_WGTSTATE_Invisible, true);
+    m_pEdit->SetStates(FWL_WGTSTATE_Invisible);
   }
   CFWL_Widget::ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
 }
 
 void CFWL_ComboBox::Update() {
   if (m_pWidgetMgr->IsFormDisabled()) {
     DisForm_Update();
     return;
   }
   if (IsLocked())
@@ skipping 131 matching lines @@
     } else {
       CFWL_ListItem* hItem = m_pListBox->GetItem(this, iSel);
       CFX_WideString wsText = m_pListBox->GetDataProviderItemText(hItem);
       m_pEdit->SetText(wsText);
     }
     m_pEdit->Update();
   }
   m_iCurSel = bClearSel ? -1 : iSel;
 }
 
-void CFWL_ComboBox::SetStates(uint32_t dwStates, bool bSet) {
+void CFWL_ComboBox::SetStates(uint32_t dwStates) {
   if (IsDropDownStyle() && m_pEdit)
-    m_pEdit->SetStates(dwStates, bSet);
+    m_pEdit->SetStates(dwStates);
   if (m_pListBox)
-    m_pListBox->SetStates(dwStates, bSet);
-  CFWL_Widget::SetStates(dwStates, bSet);
+    m_pListBox->SetStates(dwStates);
+  CFWL_Widget::SetStates(dwStates);
+}
+
+void CFWL_ComboBox::RemoveStates(uint32_t dwStates) {
+  if (IsDropDownStyle() && m_pEdit)
+    m_pEdit->RemoveStates(dwStates);
+  if (m_pListBox)
+    m_pListBox->RemoveStates(dwStates);
+  CFWL_Widget::RemoveStates(dwStates);
 }
 
 void CFWL_ComboBox::SetEditText(const CFX_WideString& wsText) {
   if (!m_pEdit)
     return;
 
   m_pEdit->SetText(wsText);
   m_pEdit->Update();
 }
 
@@ skipping 17 matching lines @@
   if (m_pWidgetMgr->IsFormDisabled()) {
     DisForm_GetBBox(rect);
     return;
   }
 
   rect = m_pProperties->m_rtWidget;
   if (!m_pListBox || !IsDropListVisible())
     return;
 
   CFX_RectF rtList;
-  m_pListBox->GetWidgetRect(rtList);
+  m_pListBox->GetWidgetRect(rtList, false);
   rtList.Offset(rect.left, rect.top);
   rect.Union(rtList);
 }
 
 void CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded,
                                        uint32_t dwStylesExRemoved) {
   if (m_pEdit)
     m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
 }
 
@@ skipping 298 matching lines @@
     rtList.top = 0;
     rtList.height = 0;
     GetPopupPos(fPopupMin, fPopupMax, m_pProperties->m_rtWidget, rtList);
 
     m_pListBox->SetWidgetRect(rtList);
     m_pListBox->Update();
   } else {
     SetFocus(true);
   }
 
-  m_pListBox->SetStates(FWL_WGTSTATE_Invisible, !bActivate);
   if (bActivate) {
+    m_pListBox->RemoveStates(FWL_WGTSTATE_Invisible);
     CFWL_Event postEvent(CFWL_EventType::PostDropDown);
     postEvent.m_pSrcTarget = this;
     DispatchEvent(&postEvent);
+  } else {
+    m_pListBox->SetStates(FWL_WGTSTATE_Invisible);
   }
 
   CFX_RectF rect;
-  m_pListBox->GetWidgetRect(rect);
+  m_pListBox->GetWidgetRect(rect, false);
   rect.Inflate(2, 2);
   Repaint(&rect);
 }
 
 void CFWL_ComboBox::DisForm_ModifyStylesEx(uint32_t dwStylesExAdded,
                                            uint32_t dwStylesExRemoved) {
   if (!m_pEdit)
     DisForm_InitComboEdit();
 
   bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
@@ skipping 20 matching lines @@
 
 FWL_WidgetHit CFWL_ComboBox::DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   CFX_RectF rect;
   rect.Set(0, 0, m_pProperties->m_rtWidget.width - m_rtBtn.width,
            m_pProperties->m_rtWidget.height);
   if (rect.Contains(fx, fy))
     return FWL_WidgetHit::Edit;
   if (m_rtBtn.Contains(fx, fy))
     return FWL_WidgetHit::Client;
   if (DisForm_IsDropListVisible()) {
-    m_pListBox->GetWidgetRect(rect);
+    m_pListBox->GetWidgetRect(rect, false);
     if (rect.Contains(fx, fy))
       return FWL_WidgetHit::Client;
   }
   return FWL_WidgetHit::Unknown;
 }
 
 void CFWL_ComboBox::DisForm_DrawWidget(CFX_Graphics* pGraphics,
                                        const CFX_Matrix* pMatrix) {
   IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider;
   CFX_Matrix mtOrg;
   mtOrg.Set(1, 0, 0, 1, 0, 0);
   if (pMatrix)
     mtOrg = *pMatrix;
 
   pGraphics->SaveGraphState();
   pGraphics->ConcatMatrix(&mtOrg);
   if (!m_rtBtn.IsEmpty(0.1f)) {
     CFWL_ThemeBackground param;
     param.m_pWidget = this;
     param.m_iPart = CFWL_Part::DropDownButton;
     param.m_dwStates = m_iBtnState;
     param.m_pGraphics = pGraphics;
     param.m_rtPart = m_rtBtn;
     pTheme->DrawBackground(&param);
   }
   pGraphics->RestoreGraphState();
 
   if (m_pEdit) {
     CFX_RectF rtEdit;
-    m_pEdit->GetWidgetRect(rtEdit);
+    m_pEdit->GetWidgetRect(rtEdit, false);
     CFX_Matrix mt;
     mt.Set(1, 0, 0, 1, rtEdit.left, rtEdit.top);
     mt.Concat(mtOrg);
     m_pEdit->DrawWidget(pGraphics, &mt);
   }
   if (m_pListBox && DisForm_IsDropListVisible()) {
     CFX_RectF rtList;
-    m_pListBox->GetWidgetRect(rtList);
+    m_pListBox->GetWidgetRect(rtList, false);
     CFX_Matrix mt;
     mt.Set(1, 0, 0, 1, rtList.left, rtList.top);
     mt.Concat(mtOrg);
     m_pListBox->DrawWidget(pGraphics, &mt);
   }
 }
 
 void CFWL_ComboBox::DisForm_GetBBox(CFX_RectF& rect) const {
   rect = m_pProperties->m_rtWidget;
   if (!m_pListBox || !DisForm_IsDropListVisible())
     return;
 
   CFX_RectF rtList;
-  m_pListBox->GetWidgetRect(rtList);
+  m_pListBox->GetWidgetRect(rtList, false);
   rtList.Offset(rect.left, rect.top);
   rect.Union(rtList);
 }
 
 void CFWL_ComboBox::DisForm_Layout() {
   GetClientRect(m_rtClient);
   m_rtContent = m_rtClient;
   FX_FLOAT* pFWidth = static_cast<FX_FLOAT*>(
       GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
   if (!pFWidth)
@@ skipping 350 matching lines @@
       else
         iCurSel++;
     }
     m_iCurSel = iCurSel;
     SyncEditText(m_iCurSel);
     return;
   }
   if (m_pEdit)
     m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
 }