Cleanup default FWL params part I

xfa/fwl/core/cfwl_listbox.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_listbox.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 78 matching lines @@
     m_dwTTOStyles |= FDE_TTOSTYLE_RTL;
 
   m_dwTTOStyles |= FDE_TTOSTYLE_SingleLine;
   m_fScorllBarWidth = GetScrollWidth();
   CalcSize();
 }
 
 FWL_WidgetHit CFWL_ListBox::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (IsShowScrollBar(false)) {
     CFX_RectF rect;
-    m_pHorzScrollBar->GetWidgetRect(rect);
+    m_pHorzScrollBar->GetWidgetRect(rect, false);
     if (rect.Contains(fx, fy))
       return FWL_WidgetHit::HScrollBar;
   }
   if (IsShowScrollBar(true)) {
     CFX_RectF rect;
-    m_pVertScrollBar->GetWidgetRect(rect);
+    m_pVertScrollBar->GetWidgetRect(rect, false);
     if (rect.Contains(fx, fy))
       return FWL_WidgetHit::VScrollBar;
   }
   if (m_rtClient.Contains(fx, fy))
     return FWL_WidgetHit::Client;
   return FWL_WidgetHit::Unknown;
 }
 
 void CFWL_ListBox::DrawWidget(CFX_Graphics* pGraphics,
                               const CFX_Matrix* pMatrix) {
@@ skipping 522 matching lines @@
     m_pVertScrollBar->SetPageSize(rtScrollBar.height * 9 / 10);
     m_pVertScrollBar->SetStepSize(m_fItemHeight);
 
     FX_FLOAT fPos =
         std::min(std::max(m_pVertScrollBar->GetPos(), 0.f), szRange.y);
     m_pVertScrollBar->SetPos(fPos);
     m_pVertScrollBar->SetTrackPos(fPos);
     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ==
             0 ||
         (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused)) {
-      m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible, false);
+      m_pVertScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
     }
     m_pVertScrollBar->Update();
   } else if (m_pVertScrollBar) {
     m_pVertScrollBar->SetPos(0);
     m_pVertScrollBar->SetTrackPos(0);
-    m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible, true);
+    m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible);
   }
   if (bShowHorzScr) {
     if (!m_pHorzScrollBar)
       InitScrollBar(false);
 
     CFX_RectF rtScrollBar;
     rtScrollBar.Set(m_rtClient.left, m_rtClient.bottom() - m_fScorllBarWidth,
                     m_rtClient.width, m_fScorllBarWidth);
     if (bShowVertScr)
       rtScrollBar.width -= m_fScorllBarWidth;
 
     m_pHorzScrollBar->SetWidgetRect(rtScrollBar);
     szRange.x = 0, szRange.y = fs.x - rtScrollBar.width;
     m_pHorzScrollBar->SetRange(szRange.x, szRange.y);
     m_pHorzScrollBar->SetPageSize(fWidth * 9 / 10);
     m_pHorzScrollBar->SetStepSize(fWidth / 10);
 
     FX_FLOAT fPos =
         std::min(std::max(m_pHorzScrollBar->GetPos(), 0.f), szRange.y);
     m_pHorzScrollBar->SetPos(fPos);
     m_pHorzScrollBar->SetTrackPos(fPos);
     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ==
             0 ||
         (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused)) {
-      m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible, false);
+      m_pHorzScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
     }
     m_pHorzScrollBar->Update();
   } else if (m_pHorzScrollBar) {
     m_pHorzScrollBar->SetPos(0);
     m_pHorzScrollBar->SetTrackPos(0);
-    m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible, true);
+    m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible);
   }
   if (bShowVertScr && bShowHorzScr) {
     m_rtStatic.Set(m_rtClient.right() - m_fScorllBarWidth,
                    m_rtClient.bottom() - m_fScorllBarWidth, m_fScorllBarWidth,
                    m_fScorllBarWidth);
   }
   return fs;
 }
 
 void CFWL_ListBox::GetItemSize(CFX_SizeF& size,
@@ skipping 128 matching lines @@
   }
 }
 
 void CFWL_ListBox::OnDrawWidget(CFX_Graphics* pGraphics,
                                 const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
 
 void CFWL_ListBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (GetStylesEx() & FWL_STYLEEXT_LTB_ShowScrollBarFocus) {
-    if (m_pVertScrollBar)
-      m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible, !bSet);
-    if (m_pHorzScrollBar)
-      m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible, !bSet);
+    if (m_pVertScrollBar) {
+      if (bSet)
+        m_pVertScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+      else
+        m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+    }
+    if (m_pHorzScrollBar) {
+      if (bSet)
+        m_pHorzScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+      else
+        m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+    }
   }
   if (bSet)
     m_pProperties->m_dwStates |= (FWL_WGTSTATE_Focused);
   else
     m_pProperties->m_dwStates &= ~(FWL_WGTSTATE_Focused);
 
   Repaint(&m_rtClient);
 }
 
 void CFWL_ListBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
@@ skipping 275 matching lines @@
 void CFWL_ListBox::DeleteAll() {
   m_ItemArray.clear();
 }
 
 uint32_t CFWL_ListBox::GetItemStates(CFWL_ListItem* pItem) {
   if (!pItem)
     return 0;
   return pItem->m_dwStates | pItem->m_dwCheckState;
 }