Index: xfa/fwl/core/ifwl_widget.cpp |
diff --git a/xfa/fwl/core/ifwl_widget.cpp b/xfa/fwl/core/ifwl_widget.cpp |
index 0768f389153068103ef30e0747e39782481325d8..c9decffe246050d15c027f370b3de6ac4038ef13 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, |