Tidy type enum for CPWL_SBButton. Bring more in line with style guide. Change-Id: I9871854e791008eaba1d7500b909fe463071eb7a Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/79172 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/pwl/cpwl_sbbutton.cpp b/fpdfsdk/pwl/cpwl_sbbutton.cpp index 4605c33..7b96fcf 100644 --- a/fpdfsdk/pwl/cpwl_sbbutton.cpp +++ b/fpdfsdk/pwl/cpwl_sbbutton.cpp
@@ -15,7 +15,7 @@ CPWL_SBButton::CPWL_SBButton( const CreateParams& cp, std::unique_ptr<IPWL_SystemHandler::PerWindowData> pAttachedData, - PWL_SBBUTTON_TYPE eButtonType) + Type eButtonType) : CPWL_Wnd(cp, std::move(pAttachedData)), m_eSBButtonType(eButtonType) { GetCreationParams()->eCursorType = FXCT_ARROW; } @@ -40,7 +40,7 @@ pDevice->DrawStrokeRect(mtUser2Device, rectWnd.GetDeflated(0.5f, 0.5f), ArgbEncode(nTransparency, 255, 255, 255), 1.0f); - if (m_eSBButtonType != PSBT_POS) { + if (m_eSBButtonType != Type::kPosButton) { // draw background pDevice->DrawShadow(mtUser2Device, true, false, rectWnd.GetDeflated(1.0f, 1.0f), nTransparency, 80, @@ -61,7 +61,7 @@ static_assert(pdfium::size(kOffsetsX) == pdfium::size(kOffsetsMinY), "Wrong offset count"); const float* pOffsetsY = - m_eSBButtonType == PSBT_MIN ? kOffsetsMinY : kOffsetsY; + m_eSBButtonType == Type::kMinButton ? kOffsetsMinY : kOffsetsY; for (size_t i = 0; i < pdfium::size(kOffsetsX); ++i) pts.push_back(CFX_PointF(fX + kOffsetsX[i], fY + pOffsetsY[i])); pDevice->DrawFillArea(mtUser2Device, pts,
diff --git a/fpdfsdk/pwl/cpwl_sbbutton.h b/fpdfsdk/pwl/cpwl_sbbutton.h index 03e2d23..e97e28a 100644 --- a/fpdfsdk/pwl/cpwl_sbbutton.h +++ b/fpdfsdk/pwl/cpwl_sbbutton.h
@@ -12,14 +12,14 @@ #include "fpdfsdk/pwl/cpwl_wnd.h" #include "fpdfsdk/pwl/ipwl_systemhandler.h" -enum PWL_SBBUTTON_TYPE { PSBT_MIN, PSBT_MAX, PSBT_POS }; - class CPWL_SBButton final : public CPWL_Wnd { public: + enum class Type : uint8_t { kMinButton, kMaxButton, kPosButton }; + CPWL_SBButton( const CreateParams& cp, std::unique_ptr<IPWL_SystemHandler::PerWindowData> pAttachedData, - PWL_SBBUTTON_TYPE eButtonType); + Type eButtonType); ~CPWL_SBButton() override; // CPWL_Wnd @@ -30,7 +30,7 @@ bool OnMouseMove(uint32_t nFlag, const CFX_PointF& point) override; private: - PWL_SBBUTTON_TYPE m_eSBButtonType; + const Type m_eSBButtonType; bool m_bMouseDown = false; };
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp index 31744ec..b07f5c2 100644 --- a/fpdfsdk/pwl/cpwl_scroll_bar.cpp +++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
@@ -291,24 +291,24 @@ PWS_VISIBLE | PWS_CHILD | PWS_BORDER | PWS_BACKGROUND | PWS_NOREFRESHCLIP; if (!m_pMinButton) { - auto pButton = - std::make_unique<CPWL_SBButton>(scp, CloneAttachedData(), PSBT_MIN); + auto pButton = std::make_unique<CPWL_SBButton>( + scp, CloneAttachedData(), CPWL_SBButton::Type::kMinButton); m_pMinButton = pButton.get(); AddChild(std::move(pButton)); m_pMinButton->Realize(); } if (!m_pMaxButton) { - auto pButton = - std::make_unique<CPWL_SBButton>(scp, CloneAttachedData(), PSBT_MAX); + auto pButton = std::make_unique<CPWL_SBButton>( + scp, CloneAttachedData(), CPWL_SBButton::Type::kMaxButton); m_pMaxButton = pButton.get(); AddChild(std::move(pButton)); m_pMaxButton->Realize(); } if (!m_pPosButton) { - auto pButton = - std::make_unique<CPWL_SBButton>(scp, CloneAttachedData(), PSBT_POS); + auto pButton = std::make_unique<CPWL_SBButton>( + scp, CloneAttachedData(), CPWL_SBButton::Type::kPosButton); m_pPosButton = pButton.get(); ObservedPtr<CPWL_ScrollBar> thisObserved(this); if (m_pPosButton->SetVisible(false) && thisObserved) {