| Index: xfa/fwl/core/cfwl_form.cpp
|
| diff --git a/xfa/fwl/core/cfwl_form.cpp b/xfa/fwl/core/cfwl_form.cpp
|
| index 60f0de386203084704f2d786eb2bb6b9f68c92a4..280e3c29cfb8d3605d03dd6e1e4fcaba6cf4b49b 100644
|
| --- a/xfa/fwl/core/cfwl_form.cpp
|
| +++ b/xfa/fwl/core/cfwl_form.cpp
|
| @@ -80,18 +80,17 @@ bool CFWL_Form::IsInstance(const CFX_WideStringC& wsClass) const {
|
| return CFWL_Widget::IsInstance(wsClass);
|
| }
|
|
|
| -void CFWL_Form::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
|
| - if (!bAutoSize) {
|
| - rect = m_pProperties->m_rtWidget;
|
| - return;
|
| - }
|
| +CFX_RectF CFWL_Form::GetWidgetRect(bool bAutoSize) {
|
| + if (!bAutoSize)
|
| + return m_pProperties->m_rtWidget;
|
|
|
| - rect.Reset();
|
| FX_FLOAT fCXBorder = GetBorderSize(true);
|
| FX_FLOAT fCYBorder = GetBorderSize(false);
|
| FX_FLOAT fEdge = GetEdgeWidth();
|
| - rect.height += fCYBorder + fEdge + fEdge;
|
| - rect.width += fCXBorder + fCXBorder + fEdge + fEdge;
|
| + CFX_RectF rect;
|
| + rect.Set(0, 0, fCXBorder + fCXBorder + fEdge + fEdge,
|
| + fCYBorder + fEdge + fEdge);
|
| + return rect;
|
| }
|
|
|
| void CFWL_Form::GetClientRect(CFX_RectF& rect) {
|
|
|