Cleanup FWL default values part II.

xfa/fwl/core/cfwl_spinbutton.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_spinbutton.h"
 
 #include <memory>
 #include <utility>
@@ skipping 96 matching lines @@
   IFWL_ThemeProvider* pTheme = GetAvailableTheme();
   if (HasBorder())
     DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix);
   if (HasEdge())
     DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix);
 
   DrawUpButton(pGraphics, pTheme, pMatrix);
   DrawDownButton(pGraphics, pTheme, pMatrix);
 }
 
-void CFWL_SpinButton::EnableButton(bool bEnable, bool bUp) {
-  if (bUp)
-    m_dwUpState = bEnable ? CFWL_PartState_Normal : CFWL_PartState_Disabled;
-  else
-    m_dwDnState = bEnable ? CFWL_PartState_Normal : CFWL_PartState_Disabled;
+void CFWL_SpinButton::DisableButton() {
+  m_dwDnState = CFWL_PartState_Disabled;
 }
 
-bool CFWL_SpinButton::IsButtonEnabled(bool bUp) {
-  if (bUp)
-    return (m_dwUpState != CFWL_PartState_Disabled);
-  return (m_dwDnState != CFWL_PartState_Disabled);
+bool CFWL_SpinButton::IsUpButtonEnabled() {
+  return m_dwUpState != CFWL_PartState_Disabled;
+}
+
+bool CFWL_SpinButton::IsDownButtonEnabled() {
+  return m_dwDnState != CFWL_PartState_Disabled;
 }
 
 void CFWL_SpinButton::DrawUpButton(CFX_Graphics* pGraphics,
                                    IFWL_ThemeProvider* pTheme,
                                    const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground params;
   params.m_pWidget = this;
   params.m_iPart = CFWL_Part::UpButton;
   params.m_pGraphics = pGraphics;
   params.m_dwStates = m_dwUpState + 1;
@@ skipping 77 matching lines @@
 
   Repaint(&m_rtClient);
 }
 
 void CFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   m_bLButtonDwn = true;
   SetGrab(true);
   SetFocus(true);
 
   bool bUpPress =
-      (m_rtUpButton.Contains(pMsg->m_fx, pMsg->m_fy) && IsButtonEnabled(true));
+      (m_rtUpButton.Contains(pMsg->m_fx, pMsg->m_fy) && IsUpButtonEnabled());
   bool bDnPress =
-      (m_rtDnButton.Contains(pMsg->m_fx, pMsg->m_fy) && IsButtonEnabled(false));
+      (m_rtDnButton.Contains(pMsg->m_fx, pMsg->m_fy) && IsDownButtonEnabled());
   if (!bUpPress && !bDnPress)
     return;
   if (bUpPress) {
     m_iButtonIndex = 0;
     m_dwUpState = CFWL_PartState_Pressed;
   }
   if (bDnPress) {
     m_iButtonIndex = 1;
     m_dwDnState = CFWL_PartState_Pressed;
   }
@@ skipping 11 matching lines @@
 
   m_bLButtonDwn = false;
   SetGrab(false);
   SetFocus(false);
   if (m_pTimerInfo) {
     m_pTimerInfo->StopTimer();
     m_pTimerInfo = nullptr;
   }
   bool bRepaint = false;
   CFX_RectF rtInvalidate;
-  if (m_dwUpState == CFWL_PartState_Pressed && IsButtonEnabled(true)) {
+  if (m_dwUpState == CFWL_PartState_Pressed && IsUpButtonEnabled()) {
     m_dwUpState = CFWL_PartState_Normal;
     bRepaint = true;
     rtInvalidate = m_rtUpButton;
-  } else if (m_dwDnState == CFWL_PartState_Pressed && IsButtonEnabled(false)) {
+  } else if (m_dwDnState == CFWL_PartState_Pressed && IsDownButtonEnabled()) {
     m_dwDnState = CFWL_PartState_Normal;
     bRepaint = true;
     rtInvalidate = m_rtDnButton;
   }
   if (bRepaint)
     Repaint(&rtInvalidate);
 }
 
 void CFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
   if (m_bLButtonDwn)
     return;
 
   bool bRepaint = false;
   CFX_RectF rtInvlidate;
   rtInvlidate.Reset();
   if (m_rtUpButton.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    if (IsButtonEnabled(true)) {
+    if (IsUpButtonEnabled()) {
       if (m_dwUpState == CFWL_PartState_Hovered) {
         m_dwUpState = CFWL_PartState_Hovered;
         bRepaint = true;
         rtInvlidate = m_rtUpButton;
       }
-      if (m_dwDnState != CFWL_PartState_Normal && IsButtonEnabled(false)) {
+      if (m_dwDnState != CFWL_PartState_Normal && IsDownButtonEnabled()) {
         m_dwDnState = CFWL_PartState_Normal;
         if (bRepaint)
           rtInvlidate.Union(m_rtDnButton);
         else
           rtInvlidate = m_rtDnButton;
 
         bRepaint = true;
       }
     }
-    if (!IsButtonEnabled(false))
-      EnableButton(false, false);
+    if (!IsDownButtonEnabled())
+      DisableButton();
 
   } else if (m_rtDnButton.Contains(pMsg->m_fx, pMsg->m_fy)) {
-    if (IsButtonEnabled(false)) {
+    if (IsDownButtonEnabled()) {
       if (m_dwDnState != CFWL_PartState_Hovered) {
         m_dwDnState = CFWL_PartState_Hovered;
         bRepaint = true;
         rtInvlidate = m_rtDnButton;
       }
-      if (m_dwUpState != CFWL_PartState_Normal && IsButtonEnabled(true)) {
+      if (m_dwUpState != CFWL_PartState_Normal && IsUpButtonEnabled()) {
         m_dwUpState = CFWL_PartState_Normal;
         if (bRepaint)
           rtInvlidate.Union(m_rtUpButton);
         else
           rtInvlidate = m_rtUpButton;
         bRepaint = true;
       }
     }
   } else if (m_dwUpState != CFWL_PartState_Normal ||
              m_dwDnState != CFWL_PartState_Normal) {
@@ skipping 12 matching lines @@
       bRepaint = true;
     }
   }
   if (bRepaint)
     Repaint(&rtInvlidate);
 }
 
 void CFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   if (!pMsg)
     return;
-  if (m_dwUpState != CFWL_PartState_Normal && IsButtonEnabled(true))
+  if (m_dwUpState != CFWL_PartState_Normal && IsUpButtonEnabled())
     m_dwUpState = CFWL_PartState_Normal;
-  if (m_dwDnState != CFWL_PartState_Normal && IsButtonEnabled(false))
+  if (m_dwDnState != CFWL_PartState_Normal && IsDownButtonEnabled())
     m_dwDnState = CFWL_PartState_Normal;
 
   Repaint(&m_rtClient);
 }
 
 void CFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) {
   bool bUp =
       pMsg->m_dwKeyCode == FWL_VKEY_Up || pMsg->m_dwKeyCode == FWL_VKEY_Left;
   bool bDown =
       pMsg->m_dwKeyCode == FWL_VKEY_Down || pMsg->m_dwKeyCode == FWL_VKEY_Right;
   if (!bUp && !bDown)
     return;
 
-  bool bUpEnable = IsButtonEnabled(true);
-  bool bDownEnable = IsButtonEnabled(false);
+  bool bUpEnable = IsUpButtonEnabled();
+  bool bDownEnable = IsDownButtonEnabled();
   if (!bUpEnable && !bDownEnable)
     return;
 
   CFWL_Event wmPosChanged(CFWL_Event::Type::Click, this);
   DispatchEvent(&wmPosChanged);
 
   Repaint(bUpEnable ? &m_rtUpButton : &m_rtDnButton);
 }
 
 CFWL_SpinButton::Timer::Timer(CFWL_SpinButton* pToolTip)
     : CFWL_Timer(pToolTip) {}
 
 void CFWL_SpinButton::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
   CFWL_SpinButton* pButton = static_cast<CFWL_SpinButton*>(m_pWidget);
 
   if (!pButton->m_pTimerInfo)
     return;
 
   CFWL_Event wmPosChanged(CFWL_Event::Type::Click, pButton);
   pButton->DispatchEvent(&wmPosChanged);
 }