Cleanup FWL Event and Message code.

xfa/fwl/core/cfwl_scrollbar.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_scrollbar.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 97 matching lines @@
   DrawThumb(pGraphics, pTheme, pMatrix);
 }
 
 void CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) {
   m_fTrackPos = fTrackPos;
   CalcThumbButtonRect(m_rtThumb);
   CalcMinTrackRect(m_rtMinTrack);
   CalcMaxTrackRect(m_rtMaxTrack);
 }
 
-bool CFWL_ScrollBar::DoScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos) {
-  if (dwCode == FWL_SCBCODE::None)
+bool CFWL_ScrollBar::DoScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos) {
+  if (dwCode == CFWL_EvtScroll::Code::None)
     return false;
   return OnScroll(dwCode, fPos);
 }
 
 void CFWL_ScrollBar::DrawTrack(CFX_Graphics* pGraphics,
                                IFWL_ThemeProvider* pTheme,
                                bool bLower,
                                const CFX_Matrix* pMatrix) {
   CFWL_ThemeBackground param;
   param.m_pWidget = this;
@@ skipping 214 matching lines @@
   }
 
   FX_FLOAT fMaxTrackWidth = m_rtMaxTrack.width - fW - m_rtMaxBtn.width + 2;
   fMaxTrackWidth = (fMaxTrackWidth >= 0.0f) ? fMaxTrackWidth : 0.0f;
   rect.Set(m_rtMaxTrack.left + fW, m_rtMaxTrack.top, fMaxTrackWidth,
            m_rtMaxTrack.height);
 }
 
 bool CFWL_ScrollBar::SendEvent() {
   if (m_iMinButtonState == CFWL_PartState_Pressed) {
-    DoScroll(FWL_SCBCODE::StepBackward, m_fTrackPos);
+    DoScroll(CFWL_EvtScroll::Code::StepBackward, m_fTrackPos);
     return false;
   }
   if (m_iMaxButtonState == CFWL_PartState_Pressed) {
-    DoScroll(FWL_SCBCODE::StepForward, m_fTrackPos);
+    DoScroll(CFWL_EvtScroll::Code::StepForward, m_fTrackPos);
     return false;
   }
   if (m_iMinTrackState == CFWL_PartState_Pressed) {
-    DoScroll(FWL_SCBCODE::PageBackward, m_fTrackPos);
+    DoScroll(CFWL_EvtScroll::Code::PageBackward, m_fTrackPos);
     return m_rtThumb.Contains(m_cpTrackPointX, m_cpTrackPointY);
   }
   if (m_iMaxTrackState == CFWL_PartState_Pressed) {
-    DoScroll(FWL_SCBCODE::PageForward, m_fTrackPos);
+    DoScroll(CFWL_EvtScroll::Code::PageForward, m_fTrackPos);
     return m_rtThumb.Contains(m_cpTrackPointX, m_cpTrackPointY);
   }
   if (m_iMouseWheel) {
-    FWL_SCBCODE dwCode = m_iMouseWheel < 0 ? FWL_SCBCODE::StepForward
-                                           : FWL_SCBCODE::StepBackward;
+    CFWL_EvtScroll::Code dwCode = m_iMouseWheel < 0
+                                      ? CFWL_EvtScroll::Code::StepForward
+                                      : CFWL_EvtScroll::Code::StepBackward;
     DoScroll(dwCode, m_fTrackPos);
   }
   return true;
 }
 
-bool CFWL_ScrollBar::OnScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos) {
-  bool bRet = true;
-  CFWL_EvtScroll ev;
+bool CFWL_ScrollBar::OnScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos) {
+  CFWL_EvtScroll ev(this);
   ev.m_iScrollCode = dwCode;
-  ev.m_pSrcTarget = this;
   ev.m_fPos = fPos;
-  ev.m_pRet = &bRet;
   DispatchEvent(&ev);
-  return bRet;
+  return true;
 }
 
 void CFWL_ScrollBar::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
-  CFWL_MessageType dwMsgCode = pMessage->GetClassID();
-  if (dwMsgCode == CFWL_MessageType::Mouse) {
+  CFWL_Message::Type type = pMessage->GetType();
+  if (type == CFWL_Message::Type::Mouse) {
     CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
     switch (pMsg->m_dwCmd) {
       case FWL_MouseCommand::LeftButtonDown:
         OnLButtonDown(pMsg->m_dwFlags, pMsg->m_fx, pMsg->m_fy);
         break;
       case FWL_MouseCommand::LeftButtonUp:
         OnLButtonUp(pMsg->m_dwFlags, pMsg->m_fx, pMsg->m_fy);
         break;
       case FWL_MouseCommand::Move:
         OnMouseMove(pMsg->m_dwFlags, pMsg->m_fx, pMsg->m_fy);
         break;
       case FWL_MouseCommand::Leave:
         OnMouseLeave();
         break;
       default:
         break;
     }
-  } else if (dwMsgCode == CFWL_MessageType::MouseWheel) {
+  } else if (type == CFWL_Message::Type::MouseWheel) {
     CFWL_MsgMouseWheel* pMsg = static_cast<CFWL_MsgMouseWheel*>(pMessage);
     OnMouseWheel(pMsg->m_fx, pMsg->m_fy, pMsg->m_dwFlags, pMsg->m_fDeltaX,
                  pMsg->m_fDeltaY);
   }
 }
 
 void CFWL_ScrollBar::OnDrawWidget(CFX_Graphics* pGraphics,
                                   const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
@@ skipping 78 matching lines @@
                                int32_t& iState,
                                FX_FLOAT fx,
                                FX_FLOAT fy) {
   int32_t iNewState =
       rtItem.Contains(fx, fy) ? CFWL_PartState_Hovered : CFWL_PartState_Normal;
   if (iState == iNewState)
     return;
 
   iState = iNewState;
   Repaint(&rtItem);
-  OnScroll(FWL_SCBCODE::EndScroll, m_fTrackPos);
+  OnScroll(CFWL_EvtScroll::Code::EndScroll, m_fTrackPos);
 }
 
 void CFWL_ScrollBar::DoMouseMove(int32_t iItem,
                                  const CFX_RectF& rtItem,
                                  int32_t& iState,
                                  FX_FLOAT fx,
                                  FX_FLOAT fy) {
   if (!m_bMouseDown) {
     int32_t iNewState = rtItem.Contains(fx, fy) ? CFWL_PartState_Hovered
                                                 : CFWL_PartState_Normal;
     if (iState == iNewState)
       return;
 
     iState = iNewState;
     Repaint(&rtItem);
   } else if ((2 == iItem) && (m_iThumbButtonState == CFWL_PartState_Pressed)) {
     FX_FLOAT fPos = GetTrackPointPos(fx, fy);
     m_fTrackPos = fPos;
-    OnScroll(FWL_SCBCODE::TrackPos, fPos);
+    OnScroll(CFWL_EvtScroll::Code::TrackPos, fPos);
   }
 }
 
 void CFWL_ScrollBar::DoMouseLeave(int32_t iItem,
                                   const CFX_RectF& rtItem,
                                   int32_t& iState) {
   if (iState == CFWL_PartState_Normal)
     return;
 
   iState = CFWL_PartState_Normal;
@@ skipping 14 matching lines @@
 
 void CFWL_ScrollBar::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
   CFWL_ScrollBar* pButton = static_cast<CFWL_ScrollBar*>(m_pWidget);
 
   if (pButton->m_pTimerInfo)
     pButton->m_pTimerInfo->StopTimer();
 
   if (!pButton->SendEvent())
     pButton->m_pTimerInfo = StartTimer(0, true);
 }