From 05b9a317d66c29f740e4b0e89ea87143a11d61fc Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 15 Nov 2016 12:00:41 -0800 Subject: Cleaning methods and visibility in cfwl_* files. First pass at cleaning up visibility, return values and const'ness of cfwl_* class. Review-Url: https://codereview.chromium.org/2501743002 --- xfa/fwl/core/ifwl_widget.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'xfa/fwl/core/ifwl_widget.cpp') diff --git a/xfa/fwl/core/ifwl_widget.cpp b/xfa/fwl/core/ifwl_widget.cpp index 0768f38915..c9decffe24 100644 --- a/xfa/fwl/core/ifwl_widget.cpp +++ b/xfa/fwl/core/ifwl_widget.cpp @@ -416,23 +416,26 @@ void IFWL_Widget::SetGrab(bool bSet) { pDriver->SetGrab(this, bSet); } -bool IFWL_Widget::GetPopupPos(FX_FLOAT fMinHeight, +void IFWL_Widget::GetPopupPos(FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight, const CFX_RectF& rtAnchor, CFX_RectF& rtPopup) { if (GetClassID() == FWL_Type::ComboBox) { if (m_pWidgetMgr->IsFormDisabled()) { - return m_pWidgetMgr->GetAdapterPopupPos(this, fMinHeight, fMaxHeight, - rtAnchor, rtPopup); + m_pWidgetMgr->GetAdapterPopupPos(this, fMinHeight, fMaxHeight, rtAnchor, + rtPopup); + return; } - return GetPopupPosComboBox(fMinHeight, fMaxHeight, rtAnchor, rtPopup); + GetPopupPosComboBox(fMinHeight, fMaxHeight, rtAnchor, rtPopup); + return; } if (GetClassID() == FWL_Type::DateTimePicker && m_pWidgetMgr->IsFormDisabled()) { - return m_pWidgetMgr->GetAdapterPopupPos(this, fMinHeight, fMaxHeight, - rtAnchor, rtPopup); + m_pWidgetMgr->GetAdapterPopupPos(this, fMinHeight, fMaxHeight, rtAnchor, + rtPopup); + return; } - return GetPopupPosGeneral(fMinHeight, fMaxHeight, rtAnchor, rtPopup); + GetPopupPosGeneral(fMinHeight, fMaxHeight, rtAnchor, rtPopup); } bool IFWL_Widget::GetPopupPosMenu(FX_FLOAT fMinHeight, -- cgit v1.2.3